openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1424324 - in /openoffice/trunk/main: offapi/com/sun/star/awt/ offapi/type_reference/ qadevOOo/objdsc/toolkit/ toolkit/ toolkit/inc/toolkit/awt/ toolkit/inc/toolkit/controls/ toolkit/inc/toolkit/helper/ toolkit/qa/unoapi/ toolkit/source/awt...
Date Thu, 20 Dec 2012 04:56:36 GMT
Author: arielch
Date: Thu Dec 20 04:56:35 2012
New Revision: 1424324

URL: http://svn.apache.org/viewvc?rev=1424324&view=rev
Log:
i121514 - Remove deprecated UnoControlSimpleAnimation

Removed:
    openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XSimpleAnimation.idl
    openoffice/trunk/main/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv
    openoffice/trunk/main/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv
    openoffice/trunk/main/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
    openoffice/trunk/main/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
    openoffice/trunk/main/toolkit/source/awt/xsimpleanimation.cxx
    openoffice/trunk/main/toolkit/source/controls/tksimpleanimation.cxx
Modified:
    openoffice/trunk/main/offapi/com/sun/star/awt/WindowDescriptor.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/makefile.mk
    openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt
    openoffice/trunk/main/offapi/type_reference/types.rdb
    openoffice/trunk/main/toolkit/Library_tk.mk
    openoffice/trunk/main/toolkit/inc/toolkit/helper/servicenames.hxx
    openoffice/trunk/main/toolkit/qa/unoapi/knownissues.xcl
    openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce
    openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx
    openoffice/trunk/main/toolkit/source/helper/registerservices.cxx
    openoffice/trunk/main/toolkit/source/helper/servicenames.cxx
    openoffice/trunk/main/toolkit/util/tk.component
    openoffice/trunk/main/toolkit/util/toolkit.xml

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/WindowDescriptor.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/WindowDescriptor.idl?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/WindowDescriptor.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/WindowDescriptor.idl Thu Dec 20 04:56:35
2012
@@ -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>

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/makefile.mk?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/awt/makefile.mk (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/makefile.mk Thu Dec 20 04:56:35 2012
@@ -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\

Modified: openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt (original)
+++ openoffice/trunk/main/offapi/type_reference/typelibrary_history.txt Thu Dec 20 04:56:35
2012
@@ -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

Modified: openoffice/trunk/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/type_reference/types.rdb?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/trunk/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/Library_tk.mk?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/Library_tk.mk (original)
+++ openoffice/trunk/main/toolkit/Library_tk.mk Thu Dec 20 04:56:35 2012
@@ -84,7 +84,6 @@ $(eval $(call gb_Library_add_exception_o
 	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_o
 	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 \

Modified: openoffice/trunk/main/toolkit/inc/toolkit/helper/servicenames.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/inc/toolkit/helper/servicenames.hxx?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/inc/toolkit/helper/servicenames.hxx (original)
+++ openoffice/trunk/main/toolkit/inc/toolkit/helper/servicenames.hxx Thu Dec 20 04:56:35
2012
@@ -95,8 +95,6 @@ extern const sal_Char __FAR_DATA szServi
 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[];

Modified: openoffice/trunk/main/toolkit/qa/unoapi/knownissues.xcl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/qa/unoapi/knownissues.xcl?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/qa/unoapi/knownissues.xcl (original)
+++ openoffice/trunk/main/toolkit/qa/unoapi/knownissues.xcl Thu Dec 20 04:56:35 2012
@@ -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
 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
 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

Modified: openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce (original)
+++ openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce Thu Dec 20 04:56:35 2012
@@ -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

Modified: openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx Thu Dec 20 04:56:35 2012
@@ -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 aCompone
 	{ "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( V
 				}
 			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 );

Modified: openoffice/trunk/main/toolkit/source/helper/registerservices.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/helper/registerservices.cxx?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/helper/registerservices.cxx (original)
+++ openoffice/trunk/main/toolkit/source/helper/registerservices.cxx Thu Dec 20 04:56:35 2012
@@ -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 compone
 		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 );

Modified: openoffice/trunk/main/toolkit/source/helper/servicenames.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/helper/servicenames.cxx?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/helper/servicenames.cxx (original)
+++ openoffice/trunk/main/toolkit/source/helper/servicenames.cxx Thu Dec 20 04:56:35 2012
@@ -87,11 +87,9 @@ const sal_Char __FAR_DATA szServiceName_
 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";

Modified: openoffice/trunk/main/toolkit/util/tk.component
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/util/tk.component?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/util/tk.component (original)
+++ openoffice/trunk/main/toolkit/util/tk.component Thu Dec 20 04:56:35 2012
@@ -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>

Modified: openoffice/trunk/main/toolkit/util/toolkit.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/util/toolkit.xml?rev=1424324&r1=1424323&r2=1424324&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/util/toolkit.xml (original)
+++ openoffice/trunk/main/toolkit/util/toolkit.xml Thu Dec 20 04:56:35 2012
@@ -646,26 +646,6 @@
         <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>
         <description>specifies the model of a tree control</description>



Mime
View raw message