openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1424323 - in /openoffice/trunk/main: ./ default_images/toolkit/tk/ offapi/com/sun/star/awt/ offapi/type_reference/ qadevOOo/objdsc/toolkit/ scp2/source/ooo/ swext/mediawiki/help/ swext/mediawiki/src/ swext/mediawiki/src/com/sun/star/wiki/ ...
Date Thu, 20 Dec 2012 04:56:08 GMT
Author: arielch
Date: Thu Dec 20 04:56:07 2012
New Revision: 1424323

URL: http://svn.apache.org/viewvc?rev=1424323&view=rev
Log:
i121513 - Remove deprecated UnoControlThrobberModel

Removed:
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_01.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_02.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_03.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_04.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_05.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_06.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_07.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_08.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_09.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_10.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_11.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-32-hc_12.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_01.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_02.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_03.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_04.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_05.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_06.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_07.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_08.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_09.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_10.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_11.png
    openoffice/trunk/main/default_images/toolkit/tk/spinner03-grey_12.png
    openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlThrobber.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
    openoffice/trunk/main/offapi/com/sun/star/awt/XThrobber.idl
    openoffice/trunk/main/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv
    openoffice/trunk/main/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv
    openoffice/trunk/main/toolkit/AllLangResTarget_tk.mk
    openoffice/trunk/main/toolkit/inc/toolkit/awt/xthrobber.hxx
    openoffice/trunk/main/toolkit/inc/toolkit/controls/tkthrobber.hxx
    openoffice/trunk/main/toolkit/source/awt/xthrobber.cxx
    openoffice/trunk/main/toolkit/source/awt/xthrobber.hrc
    openoffice/trunk/main/toolkit/source/awt/xthrobber.src
    openoffice/trunk/main/toolkit/source/controls/tkthrobber.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/rat-excludes
    openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp
    openoffice/trunk/main/swext/mediawiki/help/component.txt
    openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
    openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
    openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
    openoffice/trunk/main/swext/mediawiki/src/description.xml
    openoffice/trunk/main/toolkit/Library_tk.mk
    openoffice/trunk/main/toolkit/Module_toolkit.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/src2xml/src.lst
    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=1424323&r1=1424322&r2=1424323&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:07
2012
@@ -109,7 +109,6 @@ published struct WindowDescriptor
             <li>simpleanimation</li>
             <li>spinbutton</li>
             <li>spinfield</li>
-            <li>throbber</li>
             <li>splitter</li>
             <li>splitwindow</li>
             <li>statusbar</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=1424323&r1=1424322&r2=1424323&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:07 2012
@@ -195,8 +195,6 @@ IDLFILES=\
 	UnoControlSimpleAnimationModel.idl\
 	UnoControlSpinButton.idl\
 	UnoControlSpinButtonModel.idl\
-	UnoControlThrobber.idl\
-	UnoControlThrobberModel.idl\
 	UnoControlTimeField.idl\
 	UnoControlTimeFieldModel.idl\
 	VclContainerEvent.idl\
@@ -290,7 +288,6 @@ IDLFILES=\
 	SystemDependentXWindow.idl\
 	XSimpleAnimation.idl\
 	XSimpleTabController.idl\
-	XThrobber.idl\
 	XTabController.idl\
 	XTabControllerModel.idl\
         XTabListener.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=1424323&r1=1424322&r2=1424323&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:07
2012
@@ -192,3 +192,6 @@
 
 06/12/2012 (arielch): TaskID=121442
   Extend css::awt::XGraphics for StatusbarController implementation
+
+19/12/2012 (arielch): TaskID=121513
+  Remove deprecated AWT Throbber 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=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/trunk/main/rat-excludes
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/rat-excludes?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/rat-excludes (original)
+++ openoffice/trunk/main/rat-excludes Thu Dec 20 04:56:07 2012
@@ -109,7 +109,7 @@ main/testautomation/framework/optional/i
 main/testautomation/framework/optional/input/options/paths_1.txt
 main/testautomation/global/input/filters/graphic_filters.txt
 main/desktop/test/deployment/update/publisher/release-notes_de-DE.html
