From 303096c50c850b05a158a1a429c9fd5d0251a892 Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Thu, 20 Dec 2012 03:56:35 +0000 Subject: 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 --- offapi/UnoApi_offapi.mk | 3 -- .../com/sun/star/awt/UnoControlSimpleAnimation.idl | 48 ---------------------- .../star/awt/UnoControlSimpleAnimationModel.idl | 47 --------------------- offapi/com/sun/star/awt/WindowDescriptor.idl | 1 - offapi/com/sun/star/awt/XSimpleAnimation.idl | 45 -------------------- 5 files changed, 144 deletions(-) delete mode 100644 offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl delete mode 100644 offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl delete mode 100644 offapi/com/sun/star/awt/XSimpleAnimation.idl (limited to 'offapi') 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,\ UnoControlRoadmapModel \ UnoControlScrollBar \ UnoControlScrollBarModel \ - UnoControlSimpleAnimation \ - UnoControlSimpleAnimationModel \ UnoControlSpinButton \ UnoControlSpinButtonModel \ UnoControlTimeField \ @@ -1853,7 +1851,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ XRequestCallback \ XReschedule \ XScrollBar \ - XSimpleAnimation \ XSimpleTabController \ XSpinField \ 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 @@ -/* -*- 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_UnoControlSimpleAnimation_idl__ -#define __com_sun_star_awt_UnoControlSimpleAnimation_idl__ - -#include -#include - - - - module com { module sun { module star { module awt { - - -/** - @since OOo 2.2 - @deprecated - You should use AnimatedImagesControl. - */ -published service UnoControlSimpleAnimation -{ - service com::sun::star::awt::UnoControl; - interface com::sun::star::awt::XSimpleAnimation; - -}; - - -}; }; }; }; - - -#endif - -/* 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 @@ -/* -*- 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_UnoControlSimpleAnimationModel_idl__ -#define __com_sun_star_awt_UnoControlSimpleAnimationModel_idl__ - -#include - - - - module com { module sun { module star { module awt { - - -/** - @since OOo 2.2 - @deprecated - You should use AnimatedImagesControlModel. - */ - -published service UnoControlSimpleAnimationModel -{ - service com::sun::star::awt::UnoControlModel; - [property] long StepTime; - [property] boolean AutoRepeat; -}; - - -}; }; }; }; - -#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 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
  • radiobutton
  • scrollbar
  • scrollbarbox
    • -
  • simpleanimation
  • spinbutton
  • spinfield
  • splitter
    • 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 @@ -/* -*- 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_XSimpleAnimation_idl__ -#define __com_sun_star_awt_XSimpleAnimation_idl__ - -#include -#include - - - module com { module sun { module star { module awt { - - -/** - @deprecated - You should use XAnimation, AnimatedImagesControl, and AnimatedImagesControlModel. - */ -published interface XSimpleAnimation: com::sun::star::uno::XInterface -{ - void start(); - void stop(); - void setImageList( [in] sequence < com::sun::star::graphic::XGraphic > ImageList ); -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit