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 | |
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
47 files changed, 6 insertions, 717 deletions
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 2c6b6937f8b2..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_01.png +++ /dev/null | |||
Binary files 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 4662ddf54924..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_02.png +++ /dev/null | |||
Binary files 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 8c1a0be53da5..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_03.png +++ /dev/null | |||
Binary files 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 ba323f36244d..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_04.png +++ /dev/null | |||
Binary files 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 f733dd17266c..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_05.png +++ /dev/null | |||
Binary files 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 bbaebc36f565..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_06.png +++ /dev/null | |||
Binary files 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 d005cb55b4eb..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_07.png +++ /dev/null | |||
Binary files 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 bda1e7192809..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_08.png +++ /dev/null | |||
Binary files 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 3e688421d95e..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_09.png +++ /dev/null | |||
Binary files 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 d43e8866e10e..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_10.png +++ /dev/null | |||
Binary files 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 d67c895a2c7d..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_11.png +++ /dev/null | |||
Binary files 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 9c3c4a849c6f..000000000000 --- a/icon-themes/human/toolkit/source/awt/spinner03-grey_12.png +++ /dev/null | |||
Binary files 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 2c6b6937f8b2..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_01.png +++ /dev/null | |||
Binary files 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 4662ddf54924..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_02.png +++ /dev/null | |||
Binary files 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 8c1a0be53da5..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_03.png +++ /dev/null | |||
Binary files 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 ba323f36244d..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_04.png +++ /dev/null | |||
Binary files 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 f733dd17266c..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_05.png +++ /dev/null | |||
Binary files 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 bbaebc36f565..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_06.png +++ /dev/null | |||
Binary files 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 d005cb55b4eb..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_07.png +++ /dev/null | |||
Binary files 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 bda1e7192809..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_08.png +++ /dev/null | |||
Binary files 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 3e688421d95e..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_09.png +++ /dev/null | |||
Binary files 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 d43e8866e10e..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_10.png +++ /dev/null | |||
Binary files 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 d67c895a2c7d..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_11.png +++ /dev/null | |||
Binary files 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 9c3c4a849c6f..000000000000 --- a/icon-themes/oxygen/toolkit/source/awt/spinner03-grey_12.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx index 5105fc12484b..32b964a90029 100644 --- a/include/toolkit/helper/servicenames.hxx +++ b/include/toolkit/helper/servicenames.hxx | |||
@@ -99,8 +99,6 @@ extern const sal_Char szServiceName_SortableGridDataModel[]; | |||
99 | 99 | ||
100 | extern const sal_Char szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[]; | 100 | extern const sal_Char szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[]; |
101 | extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[]; | 101 | extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[]; |
102 | extern const sal_Char szServiceName_UnoThrobberControl[], szServiceName2_UnoThrobberControl[]; | ||
103 | extern const sal_Char szServiceName_UnoThrobberControlModel[], szServiceName2_UnoThrobberControlModel[]; | ||
104 | extern const sal_Char szServiceName_AnimatedImagesControl[]; | 102 | extern const sal_Char szServiceName_AnimatedImagesControl[]; |
105 | extern const sal_Char szServiceName_AnimatedImagesControlModel[]; | 103 | extern const sal_Char szServiceName_AnimatedImagesControlModel[]; |
106 | extern const sal_Char szServiceName_SpinningProgressControlModel[]; | 104 | extern const sal_Char szServiceName_SpinningProgressControlModel[]; |
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 3c17b2ba2d3b..ad51c73c045c 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,\ | |||
577 | UnoControlSimpleAnimationModel \ | 577 | UnoControlSimpleAnimationModel \ |
578 | UnoControlSpinButton \ | 578 | UnoControlSpinButton \ |
579 | UnoControlSpinButtonModel \ | 579 | UnoControlSpinButtonModel \ |
580 | UnoControlThrobber \ | ||
581 | UnoControlThrobberModel \ | ||
582 | UnoControlTimeField \ | 580 | UnoControlTimeField \ |
583 | UnoControlTimeFieldModel \ | 581 | UnoControlTimeFieldModel \ |
584 | )) | 582 | )) |
@@ -1874,7 +1872,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ | |||
1874 | XTextEditField \ | 1872 | XTextEditField \ |
1875 | XTextLayoutConstrains \ | 1873 | XTextLayoutConstrains \ |
1876 | XTextListener \ | 1874 | XTextListener \ |
1877 | XThrobber \ | ||
1878 | XTimeField \ | 1875 | XTimeField \ |
1879 | XToggleButton \ | 1876 | XToggleButton \ |
1880 | XToolkit \ | 1877 | XToolkit \ |
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl deleted file mode 100644 index ef9e5fc7d45d..000000000000 --- a/offapi/com/sun/star/awt/UnoControlThrobber.idl +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | #ifndef __com_sun_star_awt_UnoControlThrobber_idl__ | ||
20 | #define __com_sun_star_awt_UnoControlThrobber_idl__ | ||
21 | |||
22 | #include <com/sun/star/awt/UnoControl.idl> | ||
23 | #include <com/sun/star/awt/XThrobber.idl> | ||
24 | |||
25 | |||
26 | |||
27 | module com { module sun { module star { module awt { | ||
28 | |||
29 | |||
30 | /** | ||
31 | @since OOo 2.2 | ||
32 | @deprecated | ||
33 | You should use AnimatedImagesControl and SpinningProgressControlModel | ||
34 | */ | ||
35 | published service UnoControlThrobber | ||
36 | { | ||
37 | service com::sun::star::awt::UnoControl; | ||
38 | interface com::sun::star::awt::XThrobber; | ||
39 | |||
40 | }; | ||
41 | |||
42 | |||
43 | }; }; }; }; | ||
44 | |||
45 | |||
46 | #endif | ||
47 | |||
48 | /* 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 363750b4fe69..000000000000 --- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | #ifndef __com_sun_star_awt_UnoControlThrobberModel_idl__ | ||
20 | #define __com_sun_star_awt_UnoControlThrobberModel_idl__ | ||
21 | |||
22 | #include <com/sun/star/awt/UnoControlModel.idl> | ||
23 | |||
24 | |||
25 | |||
26 | module com { module sun { module star { module awt { | ||
27 | |||
28 | |||
29 | /** | ||
30 | @since OOo 2.2 | ||
31 | @deprecated | ||
32 | You should use SpinningProgressControlModel. | ||
33 | */ | ||
34 | |||
35 | published service UnoControlThrobberModel | ||
36 | { | ||
37 | service com::sun::star::awt::UnoControlModel; | ||
38 | }; | ||
39 | |||
40 | |||
41 | }; }; }; }; | ||
42 | |||
43 | #endif | ||
44 | |||
45 | /* 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 aa295812174e..eaec84b8ccc1 100644 --- a/offapi/com/sun/star/awt/WindowDescriptor.idl +++ b/offapi/com/sun/star/awt/WindowDescriptor.idl | |||
@@ -95,7 +95,6 @@ published struct WindowDescriptor | |||
95 | <li>simpleanimation</li> | 95 | <li>simpleanimation</li> |
96 | <li>spinbutton</li> | 96 | <li>spinbutton</li> |
97 | <li>spinfield</li> | 97 | <li>spinfield</li> |
98 | <li>throbber</li> | ||
99 | <li>splitter</li> | 98 | <li>splitter</li> |
100 | <li>splitwindow</li> | 99 | <li>splitwindow</li> |
101 | <li>statusbar</li> | 100 | <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 fdbd436b72a5..000000000000 --- a/offapi/com/sun/star/awt/XThrobber.idl +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | #ifndef __com_sun_star_awt_XThrobber_idl__ | ||
20 | #define __com_sun_star_awt_XThrobber_idl__ | ||
21 | |||
22 | #include <com/sun/star/uno/XInterface.idl> | ||
23 | #include <com/sun/star/graphic/XGraphic.idl> | ||
24 | |||
25 | |||
26 | module com { module sun { module star { module awt { | ||
27 | |||
28 | |||
29 | /** | ||
30 | @deprecated | ||
31 | You should use XAnimation, AnimatedImagesControl, and SpinningProgressControlModel. | ||
32 | */ | ||
33 | published interface XThrobber: com::sun::star::uno::XInterface | ||
34 | { | ||
35 | void start(); | ||
36 | void stop(); | ||
37 | }; | ||
38 | |||
39 | |||
40 | }; }; }; }; | ||
41 | |||
42 | #endif | ||
43 | |||
44 | /* 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 679782177f15..000000000000 --- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | "UnoThrobberControl";"com::sun::star::awt::XView";"setGraphics()" | ||
2 | "UnoThrobberControl";"com::sun::star::awt::XView";"getGraphics()" | ||
3 | "UnoThrobberControl";"com::sun::star::awt::XView";"getSize()" | ||
4 | "UnoThrobberControl";"com::sun::star::awt::XView";"draw()" | ||
5 | "UnoThrobberControl";"com::sun::star::awt::XView";"setZoom()" | ||
6 | "UnoThrobberControl";"com::sun::star::lang::XComponent";"dispose()" | ||
7 | "UnoThrobberControl";"com::sun::star::lang::XComponent";"addEventListener()" | ||
8 | "UnoThrobberControl";"com::sun::star::lang::XComponent";"removeEventListener()" | ||
9 | "UnoThrobberControl";"com::sun::star::awt::XControl";"setContext()" | ||
10 | "UnoThrobberControl";"com::sun::star::awt::XControl";"getContext()" | ||
11 | "UnoThrobberControl";"com::sun::star::awt::XControl";"createPeer()" | ||
12 | "UnoThrobberControl";"com::sun::star::awt::XControl";"getPeer()" | ||
13 | "UnoThrobberControl";"com::sun::star::awt::XControl";"setModel()" | ||
14 | "UnoThrobberControl";"com::sun::star::awt::XControl";"getModel()" | ||
15 | "UnoThrobberControl";"com::sun::star::awt::XControl";"getView()" | ||
16 | "UnoThrobberControl";"com::sun::star::awt::XControl";"setDesignMode()" | ||
17 | "UnoThrobberControl";"com::sun::star::awt::XControl";"isDesignMode()" | ||
18 | "UnoThrobberControl";"com::sun::star::awt::XControl";"isTransparent()" | ||
19 | "UnoThrobberControl";"com::sun::star::accessibility::XAccessible#optional";"getAccessibleContext()" | ||
20 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"setPosSize()" | ||
21 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"getPosSize()" | ||
22 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"setVisible()" | ||
23 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"setEnable()" | ||
24 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"setFocus()" | ||
25 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"addWindowListener()" | ||
26 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"removeWindowListener()" | ||
27 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"addFocusListener()" | ||
28 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"removeFocusListener()" | ||
29 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"addKeyListener()" | ||
30 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"removeKeyListener()" | ||
31 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"addMouseListener()" | ||
32 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"removeMouseListener()" | ||
33 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"addMouseMotionListener()" | ||
34 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"removeMouseMotionListener()" | ||
35 | "UnoThrobberControl";"com::sun::star::awt::XWindow";"addPaintListener()" | ||
36 | "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 9439cecaa8e6..000000000000 --- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlModel";"DefaultControl" | ||
2 | "UnoThrobberControlModel";"com::sun::star::util::XCloneable";"createClone()" | ||
3 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Height" | ||
4 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Name" | ||
5 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionX" | ||
6 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionY" | ||
7 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Step" | ||
8 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"TabIndex" | ||
9 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Tag" | ||
10 | "UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Width" | ||
11 | "UnoThrobberControlModel";"com::sun::star::lang::XComponent";"dispose()" | ||
12 | "UnoThrobberControlModel";"com::sun::star::lang::XComponent";"addEventListener()" | ||
13 | "UnoThrobberControlModel";"com::sun::star::lang::XComponent";"removeEventListener()" | ||
14 | "UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertySetInfo()" | ||
15 | "UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"setPropertyValues()" | ||
16 | "UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertyValues()" | ||
17 | "UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"addPropertiesChangeListener()" | ||
18 | "UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"removePropertiesChangeListener()" | ||
19 | "UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"firePropertiesChangeEvent()" | ||
20 | "UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"getServiceName()" | ||
21 | "UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"write()" | ||
22 | "UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"read()" | ||
23 | "UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()" | ||
24 | "UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"setPropertyValue()" | ||
25 | "UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"getPropertyValue()" | ||
26 | "UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()" | ||
27 | "UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()" | ||
28 | "UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()" | ||
29 | "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 918485355342..fc74d3d9444a 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 ) | |||
89 | 89 | ||
90 | STD_RES_FILE( gid_File_Res_Sw, sw ) | 90 | STD_RES_FILE( gid_File_Res_Sw, sw ) |
91 | 91 | ||
92 | STD_RES_FILE( gid_File_Res_Tk, tk ) | 92 | |
93 | STD_RES_FILE( gid_File_Res_Acc, acc ) | 93 | STD_RES_FILE( gid_File_Res_Acc, acc ) |
94 | 94 | ||
95 | STD_RES_FILE( gid_File_Res_Tpl, tpl ) | 95 | 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 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; | |||
24 | import com.sun.star.awt.XDialog; | 24 | import com.sun.star.awt.XDialog; |
25 | import com.sun.star.awt.XDialogEventHandler; | 25 | import com.sun.star.awt.XDialogEventHandler; |
26 | import com.sun.star.awt.XDialogProvider2; | 26 | import com.sun.star.awt.XDialogProvider2; |
27 | import com.sun.star.awt.XThrobber; | 27 | import com.sun.star.awt.XAnimation; |
28 | import com.sun.star.beans.XPropertySet; | 28 | import com.sun.star.beans.XPropertySet; |
29 | import com.sun.star.lang.XMultiComponentFactory; | 29 | import com.sun.star.lang.XMultiComponentFactory; |
30 | import com.sun.star.uno.UnoRuntime; | 30 | import com.sun.star.uno.UnoRuntime; |
@@ -204,7 +204,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener | |||
204 | XMultiServiceFactory xDialogFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class, xDialogModel ); | 204 | XMultiServiceFactory xDialogFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class, xDialogModel ); |
205 | if ( xDialogFactory != null ) | 205 | if ( xDialogFactory != null ) |
206 | { | 206 | { |
207 | XControlModel xThrobberModel = UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.UnoThrobberControlModel" ) ); | 207 | XControlModel xThrobberModel = UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.SpinningProgressControlModel" ) ); |
208 | XPropertySet xThrobberProps = UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel ); | 208 | XPropertySet xThrobberProps = UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel ); |
209 | if ( xThrobberProps != null ) | 209 | if ( xThrobberProps != null ) |
210 | { | 210 | { |
@@ -233,13 +233,13 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener | |||
233 | { | 233 | { |
234 | try | 234 | try |
235 | { | 235 | { |
236 | XThrobber xThrobber = UnoRuntime.queryInterface( XThrobber.class, m_xControlContainer.getControl( "WikiThrobber" ) ); | 236 | XAnimation xThrobber = UnoRuntime.queryInterface( XAnimation.class, m_xControlContainer.getControl( "WikiThrobber" ) ); |
237 | if ( xThrobber != null ) | 237 | if ( xThrobber != null ) |
238 | { | 238 | { |
239 | if ( bActive ) | 239 | if ( bActive ) |
240 | xThrobber.start(); | 240 | xThrobber.startAnimation(); |
241 | else | 241 | else |
242 | xThrobber.stop(); | 242 | xThrobber.stopAnimation(); |
243 | } | 243 | } |
244 | } | 244 | } |
245 | catch( Exception e ) | 245 | catch( Exception e ) |
diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk deleted file mode 100644 index e4cffd432de3..000000000000 --- a/toolkit/AllLangResTarget_tk.mk +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- | ||
2 | # | ||
3 | # This file is part of the LibreOffice project. | ||
4 | # | ||
5 | # This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | # License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | # | ||
9 | # This file incorporates work covered by the following license notice: | ||
10 | # | ||
11 | # Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | # contributor license agreements. See the NOTICE file distributed | ||
13 | # with this work for additional information regarding copyright | ||
14 | # ownership. The ASF licenses this file to you under the Apache | ||
15 | # License, Version 2.0 (the "License"); you may not use this file | ||
16 | # except in compliance with the License. You may obtain a copy of | ||
17 | # the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | # | ||
19 | |||
20 | $(eval $(call gb_AllLangResTarget_AllLangResTarget,tk)) | ||
21 | |||
22 | $(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit)) | ||
23 | |||
24 | $(eval $(call gb_AllLangResTarget_add_srs,tk,\ | ||
25 | toolkit/awt \ | ||
26 | )) | ||
27 | |||
28 | $(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt)) | ||
29 | |||
30 | $(eval $(call gb_SrsTarget_set_include,toolkit/awt,\ | ||
31 | $$(INCLUDE) \ | ||
32 | -I$(SRCDIR)/toolkit/source/awt \ | ||
33 | )) | ||
34 | |||
35 | $(eval $(call gb_SrsTarget_add_nonlocalized_files,toolkit/awt,\ | ||
36 | toolkit/source/awt/xthrobber.src \ | ||
37 | )) | ||
38 | |||
39 | # vim: set noet sw=4 ts=4: | ||
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 4d6280d7ff99..f054ed0186cd 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk | |||
@@ -70,7 +70,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ | |||
70 | toolkit/source/awt/vclxwindow1 \ | 70 | toolkit/source/awt/vclxwindow1 \ |
71 | toolkit/source/awt/vclxwindows \ | 71 | toolkit/source/awt/vclxwindows \ |
72 | toolkit/source/awt/xsimpleanimation \ | 72 | toolkit/source/awt/xsimpleanimation \ |
73 | toolkit/source/awt/xthrobber \ | ||
74 | toolkit/source/controls/accessiblecontrolcontext \ | 73 | toolkit/source/controls/accessiblecontrolcontext \ |
75 | toolkit/source/controls/controlmodelcontainerbase \ | 74 | toolkit/source/controls/controlmodelcontainerbase \ |
76 | toolkit/source/controls/dialogcontrol \ | 75 | toolkit/source/controls/dialogcontrol \ |
@@ -92,7 +91,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ | |||
92 | toolkit/source/controls/tkscrollbar \ | 91 | toolkit/source/controls/tkscrollbar \ |
93 | toolkit/source/controls/tksimpleanimation \ | 92 | toolkit/source/controls/tksimpleanimation \ |
94 | toolkit/source/controls/tkspinbutton \ | 93 | toolkit/source/controls/tkspinbutton \ |
95 | toolkit/source/controls/tkthrobber \ | ||
96 | toolkit/source/controls/animatedimages \ | 94 | toolkit/source/controls/animatedimages \ |
97 | toolkit/source/controls/spinningprogress \ | 95 | toolkit/source/controls/spinningprogress \ |
98 | toolkit/source/controls/tree/treecontrol \ | 96 | toolkit/source/controls/tree/treecontrol \ |
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk index 731a564cdfd3..dc6508d539b4 100644 --- a/toolkit/Module_toolkit.mk +++ b/toolkit/Module_toolkit.mk | |||
@@ -20,7 +20,6 @@ | |||
20 | $(eval $(call gb_Module_Module,toolkit)) | 20 | $(eval $(call gb_Module_Module,toolkit)) |
21 | 21 | ||
22 | $(eval $(call gb_Module_add_targets,toolkit,\ | 22 | $(eval $(call gb_Module_add_targets,toolkit,\ |
23 | AllLangResTarget_tk \ | ||
24 | Library_tk \ | 23 | Library_tk \ |
25 | )) | 24 | )) |
26 | 25 | ||
diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl index c9eca6f36822..487d4b1895ce 100644 --- a/toolkit/qa/unoapi/knownissues.xcl +++ b/toolkit/qa/unoapi/knownissues.xcl | |||
@@ -128,14 +128,6 @@ toolkit.UnoSimpleAnimationControl | |||
128 | toolkit.UnoSimpleAnimationControlModel | 128 | toolkit.UnoSimpleAnimationControlModel |
129 | # -> disabled in toolkit.sce | 129 | # -> disabled in toolkit.sce |
130 | 130 | ||
131 | ### i86022 ### | ||
132 | toolkit.UnoThrobberControl | ||
133 | # -> disabled in toolkit.sce | ||
134 | |||
135 | ### i86023 ### | ||
136 | toolkit.UnoThrobberControlModel | ||
137 | # -> disabled in toolkit.sce | ||
138 | |||
139 | ### i86298 ### | 131 | ### i86298 ### |
140 | toolkit.UnoTreeControl | 132 | toolkit.UnoTreeControl |
141 | # -> disabled in toolkit.sce | 133 | # -> disabled in toolkit.sce |
@@ -159,7 +151,6 @@ toolkit.UnoControlListBox::com::sun::star::awt::XView | |||
159 | toolkit.UnoControlEdit::com::sun::star::awt::XView | 151 | toolkit.UnoControlEdit::com::sun::star::awt::XView |
160 | toolkit.UnoControlImageControl::com::sun::star::awt::XView | 152 | toolkit.UnoControlImageControl::com::sun::star::awt::XView |
161 | toolkit.UnoControlDialog::com::sun::star::awt::XView | 153 | toolkit.UnoControlDialog::com::sun::star::awt::XView |
162 | toolkit.UnoThrobberControl::com::sun::star::awt::XView | ||
163 | toolkit.UnoControlFileControl::com::sun::star::awt::XView | 154 | toolkit.UnoControlFileControl::com::sun::star::awt::XView |
164 | toolkit.UnoControlCurrencyField::com::sun::star::awt::XView | 155 | toolkit.UnoControlCurrencyField::com::sun::star::awt::XView |
165 | toolkit.UnoSimpleAnimationControl::com::sun::star::awt::XView | 156 | toolkit.UnoSimpleAnimationControl::com::sun::star::awt::XView |
@@ -195,7 +186,6 @@ toolkit.UnoControlContainer::com::sun::star::lang::XComponent | |||
195 | toolkit.UnoControlFixedText::com::sun::star::lang::XComponent | 186 | toolkit.UnoControlFixedText::com::sun::star::lang::XComponent |
196 | toolkit.UnoControlListBox::com::sun::star::lang::XComponent | 187 | toolkit.UnoControlListBox::com::sun::star::lang::XComponent |
197 | toolkit.UnoControlCheckBoxModel::com::sun::star::lang::XComponent | 188 | toolkit.UnoControlCheckBoxModel::com::sun::star::lang::XComponent |
198 | toolkit.UnoThrobberControlModel::com::sun::star::lang::XComponent | ||
199 | toolkit.UnoControlEditModel::com::sun::star::lang::XComponent | 189 | toolkit.UnoControlEditModel::com::sun::star::lang::XComponent |
200 | toolkit.UnoControlEdit::com::sun::star::lang::XComponent | 190 | toolkit.UnoControlEdit::com::sun::star::lang::XComponent |
201 | toolkit.UnoControlImageControl::com::sun::star::lang::XComponent | 191 | toolkit.UnoControlImageControl::com::sun::star::lang::XComponent |
@@ -204,7 +194,6 @@ toolkit.UnoControlGroupBoxModel::com::sun::star::lang::XComponent | |||
204 | toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent | 194 | toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent |
205 | toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent | 195 | toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent |
206 | toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent | 196 | toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent |
207 | toolkit.UnoThrobberControl::com::sun::star::lang::XComponent | ||
208 | toolkit.UnoControlFileControl::com::sun::star::lang::XComponent | 197 | toolkit.UnoControlFileControl::com::sun::star::lang::XComponent |
209 | toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent | 198 | toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent |
210 | toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent | 199 | toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent |
diff --git a/toolkit/qa/unoapi/toolkit.sce b/toolkit/qa/unoapi/toolkit.sce index 67b5d8a13ae9..7b6ebfad4edb 100644 --- a/toolkit/qa/unoapi/toolkit.sce +++ b/toolkit/qa/unoapi/toolkit.sce | |||
@@ -89,7 +89,5 @@ | |||
89 | #i86021 -o toolkit.UnoSimpleAnimationControlModel | 89 | #i86021 -o toolkit.UnoSimpleAnimationControlModel |
90 | -o toolkit.UnoSpinButtonControl | 90 | -o toolkit.UnoSpinButtonControl |
91 | -o toolkit.UnoSpinButtonControlModel | 91 | -o toolkit.UnoSpinButtonControlModel |
92 | #i86022 -o toolkit.UnoThrobberControl | ||
93 | #i86023 -o toolkit.UnoThrobberControlModel | ||
94 | #i86298 -o toolkit.UnoTreeControl | 92 | #i86298 -o toolkit.UnoTreeControl |
95 | -o toolkit.UnoTreeModel | 93 | -o toolkit.UnoTreeModel |
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 757598719f98..7893f479dd27 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx | |||
@@ -69,7 +69,6 @@ using org::libreoffice::touch::ByteBufferWrapper; | |||
69 | #include <toolkit/awt/vclxtabpagemodel.hxx> | 69 | #include <toolkit/awt/vclxtabpagemodel.hxx> |
70 | 70 | ||
71 | #include <toolkit/awt/xsimpleanimation.hxx> | 71 | #include <toolkit/awt/xsimpleanimation.hxx> |
72 | #include <toolkit/awt/xthrobber.hxx> | ||
73 | #include <toolkit/awt/animatedimagespeer.hxx> | 72 | #include <toolkit/awt/animatedimagespeer.hxx> |
74 | #include <toolkit/awt/vclxtopwindow.hxx> | 73 | #include <toolkit/awt/vclxtopwindow.hxx> |
75 | #include <toolkit/awt/vclxwindow.hxx> | 74 | #include <toolkit/awt/vclxwindow.hxx> |
@@ -312,7 +311,6 @@ static ComponentInfo aComponentInfos [] = | |||
312 | { "animatedimages", WINDOW_CONTROL }, | 311 | { "animatedimages", WINDOW_CONTROL }, |
313 | { "spinbutton", WINDOW_SPINBUTTON }, | 312 | { "spinbutton", WINDOW_SPINBUTTON }, |
314 | { "spinfield", WINDOW_SPINFIELD }, | 313 | { "spinfield", WINDOW_SPINFIELD }, |
315 | { "throbber", WINDOW_CONTROL }, | ||
316 | { "splitter", WINDOW_SPLITTER }, | 314 | { "splitter", WINDOW_SPLITTER }, |
317 | { "splitwindow", WINDOW_SPLITWINDOW }, | 315 | { "splitwindow", WINDOW_SPLITWINDOW }, |
318 | { "statusbar", WINDOW_STATUSBAR }, | 316 | { "statusbar", WINDOW_STATUSBAR }, |
@@ -982,13 +980,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, | |||
982 | // (compatibility) | 980 | // (compatibility) |
983 | *ppNewComp = new ::toolkit::XSimpleAnimation; | 981 | *ppNewComp = new ::toolkit::XSimpleAnimation; |
984 | } | 982 | } |
985 | else if ( aServiceName.EqualsAscii( "throbber" ) ) | ||
986 | { | ||
987 | pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE ); | ||
988 | ((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::ANISOTROPIC ); | ||
989 | // (compatibility) | ||
990 | *ppNewComp = new ::toolkit::XThrobber; | ||
991 | } | ||
992 | else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase( | 983 | else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase( |
993 | "tabpagecontainer" ) ) | 984 | "tabpagecontainer" ) ) |
994 | { | 985 | { |
diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx deleted file mode 100644 index b62f680e3083..000000000000 --- a/toolkit/source/awt/xthrobber.cxx +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | |||
20 | #include "toolkit/awt/xthrobber.hxx" | ||
21 | #include "toolkit/helper/property.hxx" | ||
22 | #include <toolkit/helper/tkresmgr.hxx> | ||
23 | |||
24 | #include "xthrobber.hrc" | ||
25 | #include <tools/debug.hxx> | ||
26 | #include <vcl/fixed.hxx> | ||
27 | #include <vcl/timer.hxx> | ||
28 | #include <vcl/svapp.hxx> | ||
29 | #include <vcl/throbber.hxx> | ||
30 | |||
31 | //........................................................................ | ||
32 | namespace toolkit | ||
33 | { | ||
34 | //........................................................................ | ||
35 | |||
36 | using namespace ::com::sun::star; | ||
37 | |||
38 | //==================================================================== | ||
39 | //= XThrobber | ||
40 | //==================================================================== | ||
41 | DBG_NAME( XThrobber ) | ||
42 | |||
43 | //-------------------------------------------------------------------- | ||
44 | XThrobber::XThrobber() | ||
45 | { | ||
46 | DBG_CTOR( XThrobber, NULL ); | ||
47 | } | ||
48 | |||
49 | //-------------------------------------------------------------------- | ||
50 | XThrobber::~XThrobber() | ||
51 | { | ||
52 | DBG_DTOR( XThrobber, NULL ); | ||
53 | } | ||
54 | |||
55 | //-------------------------------------------------------------------- | ||
56 | void SAL_CALL XThrobber::start() throw ( uno::RuntimeException ) | ||
57 | { | ||
58 | SolarMutexGuard aGuard; | ||
59 | Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) ); | ||
60 | if ( pThrobber != NULL) | ||
61 | pThrobber->start(); | ||
62 | } | ||
63 | |||
64 | //-------------------------------------------------------------------- | ||
65 | void SAL_CALL XThrobber::stop() throw ( uno::RuntimeException ) | ||
66 | { | ||
67 | SolarMutexGuard aGuard; | ||
68 | Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) ); | ||
69 | if ( pThrobber != NULL) | ||
70 | pThrobber->stop(); | ||
71 | } | ||
72 | |||
73 | //-------------------------------------------------------------------- | ||
74 | void XThrobber::SetWindow( Window* pWindow ) | ||
75 | { | ||
76 | XThrobber_Base::SetWindow( pWindow ); | ||
77 | InitImageList(); | ||
78 | } | ||
79 | |||
80 | //-------------------------------------------------------------------- | ||
81 | void SAL_CALL XThrobber::InitImageList() | ||
82 | throw( uno::RuntimeException ) | ||
83 | { | ||
84 | SolarMutexGuard aGuard; | ||
85 | |||
86 | Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) ); | ||
87 | if ( pThrobber == NULL) | ||
88 | return; | ||
89 | |||
90 | uno::Sequence< uno::Reference< graphic::XGraphic > > aImageList(12); | ||
91 | sal_uInt16 nIconIdStart = RID_TK_ICON_THROBBER_START; | ||
92 | |||
93 | for ( sal_uInt16 i=0; i<12; i++ ) | ||
94 | { | ||
95 | Image aImage = TK_RES_IMAGE( nIconIdStart + i ); | ||
96 | aImageList[i] = aImage.GetXGraphic(); | ||
97 | } | ||
98 | |||
99 | pThrobber->setImageList( aImageList ); | ||
100 | } | ||
101 | |||
102 | //........................................................................ | ||
103 | } // namespace toolkit | ||
104 | //........................................................................ | ||
105 | |||
106 | /* 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 664ba2ec008c..000000000000 --- a/toolkit/source/awt/xthrobber.hrc +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | |||
20 | #ifndef _TOOLKIT_AWT_XTHROBBER_HRC_ | ||
21 | #define _TOOLKIT_AWT_XTHROBBER_HRC_ | ||
22 | |||
23 | #define RID_TK_ICON_THROBBER_START 1000 | ||
24 | |||
25 | #endif // _TOOLKIT_AWT_XTHROBBER_HRC_ | ||
26 | |||
27 | /* 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 c8fd31045d40..000000000000 --- a/toolkit/source/awt/xthrobber.src +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | |||
20 | #include <xthrobber.hrc> | ||
21 | |||
22 | #define STD_MASK_COLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; | ||
23 | |||
24 | Image RID_TK_ICON_THROBBER_START | ||
25 | { | ||
26 | ImageBitmap = Bitmap{ file = "spinner03-grey_01.png"; }; | ||
27 | STD_MASK_COLOR | ||
28 | }; | ||
29 | |||
30 | Image RID_TK_ICON_THROBBER_START + 1 | ||
31 | { | ||
32 | ImageBitmap = Bitmap{ file = "spinner03-grey_02.png"; }; | ||
33 | STD_MASK_COLOR | ||
34 | }; | ||
35 | |||
36 | Image RID_TK_ICON_THROBBER_START + 2 | ||
37 | { | ||
38 | ImageBitmap = Bitmap{ file = "spinner03-grey_03.png"; }; | ||
39 | STD_MASK_COLOR | ||
40 | }; | ||
41 | |||
42 | Image RID_TK_ICON_THROBBER_START + 3 | ||
43 | { | ||
44 | ImageBitmap = Bitmap{ file = "spinner03-grey_04.png"; }; | ||
45 | STD_MASK_COLOR | ||
46 | }; | ||
47 | |||
48 | Image RID_TK_ICON_THROBBER_START + 4 | ||
49 | { | ||
50 | ImageBitmap = Bitmap{ file = "spinner03-grey_05.png"; }; | ||
51 | STD_MASK_COLOR | ||
52 | }; | ||
53 | |||
54 | Image RID_TK_ICON_THROBBER_START + 5 | ||
55 | { | ||
56 | ImageBitmap = Bitmap{ file = "spinner03-grey_06.png"; }; | ||
57 | STD_MASK_COLOR | ||
58 | }; | ||
59 | |||
60 | Image RID_TK_ICON_THROBBER_START + 6 | ||
61 | { | ||
62 | ImageBitmap = Bitmap{ file = "spinner03-grey_07.png"; }; | ||
63 | STD_MASK_COLOR | ||
64 | }; | ||
65 | |||
66 | Image RID_TK_ICON_THROBBER_START + 7 | ||
67 | { | ||
68 | ImageBitmap = Bitmap{ file = "spinner03-grey_08.png"; }; | ||
69 | STD_MASK_COLOR | ||
70 | }; | ||
71 | |||
72 | Image RID_TK_ICON_THROBBER_START + 8 | ||
73 | { | ||
74 | ImageBitmap = Bitmap{ file = "spinner03-grey_09.png"; }; | ||
75 | STD_MASK_COLOR | ||
76 | }; | ||
77 | |||
78 | Image RID_TK_ICON_THROBBER_START + 9 | ||
79 | { | ||
80 | ImageBitmap = Bitmap{ file = "spinner03-grey_10.png"; }; | ||
81 | STD_MASK_COLOR | ||
82 | }; | ||
83 | |||
84 | Image RID_TK_ICON_THROBBER_START + 10 | ||
85 | { | ||
86 | ImageBitmap = Bitmap{ file = "spinner03-grey_11.png"; }; | ||
87 | STD_MASK_COLOR | ||
88 | }; | ||
89 | |||
90 | Image RID_TK_ICON_THROBBER_START + 11 | ||
91 | { | ||
92 | ImageBitmap = Bitmap{ file = "spinner03-grey_12.png"; }; | ||
93 | STD_MASK_COLOR | ||
94 | }; | ||
95 | |||
96 | /* 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 30fe9793b2c7..000000000000 --- a/toolkit/source/controls/tkthrobber.cxx +++ /dev/null | |||
@@ -1,195 +0,0 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | |||
20 | #include "toolkit/controls/tkthrobber.hxx" | ||
21 | #include "toolkit/helper/property.hxx" | ||
22 | #include "toolkit/helper/unopropertyarrayhelper.hxx" | ||
23 | #include <cppuhelper/typeprovider.hxx> | ||
24 | |||
25 | //........................................................................ | ||
26 | namespace toolkit | ||
27 | { | ||
28 | //........................................................................ | ||
29 | |||
30 | using namespace ::com::sun::star; | ||
31 | |||
32 | //==================================================================== | ||
33 | //= UnoThrobberControlModel | ||
34 | //==================================================================== | ||
35 | //-------------------------------------------------------------------- | ||
36 | UnoThrobberControlModel::UnoThrobberControlModel( const uno::Reference< uno::XComponentContext >& i_factory ) | ||
37 | :UnoControlModel( i_factory ) | ||
38 | { | ||
39 | ImplRegisterProperty( BASEPROPERTY_BORDER ); | ||
40 | ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR ); | ||
41 | ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); | ||
42 | ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL ); | ||
43 | ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE ); | ||
44 | ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); | ||
45 | ImplRegisterProperty( BASEPROPERTY_HELPURL ); | ||
46 | } | ||
47 | |||
48 | //-------------------------------------------------------------------- | ||
49 | OUString UnoThrobberControlModel::getServiceName( ) throw ( uno::RuntimeException ) | ||
50 | { | ||
51 | return OUString::createFromAscii( szServiceName_UnoThrobberControlModel ); | ||
52 | } | ||
53 | |||
54 | //-------------------------------------------------------------------- | ||
55 | uno::Any UnoThrobberControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const | ||
56 | { | ||
57 | switch ( nPropId ) | ||
58 | { | ||
59 | case BASEPROPERTY_DEFAULTCONTROL: | ||
60 | return uno::makeAny( OUString::createFromAscii( szServiceName_UnoThrobberControl ) ); | ||
61 | case BASEPROPERTY_BORDER: | ||
62 | return uno::makeAny( (sal_Int16) 0 ); | ||
63 | default: | ||
64 | return UnoControlModel::ImplGetDefaultValue( nPropId ); | ||
65 | } | ||
66 | } | ||
67 | |||
68 | //-------------------------------------------------------------------- | ||
69 | ::cppu::IPropertyArrayHelper& UnoThrobberControlModel::getInfoHelper() | ||
70 | { | ||
71 | static UnoPropertyArrayHelper* pHelper = NULL; | ||
72 | if ( !pHelper ) | ||
73 | { | ||
74 | uno::Sequence< sal_Int32 > aIDs = ImplGetPropertyIds(); | ||
75 | pHelper = new UnoPropertyArrayHelper( aIDs ); | ||
76 | } | ||
77 | return *pHelper; | ||
78 | } | ||
79 | |||
80 | //-------------------------------------------------------------------- | ||
81 | uno::Reference< beans::XPropertySetInfo > UnoThrobberControlModel::getPropertySetInfo() | ||
82 | throw( uno::RuntimeException ) | ||
83 | { | ||
84 | static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); | ||
85 | return xInfo; | ||
86 | } | ||
87 | |||
88 | //-------------------------------------------------------------------- | ||
89 | OUString SAL_CALL UnoThrobberControlModel::getImplementationName() | ||
90 | throw( uno::RuntimeException ) | ||
91 | { | ||
92 | return OUString( "com.sun.star.comp.toolkit.UnoThrobberControlModel" ); | ||
93 | } | ||
94 | |||
95 | //-------------------------------------------------------------------- | ||
96 | uno::Sequence< OUString > SAL_CALL UnoThrobberControlModel::getSupportedServiceNames() | ||
97 | throw( uno::RuntimeException ) | ||
98 | { | ||
99 | uno::Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() ); | ||
100 | aServices.realloc( aServices.getLength() + 2 ); | ||
101 | aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2] = | ||
102 | OUString::createFromAscii(szServiceName_UnoThrobberControlModel); | ||
103 | aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1] = | ||
104 | OUString::createFromAscii(szServiceName2_UnoThrobberControlModel); | ||
105 | return aServices; | ||
106 | } | ||
107 | |||
108 | //==================================================================== | ||
109 | //= UnoThrobberControl | ||
110 | //==================================================================== | ||
111 | //-------------------------------------------------------------------- | ||
112 | UnoThrobberControl::UnoThrobberControl() | ||
113 | :UnoControlBase() | ||
114 | { | ||
115 | } | ||
116 | |||
117 | //-------------------------------------------------------------------- | ||
118 | OUString UnoThrobberControl::GetComponentServiceName() | ||
119 | { | ||
120 | return OUString("Throbber"); | ||
121 | } | ||
122 | |||
123 | //-------------------------------------------------------------------- | ||
124 | uno::Any UnoThrobberControl::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException ) | ||
125 | { | ||
126 | uno::Any aRet = UnoControlBase::queryAggregation( rType ); | ||
127 | if ( !aRet.hasValue() ) | ||
128 | aRet = UnoThrobberControl_Base::queryInterface( rType ); | ||
129 | return aRet; | ||
130 | } | ||
131 | |||
132 | //-------------------------------------------------------------------- | ||
133 | IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoThrobberControl, UnoControlBase, UnoThrobberControl_Base ) | ||
134 | |||
135 | //-------------------------------------------------------------------- | ||
136 | void UnoThrobberControl::dispose() throw( uno::RuntimeException ) | ||
137 | { | ||
138 | ::osl::ClearableMutexGuard aGuard( GetMutex() ); | ||
139 | |||
140 | UnoControl::dispose(); | ||
141 | } | ||
142 | |||
143 | //-------------------------------------------------------------------- | ||
144 | OUString SAL_CALL UnoThrobberControl::getImplementationName() | ||
145 | throw( uno::RuntimeException ) | ||
146 | { | ||
147 | return OUString( "com.sun.star.comp.toolkit.UnoThrobberControl" ); | ||
148 | } | ||
149 | |||
150 | //-------------------------------------------------------------------- | ||
151 | uno::Sequence< OUString > SAL_CALL UnoThrobberControl::getSupportedServiceNames() | ||
152 | throw( uno::RuntimeException ) | ||
153 | { | ||
154 | uno::Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() ); | ||
155 | aServices.realloc( aServices.getLength() + 2 ); | ||
156 | aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2] = | ||
157 | OUString::createFromAscii(szServiceName_UnoThrobberControl); | ||
158 | aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1] = | ||
159 | OUString::createFromAscii(szServiceName2_UnoThrobberControl); | ||
160 | return aServices; | ||
161 | } | ||
162 | |||
163 | //-------------------------------------------------------------------- | ||
164 | void UnoThrobberControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, | ||
165 | const uno::Reference< awt::XWindowPeer > & rParentPeer ) | ||
166 | throw( uno::RuntimeException ) | ||
167 | { | ||
168 | UnoControl::createPeer( rxToolkit, rParentPeer ); | ||
169 | } | ||
170 | |||
171 | //-------------------------------------------------------------------- | ||
172 | void SAL_CALL UnoThrobberControl::start() throw ( uno::RuntimeException ) | ||
173 | { | ||
174 | ::osl::MutexGuard aGuard( GetMutex() ); | ||
175 | |||
176 | uno::Reference< XThrobber > xAnimation( getPeer(), uno::UNO_QUERY ); | ||
177 | if ( xAnimation.is() ) | ||
178 | xAnimation->start(); | ||
179 | } | ||
180 | |||
181 | //-------------------------------------------------------------------- | ||
182 | void SAL_CALL UnoThrobberControl::stop() throw ( uno::RuntimeException ) | ||
183 | { | ||
184 | ::osl::MutexGuard aGuard( GetMutex() ); | ||
185 | |||
186 | uno::Reference< XThrobber > xAnimation( getPeer(), uno::UNO_QUERY ); | ||
187 | if ( xAnimation.is() ) | ||
188 | xAnimation->stop(); | ||
189 | } | ||
190 | |||
191 | //........................................................................ | ||
192 | } // namespace toolkit | ||
193 | //........................................................................ | ||
194 | |||
195 | /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ | ||
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx index f4e2bd242c07..5f48dd4ca253 100644 --- a/toolkit/source/helper/registerservices.cxx +++ b/toolkit/source/helper/registerservices.cxx | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <toolkit/controls/tkscrollbar.hxx> | 42 | #include <toolkit/controls/tkscrollbar.hxx> |
43 | #include "toolkit/controls/tkspinbutton.hxx" | 43 | #include "toolkit/controls/tkspinbutton.hxx" |
44 | #include <toolkit/controls/tksimpleanimation.hxx> | 44 | #include <toolkit/controls/tksimpleanimation.hxx> |
45 | #include <toolkit/controls/tkthrobber.hxx> | ||
46 | #include <toolkit/controls/animatedimages.hxx> | 45 | #include <toolkit/controls/animatedimages.hxx> |
47 | #include <toolkit/controls/spinningprogress.hxx> | 46 | #include <toolkit/controls/spinningprogress.hxx> |
48 | #include <toolkit/controls/tabpagemodel.hxx> | 47 | #include <toolkit/controls/tabpagemodel.hxx> |
@@ -176,8 +175,6 @@ IMPL_CREATEINSTANCE( UnoRoadmapControl ) | |||
176 | IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel ) | 175 | IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel ) |
177 | IMPL_CREATEINSTANCE( UnoSimpleAnimationControl ) | 176 | IMPL_CREATEINSTANCE( UnoSimpleAnimationControl ) |
178 | IMPL_CREATEINSTANCE_CTX( UnoSimpleAnimationControlModel ) | 177 | IMPL_CREATEINSTANCE_CTX( UnoSimpleAnimationControlModel ) |
179 | IMPL_CREATEINSTANCE( UnoThrobberControl ) | ||
180 | IMPL_CREATEINSTANCE_CTX( UnoThrobberControlModel ) | ||
181 | IMPL_CREATEINSTANCE_CTX( UnoControlTabPage ) | 178 | IMPL_CREATEINSTANCE_CTX( UnoControlTabPage ) |
182 | IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel ) | 179 | IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel ) |
183 | IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer ) | 180 | IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer ) |
@@ -278,8 +275,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple | |||
278 | GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL ) | 275 | GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL ) |
279 | GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel ) | 276 | GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel ) |
280 | GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl ) | 277 | GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl ) |
281 | GET_FACTORY( UnoThrobberControlModel, szServiceName_UnoThrobberControlModel, szServiceName2_UnoThrobberControlModel ) | ||
282 | GET_FACTORY( UnoThrobberControl, szServiceName_UnoThrobberControl, szServiceName2_UnoThrobberControl ) | ||
283 | GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL ) | 278 | GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL ) |
284 | GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL ) | 279 | GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL ) |
285 | GET_FACTORY( GridControl, szServiceName_GridControl, NULL ); | 280 | GET_FACTORY( GridControl, szServiceName_GridControl, NULL ); |
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index bd33becf1c39..68044149a503 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 | |||
94 | const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel"; | 94 | const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel"; |
95 | const sal_Char szServiceName_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoControlSimpleAnimationModel"; | 95 | const sal_Char szServiceName_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoControlSimpleAnimationModel"; |
96 | const sal_Char szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation"; | 96 | const sal_Char szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation"; |
97 | const sal_Char szServiceName_UnoThrobberControlModel[] = "com.sun.star.awt.UnoThrobberControlModel", szServiceName2_UnoThrobberControlModel[] = "com.sun.star.awt.UnoControlThrobberModel"; | ||
98 | const sal_Char szServiceName_UnoThrobberControl[] = "com.sun.star.awt.UnoThrobberControl", szServiceName2_UnoThrobberControl[] = "com.sun.star.awt.UnoControlThrobber"; | ||
99 | const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink"; | 97 | const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink"; |
100 | const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel"; | 98 | const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel"; |
101 | const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; | 99 | const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; |
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component index 930d172f4ff2..6021b96f5882 100644 --- a/toolkit/util/tk.component +++ b/toolkit/util/tk.component | |||
@@ -278,14 +278,6 @@ | |||
278 | <implementation name="stardiv.Toolkit.UnoSpinButtonModel"> | 278 | <implementation name="stardiv.Toolkit.UnoSpinButtonModel"> |
279 | <service name="com.sun.star.awt.UnoControlSpinButtonModel"/> | 279 | <service name="com.sun.star.awt.UnoControlSpinButtonModel"/> |
280 | </implementation> | 280 | </implementation> |
281 | <implementation name="stardiv.Toolkit.UnoThrobberControl"> | ||
282 | <service name="com.sun.star.awt.UnoControlThrobber"/> | ||
283 | <service name="com.sun.star.awt.UnoThrobberControl"/> | ||
284 | </implementation> | ||
285 | <implementation name="stardiv.Toolkit.UnoThrobberControlModel"> | ||
286 | <service name="com.sun.star.awt.UnoControlThrobberModel"/> | ||
287 | <service name="com.sun.star.awt.UnoThrobberControlModel"/> | ||
288 | </implementation> | ||
289 | <implementation name="stardiv.Toolkit.UnoTimeFieldControl"> | 281 | <implementation name="stardiv.Toolkit.UnoTimeFieldControl"> |
290 | <service name="com.sun.star.awt.UnoControlTimeField"/> | 282 | <service name="com.sun.star.awt.UnoControlTimeField"/> |
291 | <service name="stardiv.vcl.control.TimeField"/> | 283 | <service name="stardiv.vcl.control.TimeField"/> |