-
+main/swext/mediawiki/help/component.txt
 
 ##############################################################################
 #

Modified: openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp Thu Dec 20 04:56:07 2012
@@ -95,7 +95,7 @@ STD_RES_FILE( gid_File_Res_Cui, cui )
 
 STD_RES_FILE( gid_File_Res_Sw, sw )
 
-STD_RES_FILE( gid_File_Res_Tk, tk )
+
 STD_RES_FILE( gid_File_Res_Acc, acc )
 
 STD_RES_FILE( gid_File_Res_Tpl, tpl )

Modified: openoffice/trunk/main/swext/mediawiki/help/component.txt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/help/component.txt?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/help/component.txt (original)
+++ openoffice/trunk/main/swext/mediawiki/help/component.txt Thu Dec 20 04:56:07 2012
@@ -1,21 +1 @@
-# *************************************************************
-#  
-#  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.
-#  
-# *************************************************************
 The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without
having to know the syntax of the MediaWiki markup language. Publish your new and existing
documents transparently with the Writer to a wiki page.

Modified: openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java (original)
+++ openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java Thu Dec 20
04:56:07 2012
@@ -29,7 +29,7 @@ import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDialog;
 import com.sun.star.awt.XDialogEventHandler;
 import com.sun.star.awt.XDialogProvider2;
-import com.sun.star.awt.XThrobber;
+import com.sun.star.awt.XAnimation;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.UnoRuntime;
@@ -210,7 +210,7 @@ public class WikiDialog implements XDial
             XMultiServiceFactory xDialogFactory = ( XMultiServiceFactory ) UnoRuntime.queryInterface(
XMultiServiceFactory.class, xDialogModel );
             if ( xDialogFactory != null )
             {
-                XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface(
XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.UnoThrobberControlModel"
) );
+                XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface(
XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.SpinningProgressControlModel"
) );
                 XPropertySet xThrobberProps = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class,
xThrobberModel );
                 if ( xThrobberProps != null )
                 {
@@ -239,13 +239,13 @@ public class WikiDialog implements XDial
         {
             try
             {
-                XThrobber xThrobber = (XThrobber)UnoRuntime.queryInterface( XThrobber.class,
m_xControlContainer.getControl( "WikiThrobber" ) );
+                XAnimation xThrobber = (XAnimation)UnoRuntime.queryInterface( XAnimation.class,
m_xControlContainer.getControl( "WikiThrobber" ) );
                 if ( xThrobber != null )
                 {
                     if ( bActive )
-                        xThrobber.start();
+                        xThrobber.startAnimation();
                     else
-                        xThrobber.stop();
+                        xThrobber.stopAnimation();
                 }
             }
             catch( Exception e )
@@ -260,7 +260,7 @@ public class WikiDialog implements XDial
         if ( m_xControlContainer != null )
         {
             try
-            {        
+            {
                 XWindow xWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class, m_xControlContainer.getControl(
"WikiThrobber" ) );
                 if ( xWindow != null )
                     xWindow.setVisible( bVisible );
@@ -269,7 +269,7 @@ public class WikiDialog implements XDial
             {
                 e.printStackTrace();
             }
-        }       
+        }
     }
 
     public void SetFocusTo( String aControl )

Modified: openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
(original)
+++ openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
Thu Dec 20 04:56:07 2012
@@ -25,7 +25,6 @@ package com.sun.star.wiki;
 
 import com.sun.star.awt.XDialog;
 import com.sun.star.awt.XWindowPeer;
-import com.sun.star.awt.XThrobber;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;

Modified: openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java (original)
+++ openoffice/trunk/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java Thu Dec
20 04:56:07 2012
@@ -26,7 +26,6 @@ package com.sun.star.wiki;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDialog;
-import com.sun.star.awt.XThrobber;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;

Modified: openoffice/trunk/main/swext/mediawiki/src/description.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/src/description.xml?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/src/description.xml (original)
+++ openoffice/trunk/main/swext/mediawiki/src/description.xml Thu Dec 20 04:56:07 2012
@@ -20,14 +20,14 @@
  * 
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="1.2.0"/>
+    <version value="1.2.1"/>
     <identifier value="@WIKIEXTENSIONID@"/>
     <display-name>
         <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
     </display-name>
     <registration>
         <simple-license accept-by="admin" default-license-id="lic-en-US">
-            <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
+            <license-text xlink:href="license/LICENSE" lang="en-US" license-id="lic-en-US"/>
         </simple-license>
     </registration>
     <dependencies>

Modified: openoffice/trunk/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/Library_tk.mk?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/Library_tk.mk (original)
+++ openoffice/trunk/main/toolkit/Library_tk.mk Thu Dec 20 04:56:07 2012
@@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_o
 	toolkit/source/awt/vclxwindow1 \
 	toolkit/source/awt/vclxwindows \
 	toolkit/source/awt/xsimpleanimation \
-	toolkit/source/awt/xthrobber \
 	toolkit/source/controls/accessiblecontrolcontext \
 	toolkit/source/controls/controlmodelcontainerbase \
 	toolkit/source/controls/dialogcontrol \
@@ -107,7 +106,6 @@ $(eval $(call gb_Library_add_exception_o
 	toolkit/source/controls/tkscrollbar \
 	toolkit/source/controls/tksimpleanimation \
 	toolkit/source/controls/tkspinbutton \
-	toolkit/source/controls/tkthrobber \
 	toolkit/source/controls/animatedimages \
 	toolkit/source/controls/spinningprogress \
 	toolkit/source/controls/tree/treecontrol \

Modified: openoffice/trunk/main/toolkit/Module_toolkit.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/Module_toolkit.mk?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/Module_toolkit.mk (original)
+++ openoffice/trunk/main/toolkit/Module_toolkit.mk Thu Dec 20 04:56:07 2012
@@ -24,7 +24,6 @@
 $(eval $(call gb_Module_Module,toolkit))
 
 $(eval $(call gb_Module_add_targets,toolkit,\
-	AllLangResTarget_tk \
 	Library_tk \
 	Package_inc \
 	Package_source \

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=1424323&r1=1424322&r2=1424323&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:07
2012
@@ -97,8 +97,6 @@ extern const sal_Char __FAR_DATA szServi
 
 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_UnoThrobberControl[], szServiceName2_UnoThrobberControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[], szServiceName2_UnoThrobberControlModel[];
 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=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/qa/unoapi/knownissues.xcl (original)
+++ openoffice/trunk/main/toolkit/qa/unoapi/knownissues.xcl Thu Dec 20 04:56:07 2012
@@ -130,14 +130,6 @@ toolkit.UnoSimpleAnimationControl
 toolkit.UnoSimpleAnimationControlModel
 # -> disabled in toolkit.sce
 
-### i86022 ###
-toolkit.UnoThrobberControl
-# -> disabled in toolkit.sce
-
-### i86023 ###
-toolkit.UnoThrobberControlModel
-# -> disabled in toolkit.sce
-
 ### i86298 ###
 toolkit.UnoTreeControl
 # -> disabled in toolkit.sce
@@ -161,7 +153,6 @@ toolkit.UnoControlListBox::com::sun::sta
 toolkit.UnoControlEdit::com::sun::star::awt::XView
 toolkit.UnoControlImageControl::com::sun::star::awt::XView
 toolkit.UnoControlDialog::com::sun::star::awt::XView
-toolkit.UnoThrobberControl::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
@@ -201,7 +192,6 @@ toolkit.UnoControlContainer::com::sun::s
 toolkit.UnoControlFixedText::com::sun::star::lang::XComponent
 toolkit.UnoControlListBox::com::sun::star::lang::XComponent
 toolkit.UnoControlCheckBoxModel::com::sun::star::lang::XComponent
-toolkit.UnoThrobberControlModel::com::sun::star::lang::XComponent
 toolkit.UnoControlEditModel::com::sun::star::lang::XComponent
 toolkit.UnoControlEdit::com::sun::star::lang::XComponent
 toolkit.UnoControlImageControl::com::sun::star::lang::XComponent
@@ -210,7 +200,6 @@ toolkit.UnoControlGroupBoxModel::com::su
 toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent
 toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent
 toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent
-toolkit.UnoThrobberControl::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

Modified: openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce (original)
+++ openoffice/trunk/main/toolkit/qa/unoapi/toolkit.sce Thu Dec 20 04:56:07 2012
@@ -91,7 +91,5 @@
 #i86021 -o toolkit.UnoSimpleAnimationControlModel
 -o toolkit.UnoSpinButtonControl
 -o toolkit.UnoSpinButtonControlModel
-#i86022 -o toolkit.UnoThrobberControl
-#i86023 -o toolkit.UnoThrobberControlModel
 #i86298 -o toolkit.UnoTreeControl
 -o toolkit.UnoTreeModel

Modified: openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx Thu Dec 20 04:56:07 2012
@@ -71,7 +71,6 @@
 #include <toolkit/awt/vclxtabpagemodel.hxx>
 
 #include <toolkit/awt/xsimpleanimation.hxx>
-#include <toolkit/awt/xthrobber.hxx>
 #include <toolkit/awt/animatedimagespeer.hxx>
 #include <toolkit/awt/vclxtopwindow.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
@@ -319,7 +318,6 @@ static ComponentInfo __FAR_DATA aCompone
     { "animatedimages",     WINDOW_CONTROL },
 	{ "spinbutton",			WINDOW_SPINBUTTON },
 	{ "spinfield",			WINDOW_SPINFIELD },
-    { "throbber",        	WINDOW_CONTROL },
 	{ "splitter",			WINDOW_SPLITTER },
 	{ "splitwindow",		WINDOW_SPLITWINDOW },
 	{ "statusbar",			WINDOW_STATUSBAR },
@@ -1016,13 +1014,6 @@ Window*	VCLXToolkit::ImplCreateWindow( V
                         // (compatibility)
                     *ppNewComp = new ::toolkit::XSimpleAnimation;
                 }
-                else if ( aServiceName.EqualsAscii( "throbber" ) )
-                {
-                    pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE );
-                    ((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::Anisotropic
);
-                        // (compatibility)
-                    *ppNewComp = new ::toolkit::XThrobber;
-                }
 				else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
                         ::rtl::OUString::createFromAscii("tabpagecontainer") ) )
                 {

Modified: openoffice/trunk/main/toolkit/source/helper/registerservices.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/helper/registerservices.cxx?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/helper/registerservices.cxx (original)
+++ openoffice/trunk/main/toolkit/source/helper/registerservices.cxx Thu Dec 20 04:56:07 2012
@@ -46,7 +46,6 @@
 #include <toolkit/controls/tkscrollbar.hxx>
 #include "toolkit/controls/tkspinbutton.hxx"
 #include <toolkit/controls/tksimpleanimation.hxx>
-#include <toolkit/controls/tkthrobber.hxx>
 #include <toolkit/controls/animatedimages.hxx>
 #include <toolkit/controls/spinningprogress.hxx>
 #include <toolkit/controls/dialogcontrol.hxx>
@@ -199,8 +198,6 @@ IMPL_CREATEINSTANCE2( UnoRoadmapControl 
 IMPL_CREATEINSTANCE2( UnoControlRoadmapModel )
 IMPL_CREATEINSTANCE2( UnoSimpleAnimationControl )
 IMPL_CREATEINSTANCE2( UnoSimpleAnimationControlModel )
-IMPL_CREATEINSTANCE2( UnoThrobberControl )
-IMPL_CREATEINSTANCE2( UnoThrobberControlModel )
 IMPL_CREATEINSTANCE2( UnoControlTabPage )
 IMPL_CREATEINSTANCE2( UnoControlTabPageModel )
 IMPL_CREATEINSTANCE2( UnoControlTabPageContainer )
@@ -303,8 +300,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL compone
 		GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
         GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel,
szServiceName2_UnoSimpleAnimationControlModel )
         GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl,
szServiceName2_UnoSimpleAnimationControl )
-        GET_FACTORY( UnoThrobberControlModel, szServiceName_UnoThrobberControlModel, szServiceName2_UnoThrobberControlModel
)
-        GET_FACTORY( UnoThrobberControl, szServiceName_UnoThrobberControl, szServiceName2_UnoThrobberControl
)
         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=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/helper/servicenames.cxx (original)
+++ openoffice/trunk/main/toolkit/source/helper/servicenames.cxx Thu Dec 20 04:56:07 2012
@@ -92,8 +92,6 @@ const sal_Char __FAR_DATA szServiceName_
 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_UnoThrobberControlModel[] = "com.sun.star.awt.UnoThrobberControlModel",
szServiceName2_UnoThrobberControlModel[] = "com.sun.star.awt.UnoControlThrobberModel";
-const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[] = "com.sun.star.awt.UnoThrobberControl",
szServiceName2_UnoThrobberControl[] = "com.sun.star.awt.UnoControlThrobber";
 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/src2xml/src.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/src2xml/src.lst?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/src2xml/src.lst (original)
+++ openoffice/trunk/main/toolkit/src2xml/src.lst Thu Dec 20 04:56:07 2012
@@ -617,8 +617,6 @@
 ../../filter/source/xsltdialog/xmlfiltertabpagexslt.src
 ../../filter/source/xsltdialog/xmlfiltertestdialog.src
 ../../filter/source/xsltdialog/xmlfiltertabpagebasic.src
-../../toolkit/source/awt/accessiblestrings.src
-../../toolkit/source/awt/xthrobber.src
 ../../xmlsecurity/source/dialogs/warnings.src
 ../../xmlsecurity/source/dialogs/macrosecurity.src
 ../../xmlsecurity/source/dialogs/certificatechooser.src

Modified: openoffice/trunk/main/toolkit/util/tk.component
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/util/tk.component?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/util/tk.component (original)
+++ openoffice/trunk/main/toolkit/util/tk.component Thu Dec 20 04:56:07 2012
@@ -283,14 +283,6 @@
   <implementation name="stardiv.Toolkit.UnoSpinButtonModel">
     <service name="com.sun.star.awt.UnoControlSpinButtonModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoThrobberControl">
-    <service name="com.sun.star.awt.UnoControlThrobber"/>
-    <service name="com.sun.star.awt.UnoThrobberControl"/>
-  </implementation>
-  <implementation name="stardiv.Toolkit.UnoThrobberControlModel">
-    <service name="com.sun.star.awt.UnoControlThrobberModel"/>
-    <service name="com.sun.star.awt.UnoThrobberControlModel"/>
-  </implementation>
   <implementation name="stardiv.Toolkit.UnoTimeFieldControl">
     <service name="com.sun.star.awt.UnoControlTimeField"/>
     <service name="stardiv.vcl.control.TimeField"/>

Modified: openoffice/trunk/main/toolkit/util/toolkit.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/util/toolkit.xml?rev=1424323&r1=1424322&r2=1424323&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/util/toolkit.xml (original)
+++ openoffice/trunk/main/toolkit/util/toolkit.xml Thu Dec 20 04:56:07 2012
@@ -666,26 +666,6 @@
         <supported-service>com.sun.star.awt.UnoSimpleAnimationControl</supported-service>
     </component-description>
     <component-description>
-        <author>Dirk Voelzke</author>
-        <name>com.sun.star.comp.toolkit.UnoThrobberControlModel</name>
-        <description>specifies the model of a throbber control (a spinning wheel)</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.UnoThrobberControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author>Dirk Voelzke</author>
-        <name>com.sun.star.comp.toolkit.UnoThrobberControl</name>
-        <description>specifies a throbber control (a spinning wheel)</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.UnoThrobberControl</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