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 /offapi | |
parent | 38ca96beac15a4addae559b7dffff0ee1f6a5c5d (diff) |
Related: #i121513# Remove deprecated UnoControlThrobberModel
(cherry picked from commit 5569d97f06a0299e41b91ca248bf7eaa038b1f21)
Conflicts:
icon-themes/human/toolkit/source/awt/spinner03-grey_01.png
icon-themes/human/toolkit/source/awt/spinner03-grey_02.png
icon-themes/human/toolkit/source/awt/spinner03-grey_03.png
icon-themes/human/toolkit/source/awt/spinner03-grey_04.png
icon-themes/human/toolkit/source/awt/spinner03-grey_05.png
icon-themes/human/toolkit/source/awt/spinner03-grey_06.png
icon-themes/human/toolkit/source/awt/spinner03-grey_07.png
icon-themes/human/toolkit/source/awt/spinner03-grey_08.png
icon-themes/human/toolkit/source/awt/spinner03-grey_09.png
icon-themes/human/toolkit/source/awt/spinner03-grey_10.png
icon-themes/human/toolkit/source/awt/spinner03-grey_11.png
icon-themes/human/toolkit/source/awt/spinner03-grey_12.png
offapi/com/sun/star/awt/UnoControlThrobber.idl
offapi/com/sun/star/awt/UnoControlThrobberModel.idl
offapi/com/sun/star/awt/XThrobber.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
rat-excludes
swext/mediawiki/help/component.txt
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
swext/mediawiki/src/description.xml
toolkit/AllLangResTarget_tk.mk
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/awt/xthrobber.hrc
toolkit/source/awt/xthrobber.src
toolkit/source/controls/tkthrobber.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/src2xml/src.lst
toolkit/util/toolkit.xml
Change-Id: Ic415a96fe6ba7040a3b03fd562f997d2df1516d6
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
-rw-r--r-- | offapi/com/sun/star/awt/UnoControlThrobber.idl | 48 | ||||
-rw-r--r-- | offapi/com/sun/star/awt/UnoControlThrobberModel.idl | 45 | ||||
-rw-r--r-- | offapi/com/sun/star/awt/WindowDescriptor.idl | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/awt/XThrobber.idl | 44 |
5 files changed, 0 insertions, 141 deletions
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,\ UnoControlSimpleAnimationModel \ UnoControlSpinButton \ UnoControlSpinButtonModel \ - UnoControlThrobber \ - UnoControlThrobberModel \ UnoControlTimeField \ UnoControlTimeFieldModel \ )) @@ -1874,7 +1872,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ XTextEditField \ XTextLayoutConstrains \ XTextListener \ - XThrobber \ XTimeField \ XToggleButton \ XToolkit \ diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl deleted file mode 100644 index ef9e5fc7d45d..000000000000 --- a/offapi/com/sun/star/awt/UnoControlThrobber.idl +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef __com_sun_star_awt_UnoControlThrobber_idl__ -#define __com_sun_star_awt_UnoControlThrobber_idl__ - -#include <com/sun/star/awt/UnoControl.idl> -#include <com/sun/star/awt/XThrobber.idl> - - - - module com { module sun { module star { module awt { - - -/** - @since OOo 2.2 - @deprecated - You should use AnimatedImagesControl and SpinningProgressControlModel - */ -published service UnoControlThrobber -{ - service com::sun::star::awt::UnoControl; - interface com::sun::star::awt::XThrobber; - -}; - - -}; }; }; }; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl deleted file mode 100644 index 363750b4fe69..000000000000 --- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef __com_sun_star_awt_UnoControlThrobberModel_idl__ -#define __com_sun_star_awt_UnoControlThrobberModel_idl__ - -#include <com/sun/star/awt/UnoControlModel.idl> - - - - module com { module sun { module star { module awt { - - -/** - @since OOo 2.2 - @deprecated - You should use SpinningProgressControlModel. - */ - -published service UnoControlThrobberModel -{ - service com::sun::star::awt::UnoControlModel; -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/awt/WindowDescriptor.idl b/offapi/com/sun/star/awt/WindowDescriptor.idl index 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 <li>simpleanimation</li> <li>spinbutton</li> <li>spinfield</li> - <li>throbber</li> <li>splitter</li> <li>splitwindow</li> <li>statusbar</li> diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl deleted file mode 100644 index fdbd436b72a5..000000000000 --- a/offapi/com/sun/star/awt/XThrobber.idl +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef __com_sun_star_awt_XThrobber_idl__ -#define __com_sun_star_awt_XThrobber_idl__ - -#include <com/sun/star/uno/XInterface.idl> -#include <com/sun/star/graphic/XGraphic.idl> - - - module com { module sun { module star { module awt { - - -/** - @deprecated - You should use XAnimation, AnimatedImagesControl, and SpinningProgressControlModel. - */ -published interface XThrobber: com::sun::star::uno::XInterface -{ - void start(); - void stop(); -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |