[Libreoffice-commits] core.git: icon-themes/human icon-themes/oxygen include/toolkit offapi/com offapi/UnoApi_offapi.mk qadevOOo/objdsc scp2/source swext/mediawiki toolkit/AllLangResTarget_tk.mk toolkit/Library_tk.mk toolkit/Module_toolkit.mk toolkit/qa toolkit/source toolkit/util
Ariel Constenla-Haile
arielch at apache.org
Fri Jul 5 02:04:14 PDT 2013
dev/null |binary
include/toolkit/helper/servicenames.hxx | 2
offapi/UnoApi_offapi.mk | 3
offapi/com/sun/star/awt/UnoControlThrobber.idl | 48 --
offapi/com/sun/star/awt/UnoControlThrobberModel.idl | 45 --
offapi/com/sun/star/awt/WindowDescriptor.idl | 1
offapi/com/sun/star/awt/XThrobber.idl | 44 --
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv | 36 -
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv | 29 -
scp2/source/ooo/file_resource_ooo.scp | 2
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java | 10
toolkit/AllLangResTarget_tk.mk | 39 --
toolkit/Library_tk.mk | 2
toolkit/Module_toolkit.mk | 1
toolkit/qa/unoapi/knownissues.xcl | 11
toolkit/qa/unoapi/toolkit.sce | 2
toolkit/source/awt/vclxtoolkit.cxx | 9
toolkit/source/awt/xthrobber.cxx | 106 -----
toolkit/source/awt/xthrobber.hrc | 27 -
toolkit/source/awt/xthrobber.src | 96 ----
toolkit/source/controls/tkthrobber.cxx | 195 ----------
toolkit/source/helper/registerservices.cxx | 5
toolkit/source/helper/servicenames.cxx | 2
toolkit/util/tk.component | 8
24 files changed, 6 insertions(+), 717 deletions(-)
New commits:
commit 680608b15dd158f9ad4ceae328abb10b5185a27b
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Thu Dec 20 03:56:07 2012 +0000
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
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png
deleted file mode 100644
index 2c6b693..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png
deleted file mode 100644
index 4662ddf..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_03.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_03.png
deleted file mode 100644
index 8c1a0be..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_03.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_04.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_04.png
deleted file mode 100644
index ba323f3..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_04.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_05.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_05.png
deleted file mode 100644
index f733dd1..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_05.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_06.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_06.png
deleted file mode 100644
index bbaebc3..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_06.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_07.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_07.png
deleted file mode 100644
index d005cb5..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_07.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_08.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_08.png
deleted file mode 100644
index bda1e71..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_08.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_09.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_09.png
deleted file mode 100644
index 3e68842..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_09.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_10.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_10.png
deleted file mode 100644
index d43e886..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_10.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_11.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_11.png
deleted file mode 100644
index d67c895..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_11.png and /dev/null differ
diff --git a/icon-themes/human/toolkit/source/awt/spinner03-grey_12.png b/icon-themes/human/toolkit/source/awt/spinner03-grey_12.png
deleted file mode 100644
index 9c3c4a8..0000000
Binary files a/icon-themes/human/toolkit/source/awt/spinner03-grey_12.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_01.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_01.png
deleted file mode 100644
index 2c6b693..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_01.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_02.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_02.png
deleted file mode 100644
index 4662ddf..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_02.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_03.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_03.png
deleted file mode 100644
index 8c1a0be..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_03.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_04.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_04.png
deleted file mode 100644
index ba323f3..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_04.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_05.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_05.png
deleted file mode 100644
index f733dd1..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_05.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_06.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_06.png
deleted file mode 100644
index bbaebc3..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_06.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_07.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_07.png
deleted file mode 100644
index d005cb5..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_07.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_08.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_08.png
deleted file mode 100644
index bda1e71..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_08.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_09.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_09.png
deleted file mode 100644
index 3e68842..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_09.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_10.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_10.png
deleted file mode 100644
index d43e886..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_10.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_11.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_11.png
deleted file mode 100644
index d67c895..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_11.png and /dev/null differ
diff --git a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_12.png b/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_12.png
deleted file mode 100644
index 9c3c4a8..0000000
Binary files a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_12.png and /dev/null differ
diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx
index 5105fc1..32b964a 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -99,8 +99,6 @@ extern const sal_Char szServiceName_SortableGridDataModel[];
extern const sal_Char szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
-extern const sal_Char szServiceName_UnoThrobberControl[], szServiceName2_UnoThrobberControl[];
-extern const sal_Char szServiceName_UnoThrobberControlModel[], szServiceName2_UnoThrobberControlModel[];
extern const sal_Char szServiceName_AnimatedImagesControl[];
extern const sal_Char szServiceName_AnimatedImagesControlModel[];
extern const sal_Char szServiceName_SpinningProgressControlModel[];
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 3c17b2b..ad51c73 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -577,8 +577,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
UnoControlSimpleAnimationModel \
UnoControlSpinButton \
UnoControlSpinButtonModel \
- UnoControlThrobber \
- UnoControlThrobberModel \
UnoControlTimeField \
UnoControlTimeFieldModel \
))
@@ -1874,7 +1872,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
XTextEditField \
XTextLayoutConstrains \
XTextListener \
- XThrobber \
XTimeField \
XToggleButton \
XToolkit \
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl
deleted file mode 100644
index ef9e5fc..0000000
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-#ifndef __com_sun_star_awt_UnoControlThrobber_idl__
-#define __com_sun_star_awt_UnoControlThrobber_idl__
-
-#include <com/sun/star/awt/UnoControl.idl>
-#include <com/sun/star/awt/XThrobber.idl>
-
-
-
- module com { module sun { module star { module awt {
-
-
-/**
- @since OOo 2.2
- @deprecated
- You should use AnimatedImagesControl and SpinningProgressControlModel
- */
-published service UnoControlThrobber
-{
- service com::sun::star::awt::UnoControl;
- interface com::sun::star::awt::XThrobber;
-
-};
-
-
-}; }; }; };
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
deleted file mode 100644
index 363750b..0000000
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-#ifndef __com_sun_star_awt_UnoControlThrobberModel_idl__
-#define __com_sun_star_awt_UnoControlThrobberModel_idl__
-
-#include <com/sun/star/awt/UnoControlModel.idl>
-
-
-
- module com { module sun { module star { module awt {
-
-
-/**
- @since OOo 2.2
- @deprecated
- You should use SpinningProgressControlModel.
- */
-
-published service UnoControlThrobberModel
-{
- service com::sun::star::awt::UnoControlModel;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/awt/WindowDescriptor.idl b/offapi/com/sun/star/awt/WindowDescriptor.idl
index aa29581..eaec84b 100644
--- a/offapi/com/sun/star/awt/WindowDescriptor.idl
+++ b/offapi/com/sun/star/awt/WindowDescriptor.idl
@@ -95,7 +95,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>
diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl
deleted file mode 100644
index fdbd436..0000000
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-#ifndef __com_sun_star_awt_XThrobber_idl__
-#define __com_sun_star_awt_XThrobber_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/graphic/XGraphic.idl>
-
-
- module com { module sun { module star { module awt {
-
-
-/**
- @deprecated
- You should use XAnimation, AnimatedImagesControl, and SpinningProgressControlModel.
- */
-published interface XThrobber: com::sun::star::uno::XInterface
-{
- void start();
- void stop();
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv
deleted file mode 100644
index 6797821..0000000
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-"UnoThrobberControl";"com::sun::star::awt::XView";"setGraphics()"
-"UnoThrobberControl";"com::sun::star::awt::XView";"getGraphics()"
-"UnoThrobberControl";"com::sun::star::awt::XView";"getSize()"
-"UnoThrobberControl";"com::sun::star::awt::XView";"draw()"
-"UnoThrobberControl";"com::sun::star::awt::XView";"setZoom()"
-"UnoThrobberControl";"com::sun::star::lang::XComponent";"dispose()"
-"UnoThrobberControl";"com::sun::star::lang::XComponent";"addEventListener()"
-"UnoThrobberControl";"com::sun::star::lang::XComponent";"removeEventListener()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"setContext()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"getContext()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"createPeer()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"getPeer()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"setModel()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"getModel()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"getView()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"setDesignMode()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"isDesignMode()"
-"UnoThrobberControl";"com::sun::star::awt::XControl";"isTransparent()"
-"UnoThrobberControl";"com::sun::star::accessibility::XAccessible#optional";"getAccessibleContext()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"setPosSize()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"getPosSize()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"setVisible()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"setEnable()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"setFocus()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"addWindowListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeWindowListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"addFocusListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeFocusListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"addKeyListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeKeyListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"addMouseListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeMouseListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"addMouseMotionListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeMouseMotionListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"addPaintListener()"
-"UnoThrobberControl";"com::sun::star::awt::XWindow";"removePaintListener()"
diff --git a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv
deleted file mode 100644
index 9439cec..0000000
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlModel";"DefaultControl"
-"UnoThrobberControlModel";"com::sun::star::util::XCloneable";"createClone()"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Height"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Name"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionX"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionY"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Step"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"TabIndex"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Tag"
-"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Width"
-"UnoThrobberControlModel";"com::sun::star::lang::XComponent";"dispose()"
-"UnoThrobberControlModel";"com::sun::star::lang::XComponent";"addEventListener()"
-"UnoThrobberControlModel";"com::sun::star::lang::XComponent";"removeEventListener()"
-"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertySetInfo()"
-"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"setPropertyValues()"
-"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertyValues()"
-"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"addPropertiesChangeListener()"
-"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"removePropertiesChangeListener()"
-"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"firePropertiesChangeEvent()"
-"UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"getServiceName()"
-"UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"write()"
-"UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"read()"
-"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 9184853..fc74d3d 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -89,7 +89,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 )
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
index 5a1dc4f..0005da4 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 )
diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk
deleted file mode 100644
index e4cffd4..0000000
--- a/toolkit/AllLangResTarget_tk.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# 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 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,tk))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit))
-
-$(eval $(call gb_AllLangResTarget_add_srs,tk,\
- toolkit/awt \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt))
-
-$(eval $(call gb_SrsTarget_set_include,toolkit/awt,\
- $$(INCLUDE) \
- -I$(SRCDIR)/toolkit/source/awt \
-))
-
-$(eval $(call gb_SrsTarget_add_nonlocalized_files,toolkit/awt,\
- toolkit/source/awt/xthrobber.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 4d6280d..f054ed01 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
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 \
@@ -92,7 +91,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
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 \
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index 731a564..dc6508d 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -20,7 +20,6 @@
$(eval $(call gb_Module_Module,toolkit))
$(eval $(call gb_Module_add_targets,toolkit,\
- AllLangResTarget_tk \
Library_tk \
))
diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl
index c9eca6f..487d4b1 100644
--- a/toolkit/qa/unoapi/knownissues.xcl
+++ b/toolkit/qa/unoapi/knownissues.xcl
@@ -128,14 +128,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
@@ -159,7 +151,6 @@ toolkit.UnoControlListBox::com::sun::star::awt::XView
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
@@ -195,7 +186,6 @@ toolkit.UnoControlContainer::com::sun::star::lang::XComponent
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
@@ -204,7 +194,6 @@ 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.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
diff --git a/toolkit/qa/unoapi/toolkit.sce b/toolkit/qa/unoapi/toolkit.sce
index 67b5d8a..7b6ebfa 100644
--- a/toolkit/qa/unoapi/toolkit.sce
+++ b/toolkit/qa/unoapi/toolkit.sce
@@ -89,7 +89,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
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 7575987..7893f47 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -69,7 +69,6 @@ using org::libreoffice::touch::ByteBufferWrapper;
#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>
@@ -312,7 +311,6 @@ static ComponentInfo aComponentInfos [] =
{ "animatedimages", WINDOW_CONTROL },
{ "spinbutton", WINDOW_SPINBUTTON },
{ "spinfield", WINDOW_SPINFIELD },
- { "throbber", WINDOW_CONTROL },
{ "splitter", WINDOW_SPLITTER },
{ "splitwindow", WINDOW_SPLITWINDOW },
{ "statusbar", WINDOW_STATUSBAR },
@@ -982,13 +980,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
// (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(
"tabpagecontainer" ) )
{
diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx
deleted file mode 100644
index b62f680..0000000
--- a/toolkit/source/awt/xthrobber.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-
-#include "toolkit/awt/xthrobber.hxx"
-#include "toolkit/helper/property.hxx"
-#include <toolkit/helper/tkresmgr.hxx>
-
-#include "xthrobber.hrc"
-#include <tools/debug.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/timer.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/throbber.hxx>
-
-//........................................................................
-namespace toolkit
-{
-//........................................................................
-
- using namespace ::com::sun::star;
-
- //====================================================================
- //= XThrobber
- //====================================================================
- DBG_NAME( XThrobber )
-
- //--------------------------------------------------------------------
- XThrobber::XThrobber()
- {
- DBG_CTOR( XThrobber, NULL );
- }
-
- //--------------------------------------------------------------------
- XThrobber::~XThrobber()
- {
- DBG_DTOR( XThrobber, NULL );
- }
-
- //--------------------------------------------------------------------
- void SAL_CALL XThrobber::start() throw ( uno::RuntimeException )
- {
- SolarMutexGuard aGuard;
- Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
- if ( pThrobber != NULL)
- pThrobber->start();
- }
-
- //--------------------------------------------------------------------
- void SAL_CALL XThrobber::stop() throw ( uno::RuntimeException )
- {
- SolarMutexGuard aGuard;
- Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
- if ( pThrobber != NULL)
- pThrobber->stop();
- }
-
- //--------------------------------------------------------------------
- void XThrobber::SetWindow( Window* pWindow )
- {
- XThrobber_Base::SetWindow( pWindow );
- InitImageList();
- }
-
- //--------------------------------------------------------------------
- void SAL_CALL XThrobber::InitImageList()
- throw( uno::RuntimeException )
- {
- SolarMutexGuard aGuard;
-
- Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
- if ( pThrobber == NULL)
- return;
-
- uno::Sequence< uno::Reference< graphic::XGraphic > > aImageList(12);
- sal_uInt16 nIconIdStart = RID_TK_ICON_THROBBER_START;
-
- for ( sal_uInt16 i=0; i<12; i++ )
- {
- Image aImage = TK_RES_IMAGE( nIconIdStart + i );
- aImageList[i] = aImage.GetXGraphic();
- }
-
- pThrobber->setImageList( aImageList );
- }
-
-//........................................................................
-} // namespace toolkit
-//........................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/xthrobber.hrc b/toolkit/source/awt/xthrobber.hrc
deleted file mode 100644
index 664ba2e..0000000
--- a/toolkit/source/awt/xthrobber.hrc
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-
-#ifndef _TOOLKIT_AWT_XTHROBBER_HRC_
-#define _TOOLKIT_AWT_XTHROBBER_HRC_
-
-#define RID_TK_ICON_THROBBER_START 1000
-
-#endif // _TOOLKIT_AWT_XTHROBBER_HRC_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/xthrobber.src b/toolkit/source/awt/xthrobber.src
deleted file mode 100644
index c8fd310..0000000
--- a/toolkit/source/awt/xthrobber.src
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-
-#include <xthrobber.hrc>
-
-#define STD_MASK_COLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
-
-Image RID_TK_ICON_THROBBER_START
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_01.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 1
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_02.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 2
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_03.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 3
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_04.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 4
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_05.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 5
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_06.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 6
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_07.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 7
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_08.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 8
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_09.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 9
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_10.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 10
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_11.png"; };
- STD_MASK_COLOR
-};
-
-Image RID_TK_ICON_THROBBER_START + 11
-{
- ImageBitmap = Bitmap{ file = "spinner03-grey_12.png"; };
- STD_MASK_COLOR
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
deleted file mode 100644
index 30fe979..0000000
--- a/toolkit/source/controls/tkthrobber.cxx
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-
-#include "toolkit/controls/tkthrobber.hxx"
-#include "toolkit/helper/property.hxx"
-#include "toolkit/helper/unopropertyarrayhelper.hxx"
-#include <cppuhelper/typeprovider.hxx>
-
-//........................................................................
-namespace toolkit
-{
-//........................................................................
-
- using namespace ::com::sun::star;
-
- //====================================================================
- //= UnoThrobberControlModel
- //====================================================================
- //--------------------------------------------------------------------
- UnoThrobberControlModel::UnoThrobberControlModel( const uno::Reference< uno::XComponentContext >& i_factory )
- :UnoControlModel( i_factory )
- {
- ImplRegisterProperty( BASEPROPERTY_BORDER );
- ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
- ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
- ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
- ImplRegisterProperty( BASEPROPERTY_HELPURL );
- }
-
- //--------------------------------------------------------------------
- OUString UnoThrobberControlModel::getServiceName( ) throw ( uno::RuntimeException )
- {
- return OUString::createFromAscii( szServiceName_UnoThrobberControlModel );
- }
-
- //--------------------------------------------------------------------
- uno::Any UnoThrobberControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
- {
- switch ( nPropId )
- {
- case BASEPROPERTY_DEFAULTCONTROL:
- return uno::makeAny( OUString::createFromAscii( szServiceName_UnoThrobberControl ) );
- case BASEPROPERTY_BORDER:
- return uno::makeAny( (sal_Int16) 0 );
- default:
- return UnoControlModel::ImplGetDefaultValue( nPropId );
- }
- }
-
- //--------------------------------------------------------------------
- ::cppu::IPropertyArrayHelper& UnoThrobberControlModel::getInfoHelper()
- {
- static UnoPropertyArrayHelper* pHelper = NULL;
- if ( !pHelper )
- {
- uno::Sequence< sal_Int32 > aIDs = ImplGetPropertyIds();
- pHelper = new UnoPropertyArrayHelper( aIDs );
- }
- return *pHelper;
- }
-
- //--------------------------------------------------------------------
- uno::Reference< beans::XPropertySetInfo > UnoThrobberControlModel::getPropertySetInfo()
- throw( uno::RuntimeException )
- {
- static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
- return xInfo;
- }
-
- //--------------------------------------------------------------------
- OUString SAL_CALL UnoThrobberControlModel::getImplementationName()
- throw( uno::RuntimeException )
- {
- return OUString( "com.sun.star.comp.toolkit.UnoThrobberControlModel" );
- }
-
- //--------------------------------------------------------------------
- uno::Sequence< OUString > SAL_CALL UnoThrobberControlModel::getSupportedServiceNames()
- throw( uno::RuntimeException )
- {
- uno::Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() );
- aServices.realloc( aServices.getLength() + 2 );
- aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2] =
- OUString::createFromAscii(szServiceName_UnoThrobberControlModel);
- aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1] =
- OUString::createFromAscii(szServiceName2_UnoThrobberControlModel);
- return aServices;
- }
-
- //====================================================================
- //= UnoThrobberControl
- //====================================================================
- //--------------------------------------------------------------------
- UnoThrobberControl::UnoThrobberControl()
- :UnoControlBase()
- {
- }
-
- //--------------------------------------------------------------------
- OUString UnoThrobberControl::GetComponentServiceName()
- {
- return OUString("Throbber");
- }
-
- //--------------------------------------------------------------------
- uno::Any UnoThrobberControl::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException )
- {
- uno::Any aRet = UnoControlBase::queryAggregation( rType );
- if ( !aRet.hasValue() )
- aRet = UnoThrobberControl_Base::queryInterface( rType );
- return aRet;
- }
-
- //--------------------------------------------------------------------
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoThrobberControl, UnoControlBase, UnoThrobberControl_Base )
-
- //--------------------------------------------------------------------
- void UnoThrobberControl::dispose() throw( uno::RuntimeException )
- {
- ::osl::ClearableMutexGuard aGuard( GetMutex() );
-
- UnoControl::dispose();
- }
-
- //--------------------------------------------------------------------
- OUString SAL_CALL UnoThrobberControl::getImplementationName()
- throw( uno::RuntimeException )
- {
- return OUString( "com.sun.star.comp.toolkit.UnoThrobberControl" );
- }
-
- //--------------------------------------------------------------------
- uno::Sequence< OUString > SAL_CALL UnoThrobberControl::getSupportedServiceNames()
- throw( uno::RuntimeException )
- {
- uno::Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() );
- aServices.realloc( aServices.getLength() + 2 );
- aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2] =
- OUString::createFromAscii(szServiceName_UnoThrobberControl);
- aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1] =
- OUString::createFromAscii(szServiceName2_UnoThrobberControl);
- return aServices;
- }
-
- //--------------------------------------------------------------------
- void UnoThrobberControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit,
- const uno::Reference< awt::XWindowPeer > & rParentPeer )
- throw( uno::RuntimeException )
- {
- UnoControl::createPeer( rxToolkit, rParentPeer );
- }
-
- //--------------------------------------------------------------------
- void SAL_CALL UnoThrobberControl::start() throw ( uno::RuntimeException )
- {
- ::osl::MutexGuard aGuard( GetMutex() );
-
- uno::Reference< XThrobber > xAnimation( getPeer(), uno::UNO_QUERY );
- if ( xAnimation.is() )
- xAnimation->start();
- }
-
- //--------------------------------------------------------------------
- void SAL_CALL UnoThrobberControl::stop() throw ( uno::RuntimeException )
- {
- ::osl::MutexGuard aGuard( GetMutex() );
-
- uno::Reference< XThrobber > xAnimation( getPeer(), uno::UNO_QUERY );
- if ( xAnimation.is() )
- xAnimation->stop();
- }
-
-//........................................................................
-} // namespace toolkit
-//........................................................................
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index f4e2bd2..5f48dd4 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -42,7 +42,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/tabpagemodel.hxx>
@@ -176,8 +175,6 @@ IMPL_CREATEINSTANCE( UnoRoadmapControl )
IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel )
IMPL_CREATEINSTANCE( UnoSimpleAnimationControl )
IMPL_CREATEINSTANCE_CTX( UnoSimpleAnimationControlModel )
-IMPL_CREATEINSTANCE( UnoThrobberControl )
-IMPL_CREATEINSTANCE_CTX( UnoThrobberControlModel )
IMPL_CREATEINSTANCE_CTX( UnoControlTabPage )
IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel )
IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer )
@@ -278,8 +275,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
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 );
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index bd33bec..6804414 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -94,8 +94,6 @@ const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeCon
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_UnoThrobberControlModel[] = "com.sun.star.awt.UnoThrobberControlModel", szServiceName2_UnoThrobberControlModel[] = "com.sun.star.awt.UnoControlThrobberModel";
-const sal_Char szServiceName_UnoThrobberControl[] = "com.sun.star.awt.UnoThrobberControl", szServiceName2_UnoThrobberControl[] = "com.sun.star.awt.UnoControlThrobber";
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";
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index 930d172..6021b96 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -278,14 +278,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"/>
More information about the Libreoffice-commits
mailing list