Skip to content

C
core
Kaydet (Commit) 514bb677 authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile
Dosyalara gözat
Seçenekler

i121514 - Remove deprecated UnoControlSimpleAnimation

üst 5569d97f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 800 deletions
offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
/**************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef __com_sun_star_awt_UnoControlSimpleAnimation_idl__
#define __com_sun_star_awt_UnoControlSimpleAnimation_idl__
#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
#endif
#ifndef __com_sun_star_awt_XSimpleAnimation_idl__
#include <com/sun/star/awt/XSimpleAnimation.idl>
#endif
//=============================================================================
module com { module sun { module star { module awt {
//=============================================================================
/**
@since OOo 2.2
@deprecated
You should use <type>AnimatedImagesControl</type>.
*/
published service UnoControlSimpleAnimation
{
service com::sun::star::awt::UnoControl;
interface com::sun::star::awt::XSimpleAnimation;
};
//=============================================================================
}; }; }; };
#endif
offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
/**************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
#define __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__
#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
#endif
//=============================================================================
module com { module sun { module star { module awt {
//=============================================================================
/**
@since OOo 2.2
@deprecated
You should use <type>AnimatedImagesControlModel</type>.
*/
published service UnoControlSimpleAnimationModel
{
service com::sun::star::awt::UnoControlModel;
[property] long StepTime;
[property] boolean AutoRepeat;
};
//=============================================================================
}; }; }; };
#endif
offapi/com/sun/star/awt/WindowDescriptor.idl
Dosyayı görüntüle @ 514bb677
......@@ -106,7 +106,6 @@ published struct WindowDescriptor
<li>radiobutton</li>
<li>scrollbar</li>
<li>scrollbarbox</li>
<li>simpleanimation</li>
<li>spinbutton</li>
<li>spinfield</li>
<li>splitter</li>
......
offapi/com/sun/star/awt/XSimpleAnimation.idl deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
/**************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef __com_sun_star_awt_XSimpleAnimation_idl__
#define __com_sun_star_awt_XSimpleAnimation_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
#endif
//=============================================================================
module com { module sun { module star { module awt {
//=============================================================================
/**
@deprecated
You should use <type>XAnimation</type>, <type>AnimatedImagesControl</type>, and <type>AnimatedImagesControlModel</type>.
*/
published interface XSimpleAnimation: com::sun::star::uno::XInterface
{
void start();
void stop();
void setImageList( [in] sequence < com::sun::star::graphic::XGraphic > ImageList );
};
//=============================================================================
}; }; }; };
#endif
offapi/com/sun/star/awt/makefile.mk
Dosyayı görüntüle @ 514bb677
......@@ -191,8 +191,6 @@ IDLFILES=\
UnoControlRoadmapModel.idl\
UnoControlScrollBar.idl\
UnoControlScrollBarModel.idl\
UnoControlSimpleAnimation.idl\
UnoControlSimpleAnimationModel.idl\
UnoControlSpinButton.idl\
UnoControlSpinButtonModel.idl\
UnoControlTimeField.idl\
......@@ -286,7 +284,6 @@ IDLFILES=\
XSystemDependentMenuPeer.idl\
XSystemDependentWindowPeer.idl\
SystemDependentXWindow.idl\
XSimpleAnimation.idl\
XSimpleTabController.idl\
XTabController.idl\
XTabControllerModel.idl\
......
offapi/type_reference/typelibrary_history.txt
Dosyayı görüntüle @ 514bb677
......@@ -195,3 +195,6 @@
19/12/2012 (arielch): TaskID=121513
Remove deprecated AWT Throbber API
19/12/2012 (arielch): TaskID=121514
Remove deprecated AWT UnoControlSimpleAnimation API
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"setGraphics()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"getGraphics()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"getSize()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"draw()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"setZoom()"
"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"dispose()"
"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"addEventListener()"
"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"removeEventListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setContext()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getContext()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"createPeer()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getPeer()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setModel()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getModel()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getView()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setDesignMode()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"isDesignMode()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"isTransparent()"
"UnoSimpleAnimationControl";"com::sun::star::accessibility::XAccessible#optional";"getAccessibleContext()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setPosSize()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"getPosSize()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setVisible()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setEnable()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setFocus()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addWindowListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeWindowListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addFocusListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeFocusListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addKeyListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeKeyListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addMouseListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeMouseListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addMouseMotionListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeMouseMotionListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addPaintListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removePaintListener()"
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlModel";"DefaultControl"
"UnoSimpleAnimationControlModel";"com::sun::star::util::XCloneable";"createClone()"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Height"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Name"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionX"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionY"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Step"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"TabIndex"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Tag"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Width"
"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"dispose()"
"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"addEventListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"removeEventListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertySetInfo()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"setPropertyValues()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertyValues()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"addPropertiesChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"removePropertiesChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"firePropertiesChangeEvent()"
"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"getServiceName()"
"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"write()"
"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"read()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
toolkit/Library_tk.mk
Dosyayı görüntüle @ 514bb677
......@@ -84,7 +84,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/awt/vclxwindow \
toolkit/source/awt/vclxwindow1 \
toolkit/source/awt/vclxwindows \
toolkit/source/awt/xsimpleanimation \
toolkit/source/controls/accessiblecontrolcontext \
toolkit/source/controls/controlmodelcontainerbase \
toolkit/source/controls/dialogcontrol \
......@@ -104,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/controls/stdtabcontroller \
toolkit/source/controls/stdtabcontrollermodel \
toolkit/source/controls/tkscrollbar \
toolkit/source/controls/tksimpleanimation \
toolkit/source/controls/tkspinbutton \
toolkit/source/controls/animatedimages \
toolkit/source/controls/spinningprogress \
......
toolkit/inc/toolkit/awt/xsimpleanimation.hxx deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
/**************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef TOOLKIT_AWT_XSIMPLEANIMATION_HXX
#define TOOLKIT_AWT_XSIMPLEANIMATION_HXX
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/awt/XSimpleAnimation.hpp>
#include <boost/scoped_ptr.hpp>
//........................................................................
namespace toolkit
{
//........................................................................
//====================================================================
//= XSimpleAnimation
//====================================================================
typedef ::cppu::ImplInheritanceHelper1 < VCLXWindow
, ::com::sun::star::awt::XSimpleAnimation
> XSimpleAnimation_Base;
class XSimpleAnimation : public XSimpleAnimation_Base
{
public:
XSimpleAnimation();
protected:
~XSimpleAnimation();
// XSimpleAnimation
virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setImageList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& ImageList )
throw (::com::sun::star::uno::RuntimeException);
// VclWindowPeer
virtual void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
private:
XSimpleAnimation( const XSimpleAnimation& ); // never implemented
XSimpleAnimation& operator=( const XSimpleAnimation& ); // never implemented
};
//........................................................................
} // namespacetoolkit
//........................................................................
#endif // TOOLKIT_INC_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
toolkit/inc/toolkit/controls/tksimpleanimation.hxx deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
/**************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
#define TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/helper/macros.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/awt/XSimpleAnimation.hpp>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
//====================================================================
//= UnoSimpleAnimationControlModel
//====================================================================
class UnoSimpleAnimationControlModel : public UnoControlModel
{
protected:
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
UnoSimpleAnimationControlModel( const UnoSimpleAnimationControlModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoSimpleAnimationControlModel( *this ); }
// XMultiPropertySet
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
// XPersistObject
::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo
::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
};
//====================================================================
//= UnoSimpleAnimationControl
//====================================================================
typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase
, ::com::sun::star::awt::XSimpleAnimation
> UnoSimpleAnimationControl_Base;
class UnoSimpleAnimationControl : public UnoSimpleAnimationControl_Base
{
private:
public:
UnoSimpleAnimationControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
::rtl::OUString GetComponentServiceName();
// XSimpleAnimation
virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setImageList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& ImageList )
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
};
//........................................................................
} // namespacetoolkit
//........................................................................
#endif // TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
toolkit/inc/toolkit/helper/servicenames.hxx
Dosyayı görüntüle @ 514bb677
......@@ -95,8 +95,6 @@ extern const sal_Char __FAR_DATA szServiceName_DefaultGridColumnModel[];
extern const sal_Char __FAR_DATA szServiceName_GridColumn[];
extern const sal_Char __FAR_DATA szServiceName_SortableGridDataModel[];
extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControl[];
extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControlModel[];
extern const sal_Char __FAR_DATA szServiceName_SpinningProgressControlModel[];
......
toolkit/qa/unoapi/knownissues.xcl
Dosyayı görüntüle @ 514bb677
......@@ -122,14 +122,6 @@ toolkit.UnoControlFormattedField
toolkit.UnoControlListBox
# -> disabled in toolkit.sce
### i86020 ###
toolkit.UnoSimpleAnimationControl
# -> disabled in toolkit.sce
### i86021 ###
toolkit.UnoSimpleAnimationControlModel
# -> disabled in toolkit.sce
### i86298 ###
toolkit.UnoTreeControl
# -> disabled in toolkit.sce
......@@ -155,7 +147,6 @@ toolkit.UnoControlImageControl::com::sun::star::awt::XView
toolkit.UnoControlDialog::com::sun::star::awt::XView
toolkit.UnoControlFileControl::com::sun::star::awt::XView
toolkit.UnoControlCurrencyField::com::sun::star::awt::XView
toolkit.UnoSimpleAnimationControl::com::sun::star::awt::XView
toolkit.UnoControlComboBox::com::sun::star::awt::XView
toolkit.UnoControlNumericField::com::sun::star::awt::XView
toolkit.UnoControlCheckBox::com::sun::star::awt::XView
......@@ -199,11 +190,9 @@ toolkit.UnoControlDialog::com::sun::star::lang::XComponent
toolkit.UnoControlGroupBoxModel::com::sun::star::lang::XComponent
toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent
toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent
toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent
toolkit.UnoControlFileControl::com::sun::star::lang::XComponent
toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent
toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent
toolkit.UnoSimpleAnimationControl::com::sun::star::lang::XComponent
toolkit.UnoControlComboBox::com::sun::star::lang::XComponent
toolkit.UnoControlNumericField::com::sun::star::lang::XComponent
toolkit.UnoControlScrollBarModel::com::sun::star::lang::XComponent
......
toolkit/qa/unoapi/toolkit.sce
Dosyayı görüntüle @ 514bb677
......@@ -87,8 +87,6 @@
-o toolkit.UnoControlTimeField
-o toolkit.UnoControlTimeFieldModel
-o toolkit.UnoScrollBarControl
#i86020 -o toolkit.UnoSimpleAnimationControl
#i86021 -o toolkit.UnoSimpleAnimationControlModel
-o toolkit.UnoSpinButtonControl
-o toolkit.UnoSpinButtonControlModel
#i86298 -o toolkit.UnoTreeControl
......
toolkit/source/awt/vclxtoolkit.cxx
Dosyayı görüntüle @ 514bb677
......@@ -70,7 +70,6 @@
#include <toolkit/awt/vclxtabpagecontainer.hxx>
#include <toolkit/awt/vclxtabpagemodel.hxx>
#include <toolkit/awt/xsimpleanimation.hxx>
#include <toolkit/awt/animatedimagespeer.hxx>
#include <toolkit/awt/vclxtopwindow.hxx>
#include <toolkit/awt/vclxwindow.hxx>
......@@ -314,7 +313,6 @@ static ComponentInfo __FAR_DATA aComponentInfos [] =
{ "radiobutton", WINDOW_RADIOBUTTON },
{ "scrollbar", WINDOW_SCROLLBAR },
{ "scrollbarbox", WINDOW_SCROLLBARBOX },
{ "simpleanimation", WINDOW_CONTROL },
{ "animatedimages", WINDOW_CONTROL },
{ "spinbutton", WINDOW_SPINBUTTON },
{ "spinfield", WINDOW_SPINFIELD },
......@@ -1007,14 +1005,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
}
break;
case WINDOW_CONTROL:
if ( aServiceName.EqualsAscii( "simpleanimation" ) )
{
pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE );
((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::Anisotropic );
// (compatibility)
*ppNewComp = new ::toolkit::XSimpleAnimation;
}
else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
::rtl::OUString::createFromAscii("tabpagecontainer") ) )
{
pNewWindow = new TabControl( pParent, nWinBits );
......
toolkit/source/awt/xsimpleanimation.cxx deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
/**************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
#include "toolkit/awt/xsimpleanimation.hxx"
#include "toolkit/helper/property.hxx"
#include <tools/debug.hxx>
#include <vcl/throbber.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
using namespace ::com::sun::star;
//====================================================================
//= XSimpleAnimation
//====================================================================
DBG_NAME( XSimpleAnimation )
//--------------------------------------------------------------------
XSimpleAnimation::XSimpleAnimation()
{
DBG_CTOR( XSimpleAnimation, NULL );
}
//--------------------------------------------------------------------
XSimpleAnimation::~XSimpleAnimation()
{
DBG_DTOR( XSimpleAnimation, NULL );
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::start() throw ( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->start();
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::stop() throw ( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->stop();
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& rImageList )
throw ( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->setImageList( rImageList );
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::setProperty( const ::rtl::OUString& PropertyName, const uno::Any& Value )
throw( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber == NULL )
{
VCLXWindow::setProperty( PropertyName, Value );
return;
}
sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
switch ( nPropertyId )
{
case BASEPROPERTY_STEP_TIME: {
sal_Int32 nStepTime( 0 );
if ( Value >>= nStepTime )
pThrobber->setStepTime( nStepTime );
break;
}
case BASEPROPERTY_REPEAT: {
sal_Bool bRepeat( sal_True );
if ( Value >>= bRepeat )
pThrobber->setRepeat( bRepeat );
break;
}
default:
VCLXWindow::setProperty( PropertyName, Value );
}
}
//--------------------------------------------------------------------
uno::Any SAL_CALL XSimpleAnimation::getProperty( const ::rtl::OUString& PropertyName )
throw( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber == NULL )
return VCLXWindow::getProperty( PropertyName );
uno::Any aReturn;
sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
switch ( nPropertyId )
{
case BASEPROPERTY_STEP_TIME:
aReturn <<= pThrobber->getStepTime();
break;
case BASEPROPERTY_REPEAT:
aReturn <<= pThrobber->getRepeat();
break;
default:
aReturn = VCLXWindow::getProperty( PropertyName );
}
return aReturn;
}
//........................................................................
} // namespace toolkit
//........................................................................
toolkit/source/controls/tksimpleanimation.cxx deleted 100644 → 0
Dosyayı görüntüle @ 5569d97f
/**************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
#include "toolkit/controls/tksimpleanimation.hxx"
#include "toolkit/helper/property.hxx"
#include "toolkit/helper/unopropertyarrayhelper.hxx"
#include <cppuhelper/typeprovider.hxx>
#include <tools/debug.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
using namespace ::com::sun::star;
//====================================================================
//= UnoSimpleAnimationControlModel
//====================================================================
//--------------------------------------------------------------------
UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
:UnoControlModel( i_factory )
{
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
ImplRegisterProperty( BASEPROPERTY_REPEAT );
ImplRegisterProperty( BASEPROPERTY_STEP_TIME );
}
//--------------------------------------------------------------------
::rtl::OUString UnoSimpleAnimationControlModel::getServiceName()
throw( uno::RuntimeException )
{
return ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
}
//--------------------------------------------------------------------
uno::Any UnoSimpleAnimationControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl ) );
case BASEPROPERTY_STEP_TIME:
return uno::makeAny( (sal_Int32) 100 );
case BASEPROPERTY_REPEAT:
return uno::makeAny( (sal_Bool)sal_True );
default:
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
}
//--------------------------------------------------------------------
::cppu::IPropertyArrayHelper& UnoSimpleAnimationControlModel::getInfoHelper()
{
static UnoPropertyArrayHelper* pHelper = NULL;
if ( !pHelper )
{
uno::Sequence< sal_Int32 > aIDs = ImplGetPropertyIds();
pHelper = new UnoPropertyArrayHelper( aIDs );
}
return *pHelper;
}
//--------------------------------------------------------------------
uno::Reference< beans::XPropertySetInfo > UnoSimpleAnimationControlModel::getPropertySetInfo( )
throw( uno::RuntimeException )
{
static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL UnoSimpleAnimationControlModel::getImplementationName()
throw( uno::RuntimeException )
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel" ) );
}
//--------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL UnoSimpleAnimationControlModel::getSupportedServiceNames()
throw( uno::RuntimeException )
{
uno::Sequence< ::rtl::OUString > aServices( UnoControlModel::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 2 );
aServices[ aServices.getLength() - 2 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel );
return aServices;
}
//====================================================================
//= UnoSimpleAnimationControl
//====================================================================
//--------------------------------------------------------------------
UnoSimpleAnimationControl::UnoSimpleAnimationControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
:UnoSimpleAnimationControl_Base( i_factory )
{
}
//--------------------------------------------------------------------
::rtl::OUString UnoSimpleAnimationControl::GetComponentServiceName()
{
return ::rtl::OUString::createFromAscii( "SimpleAnimation" );
}
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL UnoSimpleAnimationControl::getImplementationName()
throw( uno::RuntimeException )
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoSimpleAnimationControl" ) );
}
//--------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL UnoSimpleAnimationControl::getSupportedServiceNames()
throw( uno::RuntimeException )
{
uno::Sequence< ::rtl::OUString > aServices( UnoSimpleAnimationControl_Base::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 1 );
aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl );
return aServices;
}
//--------------------------------------------------------------------
void SAL_CALL UnoSimpleAnimationControl::start() throw ( uno::RuntimeException )
{
uno::Reference< XSimpleAnimation > xAnimation;
{
::osl::MutexGuard aGuard( GetMutex() );
xAnimation.set( getPeer(), uno::UNO_QUERY );
}
if ( xAnimation.is() )
xAnimation->start();
}
//--------------------------------------------------------------------
void SAL_CALL UnoSimpleAnimationControl::stop() throw ( uno::RuntimeException )
{
uno::Reference< XSimpleAnimation > xAnimation;
{
::osl::MutexGuard aGuard( GetMutex() );
xAnimation.set( getPeer(), uno::UNO_QUERY );
}
if ( xAnimation.is() )
xAnimation->stop();
}
//--------------------------------------------------------------------
void SAL_CALL UnoSimpleAnimationControl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& ImageList )
throw ( uno::RuntimeException )
{
uno::Reference< XSimpleAnimation > xAnimation;
{
::osl::MutexGuard aGuard( GetMutex() );
xAnimation.set( getPeer(), uno::UNO_QUERY );
}
if ( xAnimation.is() )
xAnimation->setImageList( ImageList );
}
//........................................................................
} // namespace toolkit
//........................................................................
toolkit/source/helper/registerservices.cxx
Dosyayı görüntüle @ 514bb677
......@@ -45,7 +45,6 @@
#include <toolkit/controls/roadmapcontrol.hxx>
#include <toolkit/controls/tkscrollbar.hxx>
#include "toolkit/controls/tkspinbutton.hxx"
#include <toolkit/controls/tksimpleanimation.hxx>
#include <toolkit/controls/animatedimages.hxx>
#include <toolkit/controls/spinningprogress.hxx>
#include <toolkit/controls/dialogcontrol.hxx>
......@@ -196,8 +195,6 @@ IMPL_CREATEINSTANCE( VCLXPopupMenu )
IMPL_CREATEINSTANCE( VCLXPrinterServer )
IMPL_CREATEINSTANCE2( UnoRoadmapControl )
IMPL_CREATEINSTANCE2( UnoControlRoadmapModel )
IMPL_CREATEINSTANCE2( UnoSimpleAnimationControl )
IMPL_CREATEINSTANCE2( UnoSimpleAnimationControlModel )
IMPL_CREATEINSTANCE2( UnoControlTabPage )
IMPL_CREATEINSTANCE2( UnoControlTabPageModel )
IMPL_CREATEINSTANCE2( UnoControlTabPageContainer )
......@@ -298,8 +295,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen
GET_FACTORY( TreeControl, szServiceName_TreeControl, NULL )
GET_FACTORY( TreeControlModel, szServiceName_TreeControlModel, NULL )
GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel )
GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl )
GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL )
GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL )
GET_FACTORY( GridControl, szServiceName_GridControl, NULL );
......
toolkit/source/helper/servicenames.cxx
Dosyayı görüntüle @ 514bb677
......@@ -87,11 +87,9 @@ const sal_Char __FAR_DATA szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt
const sal_Char __FAR_DATA szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
const sal_Char __FAR_DATA szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoControlSimpleAnimationModel";
const sal_Char __FAR_DATA szServiceName_AnimatedImagesControl[] = "com.sun.star.awt.AnimatedImagesControl";
const sal_Char __FAR_DATA szServiceName_AnimatedImagesControlModel[] = "com.sun.star.awt.AnimatedImagesControlModel";
const sal_Char __FAR_DATA szServiceName_SpinningProgressControlModel[] = "com.sun.star.awt.SpinningProgressControlModel";
const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation";
const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
const sal_Char __FAR_DATA szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
......
toolkit/util/tk.component
Dosyayı görüntüle @ 514bb677
......@@ -260,14 +260,6 @@
<service name="com.sun.star.awt.UnoControlScrollBar"/>
<service name="stardiv.vcl.control.ScrollBar"/>
</implementation>
<implementation name="stardiv.Toolkit.UnoSimpleAnimationControl">
<service name="com.sun.star.awt.UnoControlSimpleAnimation"/>
<service name="com.sun.star.awt.UnoSimpleAnimationControl"/>
</implementation>
<implementation name="stardiv.Toolkit.UnoSimpleAnimationControlModel">
<service name="com.sun.star.awt.UnoControlSimpleAnimationModel"/>
<service name="com.sun.star.awt.UnoSimpleAnimationControlModel"/>
</implementation>
<implementation name="org.openoffice.comp.toolkit.SpinningProgressControlModel">
<service name="com.sun.star.awt.SpinningProgressControlModel"/>
</implementation>
......
toolkit/util/toolkit.xml
Dosyayı görüntüle @ 514bb677
......@@ -645,26 +645,6 @@
<supported-service>com.sun.star.awt.UnoControl</supported-service>
<supported-service>com.sun.star.awt.UnoControlSpinButton</supported-service>
</component-description>
<component-description>
<author>Dirk Voelzke</author>
<name>com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel</name>
<description>specifies the model of a simple animation control</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
<language>c++</language>
<status value="final" />
<supported-service>com.sun.star.awt.UnoControlModel</supported-service>
<supported-service>com.sun.star.awt.UnoSimpleAnimationControlModel</supported-service>
</component-description>
<component-description>
<author>Dirk Voelzke</author>
<name>com.sun.star.comp.toolkit.UnoSimpleAnimationControl</name>
<description>specifies a simple animation control</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
<language>c++</language>
<status value="final" />
<supported-service>com.sun.star.awt.UnoControl</supported-service>
<supported-service>com.sun.star.awt.UnoSimpleAnimationControl</supported-service>
</component-description>
<component-description>
<author>Christian Lippka</author>
<name>stardiv.Toolkit.UnoTreeModel</name>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment