summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2012-12-20 03:56:35 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-07-05 10:12:26 +0100
commit303096c50c850b05a158a1a429c9fd5d0251a892 (patch)
tree288ead4e8f9d50ad7142e3e496a0bfc0d79d8639
parent680608b15dd158f9ad4ceae328abb10b5185a27b (diff)
Related: #i121514# Remove deprecated UnoControlSimpleAnimation
(cherry picked from commit 514bb6777e001d02dbd9be63fc7a6187560aad63) Conflicts: offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl offapi/com/sun/star/awt/XSimpleAnimation.idl offapi/com/sun/star/awt/makefile.mk offapi/type_reference/typelibrary_history.txt offapi/type_reference/types.rdb toolkit/inc/toolkit/helper/servicenames.hxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/xsimpleanimation.cxx toolkit/source/controls/tksimpleanimation.cxx toolkit/source/helper/registerservices.cxx toolkit/source/helper/servicenames.cxx toolkit/util/toolkit.xml Change-Id: If7f8de62713e28434e28975026cf8e5c66c831aa
Diffstat
-rw-r--r--include/toolkit/helper/servicenames.hxx2
-rw-r--r--offapi/UnoApi_offapi.mk3
-rw-r--r--offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl48
-rw-r--r--offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl47
-rw-r--r--offapi/com/sun/star/awt/WindowDescriptor.idl1
-rw-r--r--offapi/com/sun/star/awt/XSimpleAnimation.idl45
-rw-r--r--qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv36
-rw-r--r--qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv29
-rw-r--r--toolkit/Library_tk.mk2
-rw-r--r--toolkit/qa/unoapi/knownissues.xcl11
-rw-r--r--toolkit/qa/unoapi/toolkit.sce2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx11
-rw-r--r--toolkit/source/awt/xsimpleanimation.cxx142
-rw-r--r--toolkit/source/controls/tksimpleanimation.cxx183
-rw-r--r--toolkit/source/helper/registerservices.cxx5
-rw-r--r--toolkit/source/helper/servicenames.cxx2
-rw-r--r--toolkit/util/tk.component8
17 files changed, 1 insertions, 576 deletions
diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx
index 32b964a90029..fffdc16d0a6f 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -97,8 +97,6 @@ extern const sal_Char szServiceName_DefaultGridColumnModel[];
97extern const sal_Char szServiceName_GridColumn[]; 97extern const sal_Char szServiceName_GridColumn[];
98extern const sal_Char szServiceName_SortableGridDataModel[]; 98extern const sal_Char szServiceName_SortableGridDataModel[];
99 99
100extern const sal_Char szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
101extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
102extern const sal_Char szServiceName_AnimatedImagesControl[]; 100extern const sal_Char szServiceName_AnimatedImagesControl[];
103extern const sal_Char szServiceName_AnimatedImagesControlModel[]; 101extern const sal_Char szServiceName_AnimatedImagesControlModel[];
104extern const sal_Char szServiceName_SpinningProgressControlModel[]; 102extern const sal_Char szServiceName_SpinningProgressControlModel[];
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index ad51c73c045c..c743345de38b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -573,8 +573,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
573 UnoControlRoadmapModel \ 573 UnoControlRoadmapModel \
574 UnoControlScrollBar \ 574 UnoControlScrollBar \
575 UnoControlScrollBarModel \ 575 UnoControlScrollBarModel \
576 UnoControlSimpleAnimation \
577 UnoControlSimpleAnimationModel \
578 UnoControlSpinButton \ 576 UnoControlSpinButton \
579 UnoControlSpinButtonModel \ 577 UnoControlSpinButtonModel \
580 UnoControlTimeField \ 578 UnoControlTimeField \
@@ -1853,7 +1851,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
1853 XRequestCallback \ 1851 XRequestCallback \
1854 XReschedule \ 1852 XReschedule \
1855 XScrollBar \ 1853 XScrollBar \
1856 XSimpleAnimation \
1857 XSimpleTabController \ 1854 XSimpleTabController \
1858 XSpinField \ 1855 XSpinField \
1859 XSpinListener \ 1856 XSpinListener \
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
deleted file mode 100644
index 94bcf2f06541..000000000000
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.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_UnoControlSimpleAnimation_idl__
20#define __com_sun_star_awt_UnoControlSimpleAnimation_idl__
21
22#include <com/sun/star/awt/UnoControl.idl>
23#include <com/sun/star/awt/XSimpleAnimation.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.
34 */
35published service UnoControlSimpleAnimation
36{
37 service com::sun::star::awt::UnoControl;
38 interface com::sun::star::awt::XSimpleAnimation;
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/UnoControlSimpleAnimationModel.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
deleted file mode 100644
index 8eda31c21ada..000000000000
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
+++ /dev/null
@@ -1,47 +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_UnoControlSimpleAnimationModel_idl__
20#define __com_sun_star_awt_UnoControlSimpleAnimationModel_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 AnimatedImagesControlModel.
33 */
34
35published service UnoControlSimpleAnimationModel
36{
37 service com::sun::star::awt::UnoControlModel;
38 [property] long StepTime;
39 [property] boolean AutoRepeat;
40};
41
42
43}; }; }; };
44
45#endif
46
47/* 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 eaec84b8ccc1..7cd5dee8f770 100644
--- a/offapi/com/sun/star/awt/WindowDescriptor.idl
+++ b/offapi/com/sun/star/awt/WindowDescriptor.idl
@@ -92,7 +92,6 @@ published struct WindowDescriptor
92 <li>radiobutton</li> 92 <li>radiobutton</li>
93 <li>scrollbar</li> 93 <li>scrollbar</li>
94 <li>scrollbarbox</li> 94 <li>scrollbarbox</li>
95 <li>simpleanimation</li>
96 <li>spinbutton</li> 95 <li>spinbutton</li>
97 <li>spinfield</li> 96 <li>spinfield</li>
98 <li>splitter</li> 97 <li>splitter</li>
diff --git a/offapi/com/sun/star/awt/XSimpleAnimation.idl b/offapi/com/sun/star/awt/XSimpleAnimation.idl
deleted file mode 100644
index 1d2b2ba64294..000000000000
--- a/offapi/com/sun/star/awt/XSimpleAnimation.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_XSimpleAnimation_idl__
20#define __com_sun_star_awt_XSimpleAnimation_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 AnimatedImagesControlModel.
32 */
33published interface XSimpleAnimation: com::sun::star::uno::XInterface
34{
35 void start();
36 void stop();
37 void setImageList( [in] sequence < com::sun::star::graphic::XGraphic > ImageList );
38};
39
40
41}; }; }; };
42
43#endif
44
45/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv
deleted file mode 100644
index 8b460529f33c..000000000000
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv
+++ /dev/null
@@ -1,36 +0,0 @@
1"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"setGraphics()"
2"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"getGraphics()"
3"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"getSize()"
4"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"draw()"
5"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"setZoom()"
6"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"dispose()"
7"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"addEventListener()"
8"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"removeEventListener()"
9"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setContext()"
10"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getContext()"
11"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"createPeer()"
12"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getPeer()"
13"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setModel()"
14"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getModel()"
15"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getView()"
16"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setDesignMode()"
17"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"isDesignMode()"
18"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"isTransparent()"
19"UnoSimpleAnimationControl";"com::sun::star::accessibility::XAccessible#optional";"getAccessibleContext()"
20"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setPosSize()"
21"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"getPosSize()"
22"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setVisible()"
23"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setEnable()"
24"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setFocus()"
25"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addWindowListener()"
26"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeWindowListener()"
27"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addFocusListener()"
28"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeFocusListener()"
29"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addKeyListener()"
30"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeKeyListener()"
31"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addMouseListener()"
32"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeMouseListener()"
33"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addMouseMotionListener()"
34"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeMouseMotionListener()"
35"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addPaintListener()"
36"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removePaintListener()"
diff --git a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv b/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv
deleted file mode 100644
index 8862a2448b88..000000000000
--- a/qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv
+++ /dev/null
@@ -1,29 +0,0 @@
1"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlModel";"DefaultControl"
2"UnoSimpleAnimationControlModel";"com::sun::star::util::XCloneable";"createClone()"
3"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Height"
4"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Name"
5"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionX"
6"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionY"
7"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Step"
8"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"TabIndex"
9"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Tag"
10"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Width"
11"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"dispose()"
12"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"addEventListener()"
13"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"removeEventListener()"
14"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertySetInfo()"
15"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"setPropertyValues()"
16"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertyValues()"
17"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"addPropertiesChangeListener()"
18"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"removePropertiesChangeListener()"
19"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"firePropertiesChangeEvent()"
20"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"getServiceName()"
21"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"write()"
22"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"read()"
23"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
24"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
25"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
26"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
27"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
28"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
29"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index f054ed0186cd..57a0bd30d9f0 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -69,7 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
69 toolkit/source/awt/vclxwindow \ 69 toolkit/source/awt/vclxwindow \
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 \
73 toolkit/source/controls/accessiblecontrolcontext \ 72 toolkit/source/controls/accessiblecontrolcontext \
74 toolkit/source/controls/controlmodelcontainerbase \ 73 toolkit/source/controls/controlmodelcontainerbase \
75 toolkit/source/controls/dialogcontrol \ 74 toolkit/source/controls/dialogcontrol \
@@ -89,7 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
89 toolkit/source/controls/stdtabcontroller \ 88 toolkit/source/controls/stdtabcontroller \
90 toolkit/source/controls/stdtabcontrollermodel \ 89 toolkit/source/controls/stdtabcontrollermodel \
91 toolkit/source/controls/tkscrollbar \ 90 toolkit/source/controls/tkscrollbar \
92 toolkit/source/controls/tksimpleanimation \
93 toolkit/source/controls/tkspinbutton \ 91 toolkit/source/controls/tkspinbutton \
94 toolkit/source/controls/animatedimages \ 92 toolkit/source/controls/animatedimages \
95 toolkit/source/controls/spinningprogress \ 93 toolkit/source/controls/spinningprogress \
diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl
index 487d4b1895ce..c6a1aa6cfd55 100644
--- a/toolkit/qa/unoapi/knownissues.xcl
+++ b/toolkit/qa/unoapi/knownissues.xcl
@@ -120,14 +120,6 @@ toolkit.UnoControlFormattedField
120toolkit.UnoControlListBox 120toolkit.UnoControlListBox
121# -> disabled in toolkit.sce 121# -> disabled in toolkit.sce
122 122
123### i86020 ###
124toolkit.UnoSimpleAnimationControl
125# -> disabled in toolkit.sce
126
127### i86021 ###
128toolkit.UnoSimpleAnimationControlModel
129# -> disabled in toolkit.sce
130
131### i86298 ### 123### i86298 ###
132toolkit.UnoTreeControl 124toolkit.UnoTreeControl
133# -> disabled in toolkit.sce 125# -> disabled in toolkit.sce
@@ -153,7 +145,6 @@ toolkit.UnoControlImageControl::com::sun::star::awt::XView
153toolkit.UnoControlDialog::com::sun::star::awt::XView 145toolkit.UnoControlDialog::com::sun::star::awt::XView
154toolkit.UnoControlFileControl::com::sun::star::awt::XView 146toolkit.UnoControlFileControl::com::sun::star::awt::XView
155toolkit.UnoControlCurrencyField::com::sun::star::awt::XView 147toolkit.UnoControlCurrencyField::com::sun::star::awt::XView
156toolkit.UnoSimpleAnimationControl::com::sun::star::awt::XView
157toolkit.UnoControlComboBox::com::sun::star::awt::XView 148toolkit.UnoControlComboBox::com::sun::star::awt::XView
158toolkit.UnoControlNumericField::com::sun::star::awt::XView 149toolkit.UnoControlNumericField::com::sun::star::awt::XView
159toolkit.UnoControlCheckBox::com::sun::star::awt::XView 150toolkit.UnoControlCheckBox::com::sun::star::awt::XView
@@ -193,11 +184,9 @@ toolkit.UnoControlDialog::com::sun::star::lang::XComponent
193toolkit.UnoControlGroupBoxModel::com::sun::star::lang::XComponent 184toolkit.UnoControlGroupBoxModel::com::sun::star::lang::XComponent
194toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent 185toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent
195toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent 186toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent
196toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent
197toolkit.UnoControlFileControl::com::sun::star::lang::XComponent 187toolkit.UnoControlFileControl::com::sun::star::lang::XComponent
198toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent 188toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent
199toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent 189toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent
200toolkit.UnoSimpleAnimationControl::com::sun::star::lang::XComponent
201toolkit.UnoControlComboBox::com::sun::star::lang::XComponent 190toolkit.UnoControlComboBox::com::sun::star::lang::XComponent
202toolkit.UnoControlNumericField::com::sun::star::lang::XComponent 191toolkit.UnoControlNumericField::com::sun::star::lang::XComponent
203toolkit.UnoControlScrollBarModel::com::sun::star::lang::XComponent 192toolkit.UnoControlScrollBarModel::com::sun::star::lang::XComponent
diff --git a/toolkit/qa/unoapi/toolkit.sce b/toolkit/qa/unoapi/toolkit.sce
index 7b6ebfad4edb..3ec384dded3d 100644
--- a/toolkit/qa/unoapi/toolkit.sce
+++ b/toolkit/qa/unoapi/toolkit.sce
@@ -85,8 +85,6 @@
85-o toolkit.UnoControlTimeField 85-o toolkit.UnoControlTimeField
86-o toolkit.UnoControlTimeFieldModel 86-o toolkit.UnoControlTimeFieldModel
87-o toolkit.UnoScrollBarControl 87-o toolkit.UnoScrollBarControl
88#i86020 -o toolkit.UnoSimpleAnimationControl
89#i86021 -o toolkit.UnoSimpleAnimationControlModel
90-o toolkit.UnoSpinButtonControl 88-o toolkit.UnoSpinButtonControl
91-o toolkit.UnoSpinButtonControlModel 89-o toolkit.UnoSpinButtonControlModel
92#i86298 -o toolkit.UnoTreeControl 90#i86298 -o toolkit.UnoTreeControl
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 7893f479dd27..5be6f14bc60c 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -68,7 +68,6 @@ using org::libreoffice::touch::ByteBufferWrapper;
68#include <toolkit/awt/vclxtabpagecontainer.hxx> 68#include <toolkit/awt/vclxtabpagecontainer.hxx>
69#include <toolkit/awt/vclxtabpagemodel.hxx> 69#include <toolkit/awt/vclxtabpagemodel.hxx>
70 70
71#include <toolkit/awt/xsimpleanimation.hxx>
72#include <toolkit/awt/animatedimagespeer.hxx> 71#include <toolkit/awt/animatedimagespeer.hxx>
73#include <toolkit/awt/vclxtopwindow.hxx> 72#include <toolkit/awt/vclxtopwindow.hxx>
74#include <toolkit/awt/vclxwindow.hxx> 73#include <toolkit/awt/vclxwindow.hxx>
@@ -307,7 +306,6 @@ static ComponentInfo aComponentInfos [] =
307 { "radiobutton", WINDOW_RADIOBUTTON }, 306 { "radiobutton", WINDOW_RADIOBUTTON },
308 { "scrollbar", WINDOW_SCROLLBAR }, 307 { "scrollbar", WINDOW_SCROLLBAR },
309 { "scrollbarbox", WINDOW_SCROLLBARBOX }, 308 { "scrollbarbox", WINDOW_SCROLLBARBOX },
310 { "simpleanimation", WINDOW_CONTROL },
311 { "animatedimages", WINDOW_CONTROL }, 309 { "animatedimages", WINDOW_CONTROL },
312 { "spinbutton", WINDOW_SPINBUTTON }, 310 { "spinbutton", WINDOW_SPINBUTTON },
313 { "spinfield", WINDOW_SPINFIELD }, 311 { "spinfield", WINDOW_SPINFIELD },
@@ -973,14 +971,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
973 } 971 }
974 break; 972 break;
975 case WINDOW_CONTROL: 973 case WINDOW_CONTROL:
976 if ( aServiceName.EqualsAscii( "simpleanimation" ) ) 974 if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
977 {
978 pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE );
979 ((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::ANISOTROPIC );
980 // (compatibility)
981 *ppNewComp = new ::toolkit::XSimpleAnimation;
982 }
983 else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
984 "tabpagecontainer" ) ) 975 "tabpagecontainer" ) )
985 { 976 {
986 pNewWindow = new TabControl( pParent, nWinBits ); 977 pNewWindow = new TabControl( pParent, nWinBits );
diff --git a/toolkit/source/awt/xsimpleanimation.cxx b/toolkit/source/awt/xsimpleanimation.cxx
deleted file mode 100644
index 0e3d857f225a..000000000000
--- a/toolkit/source/awt/xsimpleanimation.cxx
+++ /dev/null
@@ -1,142 +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/xsimpleanimation.hxx"
21#include "toolkit/helper/property.hxx"
22#include <tools/debug.hxx>
23#include <vcl/throbber.hxx>
24#include <vcl/svapp.hxx>
25
26//........................................................................
27namespace toolkit
28{
29//........................................................................
30
31 using namespace ::com::sun::star;
32
33 //====================================================================
34 //= XSimpleAnimation
35 //====================================================================
36 DBG_NAME( XSimpleAnimation )
37
38 //--------------------------------------------------------------------
39 XSimpleAnimation::XSimpleAnimation()
40 {
41 DBG_CTOR( XSimpleAnimation, NULL );
42 }
43
44 //--------------------------------------------------------------------
45 XSimpleAnimation::~XSimpleAnimation()
46 {
47 DBG_DTOR( XSimpleAnimation, NULL );
48 }
49
50 //--------------------------------------------------------------------
51 void SAL_CALL XSimpleAnimation::start() throw ( uno::RuntimeException )
52 {
53 SolarMutexGuard aGuard;
54 Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
55 if ( pThrobber != NULL)
56 pThrobber->start();
57 }
58
59 //--------------------------------------------------------------------
60 void SAL_CALL XSimpleAnimation::stop() throw ( uno::RuntimeException )
61 {
62 SolarMutexGuard aGuard;
63 Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
64 if ( pThrobber != NULL)
65 pThrobber->stop();
66 }
67
68 //--------------------------------------------------------------------
69 void SAL_CALL XSimpleAnimation::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& rImageList )
70 throw ( uno::RuntimeException )
71 {
72 SolarMutexGuard aGuard;
73 Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
74 if ( pThrobber != NULL)
75 pThrobber->setImageList( rImageList );
76 }
77
78 //--------------------------------------------------------------------
79 void SAL_CALL XSimpleAnimation::setProperty( const OUString& PropertyName, const uno::Any& Value )
80 throw( uno::RuntimeException )
81 {
82 SolarMutexGuard aGuard;
83
84 Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
85 if ( pThrobber == NULL )
86 {
87 VCLXWindow::setProperty( PropertyName, Value );
88 return;
89 }
90
91 sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
92 switch ( nPropertyId )
93 {
94 case BASEPROPERTY_STEP_TIME: {
95 sal_Int32 nStepTime( 0 );
96 if ( Value >>= nStepTime )
97 pThrobber->setStepTime( nStepTime );
98
99 break;
100 }
101 case BASEPROPERTY_REPEAT: {
102 sal_Bool bRepeat( sal_True );
103 if ( Value >>= bRepeat )
104 pThrobber->setRepeat( bRepeat );
105 break;
106 }
107 default:
108 VCLXWindow::setProperty( PropertyName, Value );
109 }
110 }
111
112 //--------------------------------------------------------------------
113 uno::Any SAL_CALL XSimpleAnimation::getProperty( const OUString& PropertyName )
114 throw( uno::RuntimeException )
115 {
116 SolarMutexGuard aGuard;
117
118 Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
119 if ( pThrobber == NULL )
120 return VCLXWindow::getProperty( PropertyName );
121
122 uno::Any aReturn;
123 sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
124 switch ( nPropertyId )
125 {
126 case BASEPROPERTY_STEP_TIME:
127 aReturn <<= pThrobber->getStepTime();
128 break;
129 case BASEPROPERTY_REPEAT:
130 aReturn <<= pThrobber->getRepeat();
131 break;
132 default:
133 aReturn = VCLXWindow::getProperty( PropertyName );
134 }
135 return aReturn;
136 }
137
138//........................................................................
139} // namespace toolkit
140//........................................................................
141
142/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
deleted file mode 100644
index e581b8ce1141..000000000000
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ /dev/null
@@ -1,183 +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/tksimpleanimation.hxx"
21#include "toolkit/helper/property.hxx"
22#include "toolkit/helper/unopropertyarrayhelper.hxx"
23#include <cppuhelper/typeprovider.hxx>
24
25//........................................................................
26namespace toolkit
27{
28//........................................................................
29
30 using namespace ::com::sun::star;
31
32 //====================================================================
33 //= UnoSimpleAnimationControlModel
34 //====================================================================
35 //--------------------------------------------------------------------
36 UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
37 :UnoControlModel( i_factory )
38 {
39 ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
40 ImplRegisterProperty( BASEPROPERTY_REPEAT );
41 ImplRegisterProperty( BASEPROPERTY_STEP_TIME );
42 }
43
44 //--------------------------------------------------------------------
45 OUString UnoSimpleAnimationControlModel::getServiceName()
46 throw( uno::RuntimeException )
47 {
48 return OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
49 }
50
51 //--------------------------------------------------------------------
52 uno::Any UnoSimpleAnimationControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
53 {
54 switch ( nPropId )
55 {
56 case BASEPROPERTY_DEFAULTCONTROL:
57 return uno::makeAny( OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl ) );
58
59 case BASEPROPERTY_STEP_TIME:
60 return uno::makeAny( (sal_Int32) 100 );
61
62 case BASEPROPERTY_REPEAT:
63 return uno::makeAny( (sal_Bool)sal_True );
64
65 default:
66 return UnoControlModel::ImplGetDefaultValue( nPropId );
67 }
68 }
69
70 //--------------------------------------------------------------------
71 ::cppu::IPropertyArrayHelper& UnoSimpleAnimationControlModel::getInfoHelper()
72 {
73 static UnoPropertyArrayHelper* pHelper = NULL;
74 if ( !pHelper )
75 {
76 uno::Sequence< sal_Int32 > aIDs = ImplGetPropertyIds();
77 pHelper = new UnoPropertyArrayHelper( aIDs );
78 }
79 return *pHelper;
80 }
81
82 //--------------------------------------------------------------------
83 uno::Reference< beans::XPropertySetInfo > UnoSimpleAnimationControlModel::getPropertySetInfo( )
84 throw( uno::RuntimeException )
85 {
86 static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
87 return xInfo;
88 }
89
90 //--------------------------------------------------------------------
91 OUString SAL_CALL UnoSimpleAnimationControlModel::getImplementationName()
92 throw( uno::RuntimeException )
93 {
94 return OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel" );
95 }
96
97 //--------------------------------------------------------------------
98 uno::Sequence< OUString > SAL_CALL UnoSimpleAnimationControlModel::getSupportedServiceNames()
99 throw( uno::RuntimeException )
100 {
101 uno::Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() );
102 aServices.realloc( aServices.getLength() + 2 );
103 aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2]
104 = OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
105 aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1]
106 = OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel );
107 return aServices;
108 }
109
110 //====================================================================
111 //= UnoSimpleAnimationControl
112 //====================================================================
113 //--------------------------------------------------------------------
114 UnoSimpleAnimationControl::UnoSimpleAnimationControl()
115 :UnoSimpleAnimationControl_Base()
116 {
117 }
118
119 //--------------------------------------------------------------------
120 OUString UnoSimpleAnimationControl::GetComponentServiceName()
121 {
122 return OUString("SimpleAnimation");
123 }
124
125 //--------------------------------------------------------------------
126 OUString SAL_CALL UnoSimpleAnimationControl::getImplementationName()
127 throw( uno::RuntimeException )
128 {
129 return OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControl" );
130 }
131
132 //--------------------------------------------------------------------
133 uno::Sequence< OUString > SAL_CALL UnoSimpleAnimationControl::getSupportedServiceNames()
134 throw( uno::RuntimeException )
135 {
136 uno::Sequence< OUString > aServices( UnoSimpleAnimationControl_Base::getSupportedServiceNames() );
137 aServices.realloc( aServices.getLength() + 1 );
138 aServices[ aServices.getLength() - 1 ] = OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl );
139 return aServices;
140 }
141
142 //--------------------------------------------------------------------
143 void SAL_CALL UnoSimpleAnimationControl::start() throw ( uno::RuntimeException )
144 {
145 uno::Reference< XSimpleAnimation > xAnimation;
146 {
147 ::osl::MutexGuard aGuard( GetMutex() );
148 xAnimation.set( getPeer(), uno::UNO_QUERY );
149 }
150 if ( xAnimation.is() )
151 xAnimation->start();
152 }
153
154 //--------------------------------------------------------------------
155 void SAL_CALL UnoSimpleAnimationControl::stop() throw ( uno::RuntimeException )
156 {
157 uno::Reference< XSimpleAnimation > xAnimation;
158 {
159 ::osl::MutexGuard aGuard( GetMutex() );
160 xAnimation.set( getPeer(), uno::UNO_QUERY );
161 }
162 if ( xAnimation.is() )
163 xAnimation->stop();
164 }
165
166 //--------------------------------------------------------------------
167 void SAL_CALL UnoSimpleAnimationControl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& ImageList )
168 throw ( uno::RuntimeException )
169 {
170 uno::Reference< XSimpleAnimation > xAnimation;
171 {
172 ::osl::MutexGuard aGuard( GetMutex() );
173 xAnimation.set( getPeer(), uno::UNO_QUERY );
174 }
175 if ( xAnimation.is() )
176 xAnimation->setImageList( ImageList );
177 }
178
179//........................................................................
180} // namespace toolkit
181//........................................................................
182
183/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index 5f48dd4ca253..93eacbf6160b 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -41,7 +41,6 @@
41#include <toolkit/controls/roadmapcontrol.hxx> 41#include <toolkit/controls/roadmapcontrol.hxx>
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>
45#include <toolkit/controls/animatedimages.hxx> 44#include <toolkit/controls/animatedimages.hxx>
46#include <toolkit/controls/spinningprogress.hxx> 45#include <toolkit/controls/spinningprogress.hxx>
47#include <toolkit/controls/tabpagemodel.hxx> 46#include <toolkit/controls/tabpagemodel.hxx>
@@ -173,8 +172,6 @@ IMPL_CREATEINSTANCE( VCLXPopupMenu )
173IMPL_CREATEINSTANCE( VCLXPrinterServer ) 172IMPL_CREATEINSTANCE( VCLXPrinterServer )
174IMPL_CREATEINSTANCE( UnoRoadmapControl ) 173IMPL_CREATEINSTANCE( UnoRoadmapControl )
175IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel ) 174IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel )
176IMPL_CREATEINSTANCE( UnoSimpleAnimationControl )
177IMPL_CREATEINSTANCE_CTX( UnoSimpleAnimationControlModel )
178IMPL_CREATEINSTANCE_CTX( UnoControlTabPage ) 175IMPL_CREATEINSTANCE_CTX( UnoControlTabPage )
179IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel ) 176IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel )
180IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer ) 177IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer )
@@ -273,8 +270,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
273 GET_FACTORY( TreeControl, szServiceName_TreeControl, NULL ) 270 GET_FACTORY( TreeControl, szServiceName_TreeControl, NULL )
274 GET_FACTORY( TreeControlModel, szServiceName_TreeControlModel, NULL ) 271 GET_FACTORY( TreeControlModel, szServiceName_TreeControlModel, NULL )
275 GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL ) 272 GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
276 GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel )
277 GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl )
278 GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL ) 273 GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL )
279 GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL ) 274 GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL )
280 GET_FACTORY( GridControl, szServiceName_GridControl, NULL ); 275 GET_FACTORY( GridControl, szServiceName_GridControl, NULL );
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 68044149a503..52a43497b6d8 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -92,8 +92,6 @@ const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
92const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl"; 92const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
93const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel"; 93const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
94const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel"; 94const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
95const sal_Char szServiceName_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoControlSimpleAnimationModel";
96const sal_Char szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation";
97const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink"; 95const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
98const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel"; 96const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
99const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; 97const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index 6021b96f5882..9c8622df1057 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -255,14 +255,6 @@
255 <service name="com.sun.star.awt.UnoControlScrollBar"/> 255 <service name="com.sun.star.awt.UnoControlScrollBar"/>
256 <service name="stardiv.vcl.control.ScrollBar"/> 256 <service name="stardiv.vcl.control.ScrollBar"/>
257 </implementation> 257 </implementation>
258 <implementation name="stardiv.Toolkit.UnoSimpleAnimationControl">
259 <service name="com.sun.star.awt.UnoControlSimpleAnimation"/>
260 <service name="com.sun.star.awt.UnoSimpleAnimationControl"/>
261 </implementation>
262 <implementation name="stardiv.Toolkit.UnoSimpleAnimationControlModel">
263 <service name="com.sun.star.awt.UnoControlSimpleAnimationModel"/>
264 <service name="com.sun.star.awt.UnoSimpleAnimationControlModel"/>
265 </implementation>
266 <implementation name="org.openoffice.comp.toolkit.SpinningProgressControlModel"> 258 <implementation name="org.openoffice.comp.toolkit.SpinningProgressControlModel">
267 <service name="com.sun.star.awt.SpinningProgressControlModel"/> 259 <service name="com.sun.star.awt.SpinningProgressControlModel"/>
268 </implementation> 260 </implementation>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 06:52:36 +0000