Skip to content

C
core
Kaydet (Commit) 5569d97f authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile
Dosyalara gözat
Seçenekler

i121513 - Remove deprecated UnoControlThrobberModel

üst 4899b748
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 1069 deletions
offapi/com/sun/star/awt/UnoControlThrobber.idl deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef __com_sun_star_awt_UnoControlThrobber_idl__
#define __com_sun_star_awt_UnoControlThrobber_idl__
#ifndef __com_sun_star_awt_UnoControl_idl__
#include <com/sun/star/awt/UnoControl.idl>
#endif
#ifndef __com_sun_star_awt_XThrobber_idl__
#include <com/sun/star/awt/XThrobber.idl>
#endif
//=============================================================================
module com { module sun { module star { module awt {
//=============================================================================
/**
@since OOo 2.2
@deprecated
You should use <type>AnimatedImagesControl</type> and <type>SpinningProgressControlModel</type>.
*/
published service UnoControlThrobber
{
service com::sun::star::awt::UnoControl;
interface com::sun::star::awt::XThrobber;
};
//=============================================================================
}; }; }; };
#endif
offapi/com/sun/star/awt/UnoControlThrobberModel.idl deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef __com_sun_star_awt_UnoControlThrobberModel_idl__
#define __com_sun_star_awt_UnoControlThrobberModel_idl__
#ifndef __com_sun_star_awt_UnoControlModel_idl__
#include <com/sun/star/awt/UnoControlModel.idl>
#endif
//=============================================================================
module com { module sun { module star { module awt {
//=============================================================================
/**
@since OOo 2.2
@deprecated
You should use <type>SpinningProgressControlModel</type>.
*/
published service UnoControlThrobberModel
{
service com::sun::star::awt::UnoControlModel;
};
//=============================================================================
}; }; }; };
#endif
offapi/com/sun/star/awt/WindowDescriptor.idl
Dosyayı görüntüle @ 5569d97f
......@@ -109,7 +109,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>
......
offapi/com/sun/star/awt/XThrobber.idl deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef __com_sun_star_awt_XThrobber_idl__
#define __com_sun_star_awt_XThrobber_idl__
#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
#endif
#ifndef com_sun_star_graphic_XGraphic_idl
#include <com/sun/star/graphic/XGraphic.idl>
#endif
//=============================================================================
module com { module sun { module star { module awt {
//=============================================================================
/**
@deprecated
You should use <type>XAnimation</type>, <type>AnimatedImagesControl</type> and <type>SpinningProgressControlModel</type>.
*/
published interface XThrobber: com::sun::star::uno::XInterface
{
void start();
void stop();
};
//=============================================================================
}; }; }; };
#endif
offapi/com/sun/star/awt/makefile.mk
Dosyayı görüntüle @ 5569d97f
......@@ -195,8 +195,6 @@ IDLFILES=\
UnoControlSimpleAnimationModel.idl\
UnoControlSpinButton.idl\
UnoControlSpinButtonModel.idl\
UnoControlThrobber.idl\
UnoControlThrobberModel.idl\
UnoControlTimeField.idl\
UnoControlTimeFieldModel.idl\
VclContainerEvent.idl\
......@@ -290,7 +288,6 @@ IDLFILES=\
SystemDependentXWindow.idl\
XSimpleAnimation.idl\
XSimpleTabController.idl\
XThrobber.idl\
XTabController.idl\
XTabControllerModel.idl\
XTabListener.idl\
......
offapi/type_reference/typelibrary_history.txt
Dosyayı görüntüle @ 5569d97f
......@@ -192,3 +192,6 @@
06/12/2012 (arielch): TaskID=121442
Extend css::awt::XGraphics for StatusbarController implementation
19/12/2012 (arielch): TaskID=121513
Remove deprecated AWT Throbber API
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControl.csv deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
"UnoThrobberControl";"com::sun::star::awt::XView";"setGraphics()"
"UnoThrobberControl";"com::sun::star::awt::XView";"getGraphics()"
"UnoThrobberControl";"com::sun::star::awt::XView";"getSize()"
"UnoThrobberControl";"com::sun::star::awt::XView";"draw()"
"UnoThrobberControl";"com::sun::star::awt::XView";"setZoom()"
"UnoThrobberControl";"com::sun::star::lang::XComponent";"dispose()"
"UnoThrobberControl";"com::sun::star::lang::XComponent";"addEventListener()"
"UnoThrobberControl";"com::sun::star::lang::XComponent";"removeEventListener()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"setContext()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"getContext()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"createPeer()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"getPeer()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"setModel()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"getModel()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"getView()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"setDesignMode()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"isDesignMode()"
"UnoThrobberControl";"com::sun::star::awt::XControl";"isTransparent()"
"UnoThrobberControl";"com::sun::star::accessibility::XAccessible#optional";"getAccessibleContext()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"setPosSize()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"getPosSize()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"setVisible()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"setEnable()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"setFocus()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"addWindowListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeWindowListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"addFocusListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeFocusListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"addKeyListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeKeyListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"addMouseListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeMouseListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"addMouseMotionListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"removeMouseMotionListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"addPaintListener()"
"UnoThrobberControl";"com::sun::star::awt::XWindow";"removePaintListener()"
qadevOOo/objdsc/toolkit/com.sun.star.comp.toolkit.UnoThrobberControlModel.csv deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlModel";"DefaultControl"
"UnoThrobberControlModel";"com::sun::star::util::XCloneable";"createClone()"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Height"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Name"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionX"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"PositionY"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Step"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"TabIndex"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Tag"
"UnoThrobberControlModel";"com::sun::star::awt::UnoControlDialogElement#optional";"Width"
"UnoThrobberControlModel";"com::sun::star::lang::XComponent";"dispose()"
"UnoThrobberControlModel";"com::sun::star::lang::XComponent";"addEventListener()"
"UnoThrobberControlModel";"com::sun::star::lang::XComponent";"removeEventListener()"
"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertySetInfo()"
"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"setPropertyValues()"
"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"getPropertyValues()"
"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"addPropertiesChangeListener()"
"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"removePropertiesChangeListener()"
"UnoThrobberControlModel";"com::sun::star::beans::XMultiPropertySet";"firePropertiesChangeEvent()"
"UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"getServiceName()"
"UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"write()"
"UnoThrobberControlModel";"com::sun::star::io::XPersistObject";"read()"
"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
"UnoThrobberControlModel";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
rat-excludes
Dosyayı görüntüle @ 5569d97f
......@@ -109,7 +109,7 @@ main/testautomation/framework/optional/input/extras_formats/Tables_writer_en-US.
main/testautomation/framework/optional/input/options/paths_1.txt
main/testautomation/global/input/filters/graphic_filters.txt
main/desktop/test/deployment/update/publisher/release-notes_de-DE.html
main/swext/mediawiki/help/component.txt
##############################################################################
#
......
scp2/source/ooo/file_resource_ooo.scp
Dosyayı görüntüle @ 5569d97f
......@@ -95,7 +95,7 @@ STD_RES_FILE( gid_File_Res_Cui, cui )
STD_RES_FILE( gid_File_Res_Sw, sw )
STD_RES_FILE( gid_File_Res_Tk, tk )
STD_RES_FILE( gid_File_Res_Acc, acc )
STD_RES_FILE( gid_File_Res_Tpl, tpl )
......
swext/mediawiki/help/component.txt
Dosyayı görüntüle @ 5569d97f
# *************************************************************
#
# 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
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
# *************************************************************
The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
Dosyayı görüntüle @ 5569d97f
......@@ -29,7 +29,7 @@ import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XDialog;
import com.sun.star.awt.XDialogEventHandler;
import com.sun.star.awt.XDialogProvider2;
import com.sun.star.awt.XThrobber;
import com.sun.star.awt.XAnimation;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.uno.UnoRuntime;
......@@ -210,7 +210,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
XMultiServiceFactory xDialogFactory = ( XMultiServiceFactory ) UnoRuntime.queryInterface( XMultiServiceFactory.class, xDialogModel );
if ( xDialogFactory != null )
{
XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.UnoThrobberControlModel" ) );
XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.SpinningProgressControlModel" ) );
XPropertySet xThrobberProps = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel );
if ( xThrobberProps != null )
{
......@@ -239,13 +239,13 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
{
try
{
XThrobber xThrobber = (XThrobber)UnoRuntime.queryInterface( XThrobber.class, m_xControlContainer.getControl( "WikiThrobber" ) );
XAnimation xThrobber = (XAnimation)UnoRuntime.queryInterface( XAnimation.class, m_xControlContainer.getControl( "WikiThrobber" ) );
if ( xThrobber != null )
{
if ( bActive )
xThrobber.start();
xThrobber.startAnimation();
else
xThrobber.stop();
xThrobber.stopAnimation();
}
}
catch( Exception e )
......
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
Dosyayı görüntüle @ 5569d97f
......@@ -25,7 +25,6 @@ package com.sun.star.wiki;
import com.sun.star.awt.XDialog;
import com.sun.star.awt.XWindowPeer;
import com.sun.star.awt.XThrobber;
import com.sun.star.beans.XPropertySet;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
......
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
Dosyayı görüntüle @ 5569d97f
......@@ -26,7 +26,6 @@ package com.sun.star.wiki;
import com.sun.star.awt.XControl;
import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XDialog;
import com.sun.star.awt.XThrobber;
import com.sun.star.awt.XWindowPeer;
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
......
swext/mediawiki/src/description.xml
Dosyayı görüntüle @ 5569d97f
......@@ -20,14 +20,14 @@
*
***********************************************************-->
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="1.2.0"/>
<version value="1.2.1"/>
<identifier value="@WIKIEXTENSIONID@"/>
<display-name>
<name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
</display-name>
<registration>
<simple-license accept-by="admin" default-license-id="lic-en-US">
<license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
<license-text xlink:href="license/LICENSE" lang="en-US" license-id="lic-en-US"/>
</simple-license>
</registration>
<dependencies>
......
toolkit/AllLangResTarget_tk.mk deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
#**************************************************************
#
# 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
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
#**************************************************************
$(eval $(call gb_AllLangResTarget_AllLangResTarget,tk))
$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit))
$(eval $(call gb_AllLangResTarget_add_srs,tk,\
toolkit/awt \
))
$(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt))
$(eval $(call gb_SrsTarget_set_include,toolkit/awt,\
$$(INCLUDE) \
-I$(SRCDIR)/toolkit/source/awt \
))
$(eval $(call gb_SrsTarget_add_files,toolkit/awt,\
toolkit/source/awt/xthrobber.src \
))
toolkit/Library_tk.mk
Dosyayı görüntüle @ 5569d97f
......@@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/awt/vclxwindow1 \
toolkit/source/awt/vclxwindows \
toolkit/source/awt/xsimpleanimation \
toolkit/source/awt/xthrobber \
toolkit/source/controls/accessiblecontrolcontext \
toolkit/source/controls/controlmodelcontainerbase \
toolkit/source/controls/dialogcontrol \
......@@ -107,7 +106,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/controls/tkscrollbar \
toolkit/source/controls/tksimpleanimation \
toolkit/source/controls/tkspinbutton \
toolkit/source/controls/tkthrobber \
toolkit/source/controls/animatedimages \
toolkit/source/controls/spinningprogress \
toolkit/source/controls/tree/treecontrol \
......
toolkit/Module_toolkit.mk
Dosyayı görüntüle @ 5569d97f
......@@ -24,7 +24,6 @@
$(eval $(call gb_Module_Module,toolkit))
$(eval $(call gb_Module_add_targets,toolkit,\
AllLangResTarget_tk \
Library_tk \
Package_inc \
Package_source \
......
toolkit/inc/toolkit/awt/xthrobber.hxx deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef TOOLKIT_AWT_XTHROBBER_HXX
#define TOOLKIT_AWT_XTHROBBER_HXX
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/awt/XThrobber.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
//........................................................................
namespace toolkit
{
//........................................................................
//====================================================================
//= XThrobber
//====================================================================
typedef ::cppu::ImplInheritanceHelper1 < VCLXWindow
, ::com::sun::star::awt::XThrobber
> XThrobber_Base;
class XThrobber :public XThrobber_Base
,public ::boost::noncopyable
{
private:
void SAL_CALL InitImageList() throw(::com::sun::star::uno::RuntimeException);
public:
XThrobber();
protected:
~XThrobber();
// XThrobber
virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException);
// VCLXWindow
virtual void SetWindow( Window* pWindow );
private:
XThrobber( const XThrobber& ); // never implemented
XThrobber& operator=( const XThrobber& ); // never implemented
};
//........................................................................
} // namespacetoolkit
//........................................................................
#endif // TOOLKIT_AWT_XTHROBBER_HXX
toolkit/inc/toolkit/controls/tkthrobber.hxx deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef TOOLKIT_CONTROLS_TKTHROBBER_HXX
#define TOOLKIT_CONTROLS_TKTHROBBER_HXX
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/helper/macros.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/awt/XThrobber.hpp>
#include <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
//====================================================================
//= UnoThrobberControlModel
//====================================================================
class UnoThrobberControlModel : public UnoControlModel
{
protected:
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
UnoThrobberControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
UnoThrobberControlModel( const UnoThrobberControlModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoThrobberControlModel( *this ); }
// XMultiPropertySet
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
// XPersistObject
::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
// XServiceInfo
::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
};
//====================================================================
//= UnoThrobberControl
//====================================================================
typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XThrobber
> UnoThrobberControl_Base;
class UnoThrobberControl :public UnoControlBase
,public UnoThrobberControl_Base
{
private:
public:
UnoThrobberControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
::rtl::OUString GetComponentServiceName();
DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase );
::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException);
// XTypeProvider
DECLARE_XTYPEPROVIDER()
// XThrobber
virtual void SAL_CALL start() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL stop() throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
};
//........................................................................
} // namespacetoolkit
//........................................................................
#endif // TOOLKIT_CONTROLS_TKTHROBBER_HXX
toolkit/inc/toolkit/helper/servicenames.hxx
Dosyayı görüntüle @ 5569d97f
......@@ -97,8 +97,6 @@ extern const sal_Char __FAR_DATA szServiceName_SortableGridDataModel[];
extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName2_UnoSimpleAnimationControl[];
extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[], szServiceName2_UnoSimpleAnimationControlModel[];
extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName2_UnoThrobberControl[];
extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[], szServiceName2_UnoThrobberControlModel[];
extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControl[];
extern const sal_Char __FAR_DATA szServiceName_AnimatedImagesControlModel[];
extern const sal_Char __FAR_DATA szServiceName_SpinningProgressControlModel[];
......
toolkit/qa/unoapi/knownissues.xcl
Dosyayı görüntüle @ 5569d97f
......@@ -130,14 +130,6 @@ toolkit.UnoSimpleAnimationControl
toolkit.UnoSimpleAnimationControlModel
# -> disabled in toolkit.sce
### i86022 ###
toolkit.UnoThrobberControl
# -> disabled in toolkit.sce
### i86023 ###
toolkit.UnoThrobberControlModel
# -> disabled in toolkit.sce
### i86298 ###
toolkit.UnoTreeControl
# -> disabled in toolkit.sce
......@@ -161,7 +153,6 @@ toolkit.UnoControlListBox::com::sun::star::awt::XView
toolkit.UnoControlEdit::com::sun::star::awt::XView
toolkit.UnoControlImageControl::com::sun::star::awt::XView
toolkit.UnoControlDialog::com::sun::star::awt::XView
toolkit.UnoThrobberControl::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
......@@ -201,7 +192,6 @@ toolkit.UnoControlContainer::com::sun::star::lang::XComponent
toolkit.UnoControlFixedText::com::sun::star::lang::XComponent
toolkit.UnoControlListBox::com::sun::star::lang::XComponent
toolkit.UnoControlCheckBoxModel::com::sun::star::lang::XComponent
toolkit.UnoThrobberControlModel::com::sun::star::lang::XComponent
toolkit.UnoControlEditModel::com::sun::star::lang::XComponent
toolkit.UnoControlEdit::com::sun::star::lang::XComponent
toolkit.UnoControlImageControl::com::sun::star::lang::XComponent
......@@ -210,7 +200,6 @@ 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.UnoThrobberControl::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/qa/unoapi/toolkit.sce
Dosyayı görüntüle @ 5569d97f
......@@ -91,7 +91,5 @@
#i86021 -o toolkit.UnoSimpleAnimationControlModel
-o toolkit.UnoSpinButtonControl
-o toolkit.UnoSpinButtonControlModel
#i86022 -o toolkit.UnoThrobberControl
#i86023 -o toolkit.UnoThrobberControlModel
#i86298 -o toolkit.UnoTreeControl
-o toolkit.UnoTreeModel
toolkit/source/awt/vclxtoolkit.cxx
Dosyayı görüntüle @ 5569d97f
......@@ -71,7 +71,6 @@
#include <toolkit/awt/vclxtabpagemodel.hxx>
#include <toolkit/awt/xsimpleanimation.hxx>
#include <toolkit/awt/xthrobber.hxx>
#include <toolkit/awt/animatedimagespeer.hxx>
#include <toolkit/awt/vclxtopwindow.hxx>
#include <toolkit/awt/vclxwindow.hxx>
......@@ -319,7 +318,6 @@ static ComponentInfo __FAR_DATA aComponentInfos [] =
{ "animatedimages", WINDOW_CONTROL },
{ "spinbutton", WINDOW_SPINBUTTON },
{ "spinfield", WINDOW_SPINFIELD },
{ "throbber", WINDOW_CONTROL },
{ "splitter", WINDOW_SPLITTER },
{ "splitwindow", WINDOW_SPLITWINDOW },
{ "statusbar", WINDOW_STATUSBAR },
......@@ -1016,13 +1014,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
// (compatibility)
*ppNewComp = new ::toolkit::XSimpleAnimation;
}
else if ( aServiceName.EqualsAscii( "throbber" ) )
{
pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE );
((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::Anisotropic );
// (compatibility)
*ppNewComp = new ::toolkit::XThrobber;
}
else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
::rtl::OUString::createFromAscii("tabpagecontainer") ) )
{
......
toolkit/source/awt/xthrobber.cxx deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
#include "toolkit/awt/xthrobber.hxx"
#include "toolkit/helper/property.hxx"
#include <toolkit/helper/tkresmgr.hxx>
#ifndef _TOOLKIT_AWT_XTHROBBER_HRC_
#include "xthrobber.hrc"
#endif
#include <tools/debug.hxx>
#include <vcl/fixed.hxx>
#include <vcl/timer.hxx>
#include <vcl/throbber.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
using namespace ::com::sun::star;
//====================================================================
//= XThrobber
//====================================================================
DBG_NAME( XThrobber )
//--------------------------------------------------------------------
XThrobber::XThrobber()
{
DBG_CTOR( XThrobber, NULL );
}
//--------------------------------------------------------------------
XThrobber::~XThrobber()
{
DBG_DTOR( XThrobber, NULL );
}
//--------------------------------------------------------------------
void SAL_CALL XThrobber::start() throw ( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->start();
}
//--------------------------------------------------------------------
void SAL_CALL XThrobber::stop() throw ( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber != NULL)
pThrobber->stop();
}
//--------------------------------------------------------------------
void XThrobber::SetWindow( Window* pWindow )
{
XThrobber_Base::SetWindow( pWindow );
InitImageList();
}
//--------------------------------------------------------------------
void SAL_CALL XThrobber::InitImageList()
throw( uno::RuntimeException )
{
::vos::OGuard aGuard( GetMutex() );
Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) );
if ( pThrobber == NULL)
return;
uno::Sequence< uno::Reference< graphic::XGraphic > > aImageList(12);
sal_uInt16 nIconIdStart = RID_TK_ICON_THROBBER_START;
if ( pThrobber->GetSettings().GetStyleSettings().GetHighContrastMode() )
nIconIdStart = RID_TK_HC_ICON_THROBBER_START;
for ( sal_uInt16 i=0; i<12; i++ )
{
Image aImage = TK_RES_IMAGE( nIconIdStart + i );
aImageList[i] = aImage.GetXGraphic();
}
pThrobber->setImageList( aImageList );
}
//........................................................................
} // namespace toolkit
//........................................................................
toolkit/source/awt/xthrobber.hrc deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef _TOOLKIT_AWT_XTHROBBER_HRC_
#define _TOOLKIT_AWT_XTHROBBER_HRC_
//------------------------------------------------------------------------------
#define RID_TK_ICON_THROBBER_START 1000
#define RID_TK_HC_ICON_THROBBER_START 1020
// -----------------------------------------------------------------------------
#endif // _TOOLKIT_AWT_XTHROBBER_HRC_
toolkit/source/awt/xthrobber.src deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef _TOOLKIT_AWT_XTHROBBER_HRC_
#include <xthrobber.hrc>
#endif
#define STD_MASK_COLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
Image RID_TK_ICON_THROBBER_START
{
ImageBitmap = Bitmap{ file = "spinner03-grey_01.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 1
{
ImageBitmap = Bitmap{ file = "spinner03-grey_02.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 2
{
ImageBitmap = Bitmap{ file = "spinner03-grey_03.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 3
{
ImageBitmap = Bitmap{ file = "spinner03-grey_04.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 4
{
ImageBitmap = Bitmap{ file = "spinner03-grey_05.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 5
{
ImageBitmap = Bitmap{ file = "spinner03-grey_06.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 6
{
ImageBitmap = Bitmap{ file = "spinner03-grey_07.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 7
{
ImageBitmap = Bitmap{ file = "spinner03-grey_08.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 8
{
ImageBitmap = Bitmap{ file = "spinner03-grey_09.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 9
{
ImageBitmap = Bitmap{ file = "spinner03-grey_10.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 10
{
ImageBitmap = Bitmap{ file = "spinner03-grey_11.png"; };
STD_MASK_COLOR
};
Image RID_TK_ICON_THROBBER_START + 11
{
ImageBitmap = Bitmap{ file = "spinner03-grey_12.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_01.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 1
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_02.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 2
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_03.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 3
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_04.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 4
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_05.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 5
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_06.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 6
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_07.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 7
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_08.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 8
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_09.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 9
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_10.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 10
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_11.png"; };
STD_MASK_COLOR
};
Image RID_TK_HC_ICON_THROBBER_START + 11
{
ImageBitmap = Bitmap{ file = "spinner03-32-hc_12.png"; };
STD_MASK_COLOR
};
toolkit/source/controls/tkthrobber.cxx deleted 100644 → 0
Dosyayı görüntüle @ 4899b748
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_toolkit.hxx"
#include "toolkit/controls/tkthrobber.hxx"
#include "toolkit/helper/property.hxx"
#include "toolkit/helper/unopropertyarrayhelper.hxx"
#include <cppuhelper/typeprovider.hxx>
#include <tools/debug.hxx>
//........................................................................
namespace toolkit
{
//........................................................................
using namespace ::com::sun::star;
//====================================================================
//= UnoThrobberControlModel
//====================================================================
//--------------------------------------------------------------------
UnoThrobberControlModel::UnoThrobberControlModel( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
:UnoControlModel( i_factory )
{
ImplRegisterProperty( BASEPROPERTY_BORDER );
ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
ImplRegisterProperty( BASEPROPERTY_HELPURL );
}
//--------------------------------------------------------------------
::rtl::OUString UnoThrobberControlModel::getServiceName( ) throw ( uno::RuntimeException )
{
return ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControlModel );
}
//--------------------------------------------------------------------
uno::Any UnoThrobberControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControl ) );
case BASEPROPERTY_BORDER:
return uno::makeAny( (sal_Int16) 0 );
default:
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
}
//--------------------------------------------------------------------
::cppu::IPropertyArrayHelper& UnoThrobberControlModel::getInfoHelper()
{
static UnoPropertyArrayHelper* pHelper = NULL;
if ( !pHelper )
{
uno::Sequence< sal_Int32 > aIDs = ImplGetPropertyIds();
pHelper = new UnoPropertyArrayHelper( aIDs );
}
return *pHelper;
}
//--------------------------------------------------------------------
uno::Reference< beans::XPropertySetInfo > UnoThrobberControlModel::getPropertySetInfo()
throw( uno::RuntimeException )
{
static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL UnoThrobberControlModel::getImplementationName()
throw( uno::RuntimeException )
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoThrobberControlModel" ) );
}
//--------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL UnoThrobberControlModel::getSupportedServiceNames()
throw( uno::RuntimeException )
{
uno::Sequence< ::rtl::OUString > aServices( UnoControlModel::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 2 );
aServices[ aServices.getLength() - 2 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControlModel );
aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoThrobberControlModel );
return aServices;
}
//====================================================================
//= UnoThrobberControl
//====================================================================
//--------------------------------------------------------------------
UnoThrobberControl::UnoThrobberControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
:UnoControlBase( i_factory )
{
}
//--------------------------------------------------------------------
::rtl::OUString UnoThrobberControl::GetComponentServiceName()
{
return ::rtl::OUString::createFromAscii( "Throbber" );
}
//--------------------------------------------------------------------
uno::Any UnoThrobberControl::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException )
{
uno::Any aRet = UnoControlBase::queryAggregation( rType );
if ( !aRet.hasValue() )
aRet = UnoThrobberControl_Base::queryInterface( rType );
return aRet;
}
//--------------------------------------------------------------------
IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoThrobberControl, UnoControlBase, UnoThrobberControl_Base )
//--------------------------------------------------------------------
void UnoThrobberControl::dispose() throw( uno::RuntimeException )
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
UnoControl::dispose();
}
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL UnoThrobberControl::getImplementationName()
throw( uno::RuntimeException )
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoThrobberControl" ) );
}
//--------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > SAL_CALL UnoThrobberControl::getSupportedServiceNames()
throw( uno::RuntimeException )
{
uno::Sequence< ::rtl::OUString > aServices( UnoControlBase::getSupportedServiceNames() );
aServices.realloc( aServices.getLength() + 2 );
aServices[ aServices.getLength() - 2 ] = ::rtl::OUString::createFromAscii( szServiceName_UnoThrobberControl );
aServices[ aServices.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoThrobberControl );
return aServices;
}
//--------------------------------------------------------------------
void UnoThrobberControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit,
const uno::Reference< awt::XWindowPeer > & rParentPeer )
throw( uno::RuntimeException )
{
UnoControl::createPeer( rxToolkit, rParentPeer );
}
//--------------------------------------------------------------------
void SAL_CALL UnoThrobberControl::start() throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( GetMutex() );
uno::Reference< XThrobber > xAnimation( getPeer(), uno::UNO_QUERY );
if ( xAnimation.is() )
xAnimation->start();
}
//--------------------------------------------------------------------
void SAL_CALL UnoThrobberControl::stop() throw ( uno::RuntimeException )
{
::osl::MutexGuard aGuard( GetMutex() );
uno::Reference< XThrobber > xAnimation( getPeer(), uno::UNO_QUERY );
if ( xAnimation.is() )
xAnimation->stop();
}
//........................................................................
} // namespace toolkit
//........................................................................
toolkit/source/helper/registerservices.cxx
Dosyayı görüntüle @ 5569d97f
......@@ -46,7 +46,6 @@
#include <toolkit/controls/tkscrollbar.hxx>
#include "toolkit/controls/tkspinbutton.hxx"
#include <toolkit/controls/tksimpleanimation.hxx>
#include <toolkit/controls/tkthrobber.hxx>
#include <toolkit/controls/animatedimages.hxx>
#include <toolkit/controls/spinningprogress.hxx>
#include <toolkit/controls/dialogcontrol.hxx>
......@@ -199,8 +198,6 @@ IMPL_CREATEINSTANCE2( UnoRoadmapControl )
IMPL_CREATEINSTANCE2( UnoControlRoadmapModel )
IMPL_CREATEINSTANCE2( UnoSimpleAnimationControl )
IMPL_CREATEINSTANCE2( UnoSimpleAnimationControlModel )
IMPL_CREATEINSTANCE2( UnoThrobberControl )
IMPL_CREATEINSTANCE2( UnoThrobberControlModel )
IMPL_CREATEINSTANCE2( UnoControlTabPage )
IMPL_CREATEINSTANCE2( UnoControlTabPageModel )
IMPL_CREATEINSTANCE2( UnoControlTabPageContainer )
......@@ -303,8 +300,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen
GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
GET_FACTORY( UnoSimpleAnimationControlModel, szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel )
GET_FACTORY( UnoSimpleAnimationControl, szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl )
GET_FACTORY( UnoThrobberControlModel, szServiceName_UnoThrobberControlModel, szServiceName2_UnoThrobberControlModel )
GET_FACTORY( UnoThrobberControl, szServiceName_UnoThrobberControl, szServiceName2_UnoThrobberControl )
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 @ 5569d97f
......@@ -92,8 +92,6 @@ const sal_Char __FAR_DATA szServiceName_AnimatedImagesControl[] = "com.sun.star.
const sal_Char __FAR_DATA szServiceName_AnimatedImagesControlModel[] = "com.sun.star.awt.AnimatedImagesControlModel";
const sal_Char __FAR_DATA szServiceName_SpinningProgressControlModel[] = "com.sun.star.awt.SpinningProgressControlModel";
const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] = "com.sun.star.awt.UnoControlSimpleAnimation";
const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[] = "com.sun.star.awt.UnoThrobberControlModel", szServiceName2_UnoThrobberControlModel[] = "com.sun.star.awt.UnoControlThrobberModel";
const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[] = "com.sun.star.awt.UnoThrobberControl", szServiceName2_UnoThrobberControl[] = "com.sun.star.awt.UnoControlThrobber";
const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
const sal_Char __FAR_DATA szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
......
toolkit/src2xml/src.lst
Dosyayı görüntüle @ 5569d97f
......@@ -617,8 +617,6 @@
../../filter/source/xsltdialog/xmlfiltertabpagexslt.src
../../filter/source/xsltdialog/xmlfiltertestdialog.src
../../filter/source/xsltdialog/xmlfiltertabpagebasic.src
../../toolkit/source/awt/accessiblestrings.src
../../toolkit/source/awt/xthrobber.src
../../xmlsecurity/source/dialogs/warnings.src
../../xmlsecurity/source/dialogs/macrosecurity.src
../../xmlsecurity/source/dialogs/certificatechooser.src
......
toolkit/util/tk.component
Dosyayı görüntüle @ 5569d97f
......@@ -283,14 +283,6 @@
<implementation name="stardiv.Toolkit.UnoSpinButtonModel">
<service name="com.sun.star.awt.UnoControlSpinButtonModel"/>
</implementation>
<implementation name="stardiv.Toolkit.UnoThrobberControl">
<service name="com.sun.star.awt.UnoControlThrobber"/>
<service name="com.sun.star.awt.UnoThrobberControl"/>
</implementation>
<implementation name="stardiv.Toolkit.UnoThrobberControlModel">
<service name="com.sun.star.awt.UnoControlThrobberModel"/>
<service name="com.sun.star.awt.UnoThrobberControlModel"/>
</implementation>
<implementation name="stardiv.Toolkit.UnoTimeFieldControl">
<service name="com.sun.star.awt.UnoControlTimeField"/>
<service name="stardiv.vcl.control.TimeField"/>
......
toolkit/util/toolkit.xml
Dosyayı görüntüle @ 5569d97f
......@@ -665,26 +665,6 @@
<supported-service>com.sun.star.awt.UnoControl</supported-service>
<supported-service>com.sun.star.awt.UnoSimpleAnimationControl</supported-service>
</component-description>
<component-description>
<author>Dirk Voelzke</author>
<name>com.sun.star.comp.toolkit.UnoThrobberControlModel</name>
<description>specifies the model of a throbber control (a spinning wheel)</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
<language>c++</language>
<status value="final" />
<supported-service>com.sun.star.awt.UnoControlModel</supported-service>
<supported-service>com.sun.star.awt.UnoThrobberControlModel</supported-service>
</component-description>
<component-description>
<author>Dirk Voelzke</author>
<name>com.sun.star.comp.toolkit.UnoThrobberControl</name>
<description>specifies a throbber control (a spinning wheel)</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
<language>c++</language>
<status value="final" />
<supported-service>com.sun.star.awt.UnoControl</supported-service>
<supported-service>com.sun.star.awt.UnoThrobberControl</supported-service>
</component-description>
<component-description>
<author>Christian Lippka</author>
<name>stardiv.Toolkit.UnoTreeModel</name>
......
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