diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-20 03:56:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-05 10:12:26 +0100 |
| commit | 303096c50c850b05a158a1a429c9fd5d0251a892 (patch) | |
| tree | 288ead4e8f9d50ad7142e3e496a0bfc0d79d8639 /toolkit/source/helper | |
| parent | 680608b15dd158f9ad4ceae328abb10b5185a27b (diff) | |
Related: #i121514# Remove deprecated UnoControlSimpleAnimation
(cherry picked from commit 514bb6777e001d02dbd9be63fc7a6187560aad63)
Conflicts:
offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
offapi/com/sun/star/awt/XSimpleAnimation.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/controls/tksimpleanimation.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/util/toolkit.xml
Change-Id: If7f8de62713e28434e28975026cf8e5c66c831aa
Diffstat (limited to 'toolkit/source/helper')
| -rw-r--r-- | toolkit/source/helper/registerservices.cxx | 5 | ||||
| -rw-r--r-- | toolkit/source/helper/servicenames.cxx | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx index 5f48dd4ca253..93eacbf6160b 100644 --- a/toolkit/source/helper/registerservices.cxx +++ b/toolkit/source/helper/registerservices.cxx @@ -41,7 +41,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/tabpagemodel.hxx> @@ -173,8 +172,6 @@ IMPL_CREATEINSTANCE( VCLXPopupMenu ) IMPL_CREATEINSTANCE( VCLXPrinterServer ) IMPL_CREATEINSTANCE( UnoRoadmapControl ) IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel ) -IMPL_CREATEINSTANCE( UnoSimpleAnimationControl ) -IMPL_CREATEINSTANCE_CTX( UnoSimpleAnimationControlModel ) IMPL_CREATEINSTANCE_CTX( UnoControlTabPage ) IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel ) IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer ) @@ -273,8 +270,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple 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 ); diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index 68044149a503..52a43497b6d8 100644 --- a/toolkit/source/helper/servicenames.cxx +++ b/toolkit/source/helper/servicenames.cxx @@ -92,8 +92,6 @@ const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel"; const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl"; const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel"; const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel"; -const sal_Char szServiceName_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoControlSimpleAnimationModel"; -const sal_Char szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation"; const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink"; const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel"; const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; |