Skip to content

C
core
Kaydet (Commit) 303096c5 authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Related: #i121514# Remove deprecated UnoControlSimpleAnimation 

(cherry picked from commit 514bb677)

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
üst 680608b1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 576 deletions
include/toolkit/helper/servicenames.hxx
Dosyayı görüntüle @ 303096c5
......@@ -97,8 +97,6 @@ extern const sal_Char szServiceName_DefaultGridColumnModel[];
extern const sal_Char szServiceName_GridColumn[];
extern const sal_Char szServiceName_SortableGridDataModel[];
extern const sal_Char szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
extern const sal_Char szServiceName_AnimatedImagesControl[];
extern const sal_Char szServiceName_AnimatedImagesControlModel[];
extern const sal_Char szServiceName_SpinningProgressControlModel[];
......
offapi/UnoApi_offapi.mk
Dosyayı görüntüle @ 303096c5
......@@ -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 \
......
offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl deleted 100644 → 0
Dosyayı görüntüle @ 680608b1
/* -*- 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 <com/sun/star/awt/UnoControl.idl>
#include <com/sun/star/awt/XSimpleAnimation.idl>
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: */
offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl deleted 100644 → 0
Dosyayı görüntüle @ 680608b1
/* -*- 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 <com/sun/star/awt/UnoControlModel.idl>
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: */
offapi/com/sun/star/awt/WindowDescriptor.idl
Dosyayı görüntüle @ 303096c5
......@@ -92,7 +92,6 @@ published struct WindowDescriptor
<li>radiobutton</li>
<li>scrollbar</li>
<li>scrollbarbox</li>
<li>simpleanimation</li>
<li>spinbutton</li>
<li>spinfield</li>
<li>splitter</li>
......
offapi/com/sun/star/awt/XSimpleAnimation.idl deleted 100644 → 0
Dosyayı görüntüle @ 680608b1
/* -*- 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 <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 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: */
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControl.csv deleted 100644 → 0
Dosyayı görüntüle @ 680608b1
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"setGraphics()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"getGraphics()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"getSize()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"draw()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XView";"setZoom()"
"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"dispose()"
"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"addEventListener()"
"UnoSimpleAnimationControl";"com::sun::star::lang::XComponent";"removeEventListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setContext()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getContext()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"createPeer()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getPeer()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setModel()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getModel()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"getView()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"setDesignMode()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"isDesignMode()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XControl";"isTransparent()"
"UnoSimpleAnimationControl";"com::sun::star::accessibility::XAccessible#optional";"getAccessibleContext()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setPosSize()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"getPosSize()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setVisible()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setEnable()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"setFocus()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addWindowListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeWindowListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addFocusListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeFocusListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addKeyListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeKeyListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addMouseListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeMouseListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addMouseMotionListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removeMouseMotionListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"addPaintListener()"
"UnoSimpleAnimationControl";"com::sun::star::awt::XWindow";"removePaintListener()"
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel.csv deleted 100644 → 0
Dosyayı görüntüle @ 680608b1
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlModel";"DefaultControl"
"UnoSimpleAnimationControlModel";"com::sun::star::util::XCloneable";"createClone()"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Height"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Name"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionX"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionY"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Step"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"TabIndex"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Tag"
"UnoSimpleAnimationControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Width"
"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"dispose()"
"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"addEventListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::lang::XComponent";"removeEventListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertySetInfo()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"setPropertyValues()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertyValues()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"addPropertiesChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"removePropertiesChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XMultiPropertySet";"firePropertiesChangeEvent()"
"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"getServiceName()"
"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"write()"
"UnoSimpleAnimationControlModel";"com::sun::star::io::XPersistObject";"read()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"UnoSimpleAnimationControlModel";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
toolkit/Library_tk.mk
Dosyayı görüntüle @ 303096c5
......@@ -69,7 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/awt/vclxwindow \
toolkit/source/awt/vclxwindow1 \
toolkit/source/awt/vclxwindows \
toolkit/source/awt/xsimpleanimation \
toolkit/source/controls/accessiblecontrolcontext \
toolkit/source/controls/controlmodelcontainerbase \
toolkit/source/controls/dialogcontrol \
......@@ -89,7 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/controls/stdtabcontroller \
toolkit/source/controls/stdtabcontrollermodel \
toolkit/source/controls/tkscrollbar \
toolkit/source/controls/tksimpleanimation \
toolkit/source/controls/tkspinbutton \
toolkit/source/controls/animatedimages \
toolkit/source/controls/spinningprogress \
......
toolkit/qa/unoapi/knownissues.xcl
Dosyayı görüntüle @ 303096c5
......@@ -120,14 +120,6 @@ toolkit.UnoControlFormattedField
toolkit.UnoControlListBox
# -> disabled in toolkit.sce
### i86020 ###
toolkit.UnoSimpleAnimationControl
# -> disabled in toolkit.sce
### i86021 ###
toolkit.UnoSimpleAnimationControlModel
# -> disabled in toolkit.sce
### i86298 ###
toolkit.UnoTreeControl
# -> disabled in toolkit.sce
......@@ -153,7 +145,6 @@ toolkit.UnoControlImageControl::com::sun::star::awt::XView
toolkit.UnoControlDialog::com::sun::star::awt::XView
toolkit.UnoControlFileControl::com::sun::star::awt::XView
toolkit.UnoControlCurrencyField::com::sun::star::awt::XView
toolkit.UnoSimpleAnimationControl::com::sun::star::awt::XView
toolkit.UnoControlComboBox::com::sun::star::awt::XView
toolkit.UnoControlNumericField::com::sun::star::awt::XView
toolkit.UnoControlCheckBox::com::sun::star::awt::XView
......@@ -193,11 +184,9 @@ toolkit.UnoControlDialog::com::sun::star::lang::XComponent
toolkit.UnoControlGroupBoxModel::com::sun::star::lang::XComponent
toolkit.UnoControlImageControlModel::com::sun::star::lang::XComponent
toolkit.UnoControlNumericFieldModel::com::sun::star::lang::XComponent
toolkit.UnoSimpleAnimationControlModel::com::sun::star::lang::XComponent
toolkit.UnoControlFileControl::com::sun::star::lang::XComponent
toolkit.UnoControlCurrencyField::com::sun::star::lang::XComponent
toolkit.UnoControlComboBoxModel::com::sun::star::lang::XComponent
toolkit.UnoSimpleAnimationControl::com::sun::star::lang::XComponent
toolkit.UnoControlComboBox::com::sun::star::lang::XComponent
toolkit.UnoControlNumericField::com::sun::star::lang::XComponent
toolkit.UnoControlScrollBarModel::com::sun::star::lang::XComponent
......
toolkit/qa/unoapi/toolkit.sce
Dosyayı görüntüle @ 303096c5
......@@ -85,8 +85,6 @@
-o toolkit.UnoControlTimeField
-o toolkit.UnoControlTimeFieldModel
-o toolkit.UnoScrollBarControl
#i86020 -o toolkit.UnoSimpleAnimationControl
#i86021 -o toolkit.UnoSimpleAnimationControlModel
-o toolkit.UnoSpinButtonControl
-o toolkit.UnoSpinButtonControlModel
#i86298 -o toolkit.UnoTreeControl
......
toolkit/source/awt/vclxtoolkit.cxx
Dosyayı görüntüle @ 303096c5
......@@ -68,7 +68,6 @@ using org::libreoffice::touch::ByteBufferWrapper;
#include <toolkit/awt/vclxtabpagecontainer.hxx>
#include <toolkit/awt/vclxtabpagemodel.hxx>
#include <toolkit/awt/xsimpleanimation.hxx>
#include <toolkit/awt/animatedimagespeer.hxx>
#include <toolkit/awt/vclxtopwindow.hxx>
#include <toolkit/awt/vclxwindow.hxx>
......@@ -307,7 +306,6 @@ static ComponentInfo aComponentInfos [] =
{ "radiobutton", WINDOW_RADIOBUTTON },
{ "scrollbar", WINDOW_SCROLLBAR },
{ "scrollbarbox", WINDOW_SCROLLBARBOX },
{ "simpleanimation", WINDOW_CONTROL },
{ "animatedimages", WINDOW_CONTROL },
{ "spinbutton", WINDOW_SPINBUTTON },
{ "spinfield", WINDOW_SPINFIELD },
......@@ -973,14 +971,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
}
break;
case WINDOW_CONTROL:
if ( aServiceName.EqualsAscii( "simpleanimation" ) )
{
pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE );
((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::ANISOTROPIC );
// (compatibility)
*ppNewComp = new ::toolkit::XSimpleAnimation;
}
else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
"tabpagecontainer" ) )
{
pNewWindow = new TabControl( pParent, nWinBits );
......
toolkit/source/awt/xsimpleanimation.cxx deleted 100644 → 0
Dosyayı görüntüle @ 680608b1
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "toolkit/awt/xsimpleanimation.hxx"
#include "toolkit/helper/property.hxx"
#include <tools/debug.hxx>
#include <vcl/throbber.hxx>
#include <vcl/svapp.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
using namespace ::com::sun::star;
//====================================================================
//= XSimpleAnimation
//====================================================================
DBG_NAME( XSimpleAnimation )
//--------------------------------------------------------------------
XSimpleAnimation::XSimpleAnimation()
{
DBG_CTOR( XSimpleAnimation, NULL );
}
//--------------------------------------------------------------------
XSimpleAnimation::~XSimpleAnimation()
{
DBG_DTOR( XSimpleAnimation, NULL );
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::start() throw ( uno::RuntimeException )
{
SolarMutexGuard aGuard;
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->start();
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::stop() throw ( uno::RuntimeException )
{
SolarMutexGuard aGuard;
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->stop();
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& rImageList )
throw ( uno::RuntimeException )
{
SolarMutexGuard aGuard;
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->setImageList( rImageList );
}
//--------------------------------------------------------------------
void SAL_CALL XSimpleAnimation::setProperty( const OUString& PropertyName, const uno::Any& Value )
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber == NULL )
{
VCLXWindow::setProperty( PropertyName, Value );
return;
}
sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
switch ( nPropertyId )
{
case BASEPROPERTY_STEP_TIME: {
sal_Int32 nStepTime( 0 );
if ( Value >>= nStepTime )
pThrobber->setStepTime( nStepTime );
break;
}
case BASEPROPERTY_REPEAT: {
sal_Bool bRepeat( sal_True );
if ( Value >>= bRepeat )
pThrobber->setRepeat( bRepeat );
break;
}
default:
VCLXWindow::setProperty( PropertyName, Value );
}
}
//--------------------------------------------------------------------
uno::Any SAL_CALL XSimpleAnimation::getProperty( const OUString& PropertyName )
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber == NULL )
return VCLXWindow::getProperty( PropertyName );
uno::Any aReturn;
sal_uInt16 nPropertyId = GetPropertyId( PropertyName );
switch ( nPropertyId )
{
case BASEPROPERTY_STEP_TIME:
aReturn <<= pThrobber->getStepTime();
break;
case BASEPROPERTY_REPEAT:
aReturn <<= pThrobber->getRepeat();
break;
default:
aReturn = VCLXWindow::getProperty( PropertyName );
}
return aReturn;
}
//........................................................................
} // namespace toolkit
//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
toolkit/source/controls/tksimpleanimation.cxx deleted 100644 → 0
Dosyayı görüntüle @ 680608b1
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "toolkit/controls/tksimpleanimation.hxx"
#include "toolkit/helper/property.hxx"
#include "toolkit/helper/unopropertyarrayhelper.hxx"
#include <cppuhelper/typeprovider.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
using namespace ::com::sun::star;
//====================================================================
//= UnoSimpleAnimationControlModel
//====================================================================
//--------------------------------------------------------------------
UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
:UnoControlModel( i_factory )
{
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
ImplRegisterProperty( BASEPROPERTY_REPEAT );
ImplRegisterProperty( BASEPROPERTY_STEP_TIME );
}
//--------------------------------------------------------------------
OUString UnoSimpleAnimationControlModel::getServiceName()
throw( uno::RuntimeException )
{
return OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
}
//--------------------------------------------------------------------
uno::Any UnoSimpleAnimationControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
return uno::makeAny( OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl ) );
case BASEPROPERTY_STEP_TIME:
return uno::makeAny( (sal_Int32) 100 );
case BASEPROPERTY_REPEAT:
return uno::makeAny( (sal_Bool)sal_True );
default:
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
}
//--------------------------------------------------------------------
::cppu::IPropertyArrayHelper& UnoSimpleAnimationControlModel::getInfoHelper()
{
static UnoPropertyArrayHelper* pHelper = NULL;
if ( !pHelper )
{
uno::Sequence< sal_Int32 > aIDs = ImplGetPropertyIds();
pHelper = new UnoPropertyArrayHelper( aIDs );
}
return *pHelper;
}
//--------------------------------------------------------------------
uno::Reference< beans::XPropertySetInfo > UnoSimpleAnimationControlModel::getPropertySetInfo( )
throw( uno::RuntimeException )
{
static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
//--------------------------------------------------------------------
OUString SAL_CALL UnoSimpleAnimationControlModel::getImplementationName()
throw( uno::RuntimeException )
{
return OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel" );
}
//--------------------------------------------------------------------
uno::Sequence< OUString > SAL_CALL UnoSimpleAnimationControlModel::getSupportedServiceNames()
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 2 );
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 2]
= OUString::createFromAscii( szServiceName_UnoSimpleAnimationControlModel );
aServices[sal::static_int_cast<sal_uInt32>(aServices.getLength()) - 1]
= OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel );
return aServices;
}
//====================================================================
//= UnoSimpleAnimationControl
//====================================================================
//--------------------------------------------------------------------
UnoSimpleAnimationControl::UnoSimpleAnimationControl()
:UnoSimpleAnimationControl_Base()
{
}
//--------------------------------------------------------------------
OUString UnoSimpleAnimationControl::GetComponentServiceName()
{
return OUString("SimpleAnimation");
}
//--------------------------------------------------------------------
OUString SAL_CALL UnoSimpleAnimationControl::getImplementationName()
throw( uno::RuntimeException )
{
return OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControl" );
}
//--------------------------------------------------------------------
uno::Sequence< OUString > SAL_CALL UnoSimpleAnimationControl::getSupportedServiceNames()
throw( uno::RuntimeException )
{
uno::Sequence< OUString > aServices( UnoSimpleAnimationControl_Base::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 1 );
aServices[ aServices.getLength() - 1 ] = OUString::createFromAscii( szServiceName_UnoSimpleAnimationControl );
return aServices;
}
//--------------------------------------------------------------------
void SAL_CALL UnoSimpleAnimationControl::start() throw ( uno::RuntimeException )
{
uno::Reference< XSimpleAnimation > xAnimation;
{
::osl::MutexGuard aGuard( GetMutex() );
xAnimation.set( getPeer(), uno::UNO_QUERY );
}
if ( xAnimation.is() )
xAnimation->start();
}
//--------------------------------------------------------------------
void SAL_CALL UnoSimpleAnimationControl::stop() throw ( uno::RuntimeException )
{
uno::Reference< XSimpleAnimation > xAnimation;
{
::osl::MutexGuard aGuard( GetMutex() );
xAnimation.set( getPeer(), uno::UNO_QUERY );
}
if ( xAnimation.is() )
xAnimation->stop();
}
//--------------------------------------------------------------------
void SAL_CALL UnoSimpleAnimationControl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& ImageList )
throw ( uno::RuntimeException )
{
uno::Reference< XSimpleAnimation > xAnimation;
{
::osl::MutexGuard aGuard( GetMutex() );
xAnimation.set( getPeer(), uno::UNO_QUERY );
}
if ( xAnimation.is() )
xAnimation->setImageList( ImageList );
}
//........................................................................
} // namespace toolkit
//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
toolkit/source/helper/registerservices.cxx
Dosyayı görüntüle @ 303096c5
......@@ -41,7 +41,6 @@
#include <toolkit/controls/roadmapcontrol.hxx>
#include <toolkit/controls/tkscrollbar.hxx>
#include "toolkit/controls/tkspinbutton.hxx"
#include <toolkit/controls/tksimpleanimation.hxx>
#include <toolkit/controls/animatedimages.hxx>
#include <toolkit/controls/spinningprogress.hxx>
#include <toolkit/controls/tabpagemodel.hxx>
......@@ -173,8 +172,6 @@ IMPL_CREATEINSTANCE( VCLXPopupMenu )
IMPL_CREATEINSTANCE( VCLXPrinterServer )
IMPL_CREATEINSTANCE( UnoRoadmapControl )
IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel )
IMPL_CREATEINSTANCE( UnoSimpleAnimationControl )
IMPL_CREATEINSTANCE_CTX( UnoSimpleAnimationControlModel )
IMPL_CREATEINSTANCE_CTX( UnoControlTabPage )
IMPL_CREATEINSTANCE_CTX( UnoControlTabPageModel )
IMPL_CREATEINSTANCE_CTX( UnoControlTabPageContainer )
......@@ -273,8 +270,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
GET_FACTORY( TreeControl, szServiceName_TreeControl, NULL )
GET_FACTORY( TreeControlModel, szServiceName_TreeControlModel, NULL )
GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel )
GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl )
GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL )
GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL )
GET_FACTORY( GridControl, szServiceName_GridControl, NULL );
......
toolkit/source/helper/servicenames.cxx
Dosyayı görüntüle @ 303096c5
......@@ -92,8 +92,6 @@ const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
const sal_Char szServiceName_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[] = "com.sun.star.awt.UnoControlSimpleAnimationModel";
const sal_Char szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation";
const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
......
toolkit/util/tk.component
Dosyayı görüntüle @ 303096c5
......@@ -255,14 +255,6 @@
<service name="com.sun.star.awt.UnoControlScrollBar"/>
<service name="stardiv.vcl.control.ScrollBar"/>
</implementation>
<implementation name="stardiv.Toolkit.UnoSimpleAnimationControl">
<service name="com.sun.star.awt.UnoControlSimpleAnimation"/>
<service name="com.sun.star.awt.UnoSimpleAnimationControl"/>
</implementation>
<implementation name="stardiv.Toolkit.UnoSimpleAnimationControlModel">
<service name="com.sun.star.awt.UnoControlSimpleAnimationModel"/>
<service name="com.sun.star.awt.UnoSimpleAnimationControlModel"/>
</implementation>
<implementation name="org.openoffice.comp.toolkit.SpinningProgressControlModel">
<service name="com.sun.star.awt.SpinningProgressControlModel"/>
</implementation>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment