diff options
author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-20 03:56:07 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-05 10:03:52 +0100 |
commit | 680608b15dd158f9ad4ceae328abb10b5185a27b (patch) | |
tree | 1e0aaa3bbf6e4c01e6dcd750eeedbc0c4c7f9c4b /swext/mediawiki/src | |
parent | 38ca96beac15a4addae559b7dffff0ee1f6a5c5d (diff) |
Related: #i121513# Remove deprecated UnoControlThrobberModel
(cherry picked from commit 5569d97f06a0299e41b91ca248bf7eaa038b1f21)
Conflicts:
icon-themes/human/toolkit/source/awt/spinner03-grey_01.png
icon-themes/human/toolkit/source/awt/spinner03-grey_02.png
icon-themes/human/toolkit/source/awt/spinner03-grey_03.png
icon-themes/human/toolkit/source/awt/spinner03-grey_04.png
icon-themes/human/toolkit/source/awt/spinner03-grey_05.png
icon-themes/human/toolkit/source/awt/spinner03-grey_06.png
icon-themes/human/toolkit/source/awt/spinner03-grey_07.png
icon-themes/human/toolkit/source/awt/spinner03-grey_08.png
icon-themes/human/toolkit/source/awt/spinner03-grey_09.png
icon-themes/human/toolkit/source/awt/spinner03-grey_10.png
icon-themes/human/toolkit/source/awt/spinner03-grey_11.png
icon-themes/human/toolkit/source/awt/spinner03-grey_12.png
offapi/com/sun/star/awt/UnoControlThrobber.idl
offapi/com/sun/star/awt/UnoControlThrobberModel.idl
offapi/com/sun/star/awt/XThrobber.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
rat-excludes
swext/mediawiki/help/component.txt
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
swext/mediawiki/src/description.xml
toolkit/AllLangResTarget_tk.mk
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/awt/xthrobber.hrc
toolkit/source/awt/xthrobber.src
toolkit/source/controls/tkthrobber.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/src2xml/src.lst
toolkit/util/toolkit.xml
Change-Id: Ic415a96fe6ba7040a3b03fd562f997d2df1516d6
Diffstat (limited to 'swext/mediawiki/src')
-rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java index 5a1dc4ff447f..0005da4fd5ba 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java @@ -24,7 +24,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; @@ -204,7 +204,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener XMultiServiceFactory xDialogFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class, xDialogModel ); if ( xDialogFactory != null ) { - XControlModel xThrobberModel = UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.UnoThrobberControlModel" ) ); + XControlModel xThrobberModel = UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.SpinningProgressControlModel" ) ); XPropertySet xThrobberProps = UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel ); if ( xThrobberProps != null ) { @@ -233,13 +233,13 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener { try { - XThrobber xThrobber = UnoRuntime.queryInterface( XThrobber.class, m_xControlContainer.getControl( "WikiThrobber" ) ); + XAnimation xThrobber = 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 ) |