summaryrefslogtreecommitdiff
path: root/UnoControls/source/inc
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-10-31 21:34:25 -0700
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-11-01 00:16:13 -0500
commitddec70f39e40eea43b8a3380edbb2086dcfb73ac (patch)
tree96f66959f84ae5dd7c72addd5f7bbe7e7fb3d4e1 /UnoControls/source/inc
parenta62ff01d8c447928a85b6eeeb2d3d1ab4251490a (diff)
Macro Cleanup in UNO land.
Diffstat (limited to 'UnoControls/source/inc')
-rw-r--r--UnoControls/source/inc/OConnectionPointContainerHelper.hxx54
-rw-r--r--UnoControls/source/inc/OConnectionPointHelper.hxx66
-rw-r--r--UnoControls/source/inc/framecontrol.hxx150
-rw-r--r--UnoControls/source/inc/progressbar.hxx119
-rw-r--r--UnoControls/source/inc/progressmonitor.hxx172
-rw-r--r--UnoControls/source/inc/statusindicator.hxx133
6 files changed, 360 insertions, 334 deletions
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 9b9e9e53bd95..e0cc5a9b70b9 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -48,20 +48,8 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_XCONNECTIONPOINTCONTAINER ::com::sun::star::lang::XConnectionPointContainer
-#define UNO3_XCONNECTIONPOINT ::com::sun::star::lang::XConnectionPoint
-#define UNO3_MUTEX ::osl::Mutex
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_XINTERFACE ::com::sun::star::uno::XInterface
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper
-#define UNO3_LISTENEREXISTEXCEPTION ::com::sun::star::lang::ListenerExistException
-#define UNO3_INVALIDLISTENEREXCEPTION ::com::sun::star::lang::InvalidListenerException
-#define UNO3_WEAKREFERENCE ::com::sun::star::uno::WeakReference
-#define UNO3_OWEAKOBJECT ::cppu::OWeakObject
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
//______________________________________________________________________________________________________________
// defines
@@ -71,8 +59,8 @@ namespace unocontrols{
// class declaration OConnectionPointContainerHelper
//______________________________________________________________________________________________________________
-class OConnectionPointContainerHelper : public UNO3_XCONNECTIONPOINTCONTAINER
- , public UNO3_OWEAKOBJECT
+class OConnectionPointContainerHelper : public CSS_LANG::XConnectionPointContainer
+ , public ::cppu::OWeakObject
{
//______________________________________________________________________________________________________________
@@ -98,7 +86,7 @@ public:
@onerror
*/
- OConnectionPointContainerHelper( UNO3_MUTEX& aMutex );
+ OConnectionPointContainerHelper( ::osl::Mutex& aMutex );
/**_________________________________________________________________________________________________________
@short
@@ -132,7 +120,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -183,7 +172,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -198,7 +188,9 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
+ const CSS_UNO::Type& aType
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -213,8 +205,10 @@ public:
@onerror
*/
- virtual void SAL_CALL advise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL advise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -229,8 +223,10 @@ public:
@onerror
*/
- virtual void SAL_CALL unadvise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL unadvise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -245,7 +241,7 @@ public:
@onerror
*/
- UNO3_OMULTITYPEINTERFACECONTAINERHELPER& impl_getMultiTypeContainer();
+ ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer();
//______________________________________________________________________________________________________________
// private variables
@@ -253,11 +249,15 @@ public:
private:
- UNO3_MUTEX& m_aSharedMutex ;
- UNO3_OMULTITYPEINTERFACECONTAINERHELPER m_aMultiTypeContainer ; // Container to hold listener
+ ::osl::Mutex& m_aSharedMutex ;
+ ::cppu::OMultiTypeInterfaceContainerHelper m_aMultiTypeContainer ; // Container to hold listener
}; // class OConnectionPointContainerHelper
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_LANG
+
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index abcda4e2024a..b36147e727cb 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -49,21 +49,8 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_XCONNECTIONPOINTCONTAINER ::com::sun::star::lang::XConnectionPointContainer
-#define UNO3_XCONNECTIONPOINT ::com::sun::star::lang::XConnectionPoint
-#define UNO3_MUTEX ::osl::Mutex
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_XINTERFACE ::com::sun::star::uno::XInterface
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper
-#define UNO3_LISTENEREXISTEXCEPTION ::com::sun::star::lang::ListenerExistException
-#define UNO3_INVALIDLISTENEREXCEPTION ::com::sun::star::lang::InvalidListenerException
-#define UNO3_WEAKREFERENCE ::com::sun::star::uno::WeakReference
-#define UNO3_OWEAKOBJECT ::cppu::OWeakObject
-#define UNO3_OCONNECTIONPOINTCONTAINERHELPER OConnectionPointContainerHelper
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
//______________________________________________________________________________________________________________
// defines
@@ -73,8 +60,8 @@ namespace unocontrols{
// class declaration OConnectionPointHelper
//______________________________________________________________________________________________________________
-class OConnectionPointHelper : public UNO3_XCONNECTIONPOINT
- , public UNO3_OWEAKOBJECT
+class OConnectionPointHelper : public CSS_LANG::XConnectionPoint
+ , public ::cppu::OWeakObject
{
//______________________________________________________________________________________________________________
@@ -100,9 +87,9 @@ public:
@onerror
*/
- OConnectionPointHelper( UNO3_MUTEX& aMutex ,
- UNO3_OCONNECTIONPOINTCONTAINERHELPER* pContainerImplementation ,
- UNO3_TYPE aType );
+ OConnectionPointHelper( ::osl::Mutex& aMutex ,
+ OConnectionPointContainerHelper* pContainerImplementation ,
+ CSS_UNO::Type aType );
/**_________________________________________________________________________________________________________
@short
@@ -136,7 +123,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -187,7 +175,8 @@ public:
@onerror
*/
- virtual UNO3_TYPE SAL_CALL getConnectionType() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Type SAL_CALL getConnectionType()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -202,7 +191,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINTCONTAINER > SAL_CALL getConnectionPointContainer() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_LANG::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -217,9 +207,13 @@ public:
@onerror
*/
- virtual void SAL_CALL advise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_LISTENEREXISTEXCEPTION ,
- UNO3_INVALIDLISTENEREXCEPTION ,
- UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL advise(
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw (
+ CSS_LANG::ListenerExistException,
+ CSS_LANG::InvalidListenerException ,
+ CSS_UNO::RuntimeException
+ );
/**_________________________________________________________________________________________________________
@short
@@ -234,7 +228,8 @@ public:
@onerror
*/
- virtual void SAL_CALL unadvise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL unadvise( const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener )
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -249,7 +244,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XINTERFACE > > SAL_CALL getConnections() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_UNO::XInterface > > SAL_CALL getConnections()
+ throw( CSS_UNO::RuntimeException );
//______________________________________________________________________________________________________________
// private methods
@@ -293,15 +289,19 @@ private:
private:
- UNO3_MUTEX& m_aSharedMutex ;
- UNO3_WEAKREFERENCE< UNO3_XCONNECTIONPOINTCONTAINER > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...>
+ ::osl::Mutex& m_aSharedMutex ;
+ CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...>
// It is a ring-reference => and must be a wekreference!
- UNO3_OCONNECTIONPOINTCONTAINERHELPER* m_pContainerImplementation ;
- UNO3_TYPE m_aInterfaceType ;
- UNO3_REFERENCE< UNO3_XINTERFACE > m_xLock ;
+ OConnectionPointContainerHelper* m_pContainerImplementation ;
+ CSS_UNO::Type m_aInterfaceType ;
+ CSS_UNO::Reference< CSS_UNO::XInterface > m_xLock ;
}; // class OConnectionPointHelper
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_LANG
+
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTHELPER_HXX
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index d60a1c9e341f..5d068ad0cfa1 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -55,31 +55,11 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException
-#define UNO3_IPROPERTYARRAYHELPER ::cppu::IPropertyArrayHelper
-#define UNO3_OBROADCASTHELPER ::cppu::OBroadcastHelper
-#define UNO3_OCONNECTIONPOINTCONTAINERHELPER OConnectionPointContainerHelper
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper
-#define UNO3_OPROPERTYSETHELPER ::cppu::OPropertySetHelper
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_PROPERTY ::com::sun::star::beans::Property
-#define UNO3_PROPERTYVALUE ::com::sun::star::beans::PropertyValue
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_WINDOWDESCRIPTOR ::com::sun::star::awt::WindowDescriptor
-#define UNO3_XCONNECTIONPOINT ::com::sun::star::lang::XConnectionPoint
-#define UNO3_XCONNECTIONPOINTCONTAINER ::com::sun::star::lang::XConnectionPointContainer
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XFRAME ::com::sun::star::frame::XFrame
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_XINTERFACE ::com::sun::star::uno::XInterface
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_XPROPERTYSETINFO ::com::sun::star::beans::XPropertySetInfo
-#define UNO3_XTOOLKIT ::com::sun::star::awt::XToolkit
-#define UNO3_XWINDOWPEER ::com::sun::star::awt::XWindowPeer
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
+#define CSS_BEANS ::com::sun::star::beans
+#define CSS_AWT ::com::sun::star::awt
+#define CSS_FRAME ::com::sun::star::frame
//______________________________________________________________________________________________________________
// defines
@@ -100,11 +80,11 @@ namespace unocontrols{
// class
//______________________________________________________________________________________________________________
-class FrameControl : public UNO3_XCONTROLMODEL
- , public UNO3_XCONNECTIONPOINTCONTAINER
+class FrameControl : public CSS_AWT::XControlModel
+ , public CSS_LANG::XConnectionPointContainer
, public BaseControl // This order is neccessary for right initialization of m_aMutex!
- , public UNO3_OBROADCASTHELPER
- , public UNO3_OPROPERTYSETHELPER
+ , public ::cppu::OBroadcastHelper
+ , public ::cppu::OPropertySetHelper
{
//______________________________________________________________________________________________________________
@@ -130,7 +110,7 @@ public:
@onerror
*/
- FrameControl( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ FrameControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_________________________________________________________________________________________________________
@short
@@ -164,7 +144,9 @@ public:
@onerror
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface(
+ const CSS_UNO::Type& aType
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -215,7 +197,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XAggregation
@@ -234,7 +217,9 @@ public:
@onerror
*/
- UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ CSS_UNO::Any SAL_CALL queryAggregation(
+ const CSS_UNO::Type& aType
+ ) throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XControl
@@ -253,8 +238,10 @@ public:
@onerror
*/
- virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit ,
- const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL createPeer(
+ const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+ ) throw ( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -269,7 +256,9 @@ public:
@onerror
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel(
+ const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -284,7 +273,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XComponent
@@ -303,7 +293,7 @@ public:
@onerror
*/
- virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XView
@@ -322,7 +312,9 @@ public:
@onerror
*/
- virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setGraphics(
+ const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -337,7 +329,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XConnectionPointContainer
@@ -356,7 +349,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -371,7 +365,9 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
+ const CSS_UNO::Type& aType
+ ) throw ( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -386,8 +382,10 @@ public:
@onerror
*/
- virtual void SAL_CALL advise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL advise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -402,8 +400,10 @@ public:
@onerror
*/
- virtual void SAL_CALL unadvise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL unadvise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// impl but public methods to register service!
@@ -422,7 +422,7 @@ public:
@onerror
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_________________________________________________________________________________________________________
@short
@@ -437,7 +437,7 @@ public:
@onerror
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//______________________________________________________________________________________________________________
// protected methods
@@ -462,10 +462,12 @@ protected:
@onerror
*/
- virtual sal_Bool SAL_CALL convertFastPropertyValue( UNO3_ANY& rConvertedValue ,
- UNO3_ANY& rOldValue ,
- sal_Int32 nHandle ,
- const UNO3_ANY& rValue ) throw( UNO3_ILLEGALARGUMENTEXCEPTION );
+ virtual sal_Bool SAL_CALL convertFastPropertyValue(
+ CSS_UNO::Any& rConvertedValue ,
+ CSS_UNO::Any& rOldValue ,
+ sal_Int32 nHandle ,
+ const CSS_UNO::Any& rValue
+ ) throw( CSS_LANG::IllegalArgumentException );
/**_________________________________________________________________________________________________________
@short
@@ -480,8 +482,10 @@ protected:
@onerror
*/
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
- const UNO3_ANY& rValue ) throw ( ::com::sun::star::uno::Exception );
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
+ sal_Int32 nHandle ,
+ const CSS_UNO::Any& rValue
+ ) throw ( ::com::sun::star::uno::Exception );
/**_________________________________________________________________________________________________________
@short
@@ -496,8 +500,8 @@ protected:
@onerror
*/
- virtual void SAL_CALL getFastPropertyValue( UNO3_ANY& rValue ,
- sal_Int32 nHandle ) const ;
+ virtual void SAL_CALL getFastPropertyValue( CSS_UNO::Any& rValue ,
+ sal_Int32 nHandle ) const ;
/**_________________________________________________________________________________________________________
@short
@@ -512,7 +516,7 @@ protected:
@onerror
*/
- virtual UNO3_IPROPERTYARRAYHELPER& SAL_CALL getInfoHelper();
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
//__________________________________________________________________________________________________________
// XPropertySet
@@ -531,7 +535,8 @@ protected:
@onerror
*/
- UNO3_REFERENCE< UNO3_XPROPERTYSETINFO > SAL_CALL getPropertySetInfo() throw( UNO3_RUNTIMEEXCEPTION );
+ CSS_UNO::Reference< CSS_BEANS::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// BaseControl
@@ -550,7 +555,9 @@ protected:
@onerror
*/
- virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+ virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+ );
//______________________________________________________________________________________________________________
// private methods
@@ -571,9 +578,9 @@ private:
@onerror
*/
- void impl_createFrame( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xPeer ,
- const UNO3_OUSTRING& sURL ,
- const UNO3_SEQUENCE< UNO3_PROPERTYVALUE >& seqArguments );
+ void impl_createFrame( const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xPeer ,
+ const ::rtl::OUString& sURL ,
+ const CSS_UNO::Sequence< CSS_BEANS::PropertyValue >& seqArguments );
/**_________________________________________________________________________________________________________
@short
@@ -603,7 +610,7 @@ private:
@onerror
*/
- static const UNO3_SEQUENCE< UNO3_PROPERTY > impl_getStaticPropertyDescriptor();
+ static const CSS_UNO::Sequence< CSS_BEANS::Property > impl_getStaticPropertyDescriptor();
//______________________________________________________________________________________________________________
@@ -612,14 +619,21 @@ private:
private:
- UNO3_REFERENCE< UNO3_XFRAME > m_xFrame ;
- UNO3_OUSTRING m_sComponentURL ;
- UNO3_SEQUENCE< UNO3_PROPERTYVALUE > m_seqLoaderArguments ;
- UNO3_OMULTITYPEINTERFACECONTAINERHELPER m_aInterfaceContainer ;
- UNO3_OCONNECTIONPOINTCONTAINERHELPER m_aConnectionPointContainer ;
+ CSS_UNO::Reference< CSS_FRAME::XFrame > m_xFrame ;
+ ::rtl::OUString m_sComponentURL ;
+ CSS_UNO::Sequence< CSS_BEANS::PropertyValue > m_seqLoaderArguments ;
+ ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer ;
+ OConnectionPointContainerHelper m_aConnectionPointContainer ;
}; // class FrameControl
+// The namespace alaises are only used in the header
+#undef CSS_UNO
+#undef CSS_LANG
+#undef CSS_BEANS
+#undef CSS_AWT
+#undef CSS_FRAME
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index 6ce5b7bf5872..97cad21816dd 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -47,17 +47,9 @@
namespace unocontrols{
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XPROGRESSBAR ::com::sun::star::awt::XProgressBar
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_SIZE ::com::sun::star::awt::Size
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
+#define CSS_AWT ::com::sun::star::awt
//____________________________________________________________________________________________________________
// defines
@@ -65,24 +57,24 @@ namespace unocontrols{
#define SERVICENAME_PROGRESSBAR "com.sun.star.awt.XProgressBar"
#define IMPLEMENTATIONNAME_PROGRESSBAR "stardiv.UnoControls.ProgressBar"
-#define FREESPACE 4
-#define DEFAULT_HORIZONTAL sal_True
-#define DEFAULT_BLOCKDIMENSION Size(1,1)
-#define DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
-#define DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
-#define DEFAULT_MINRANGE INT_MIN
-#define DEFAULT_MAXRANGE INT_MAX
-#define DEFAULT_BLOCKVALUE 1
-#define DEFAULT_VALUE DEFAULT_MINRANGE
-#define LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define PROGRESSBAR_FREESPACE 4
+#define PROGRESSBAR_DEFAULT_HORIZONTAL sal_True
+#define PROGRESSBAR_DEFAULT_BLOCKDIMENSION Size(1,1)
+#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
+#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
+#define PROGRESSBAR_DEFAULT_MINRANGE INT_MIN
+#define PROGRESSBAR_DEFAULT_MAXRANGE INT_MAX
+#define PROGRESSBAR_DEFAULT_BLOCKVALUE 1
+#define PROGRESSBAR_DEFAULT_VALUE PROGRESSBAR_DEFAULT_MINRANGE
+#define PROGRESSBAR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+#define PROGRESSBAR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
//____________________________________________________________________________________________________________
// classes
//____________________________________________________________________________________________________________
-class ProgressBar : public UNO3_XCONTROLMODEL
- , public UNO3_XPROGRESSBAR
+class ProgressBar : public CSS_AWT::XControlModel
+ , public CSS_AWT::XProgressBar
, public BaseControl
{
@@ -109,7 +101,7 @@ public:
@onerror
*/
- ProgressBar( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ ProgressBar( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_________________________________________________________________________________________________________
@short
@@ -143,7 +135,8 @@ public:
@onerror
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -194,7 +187,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XAggregation
@@ -213,7 +207,8 @@ public:
@onerror
*/
- UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XProgressBar
@@ -232,7 +227,8 @@ public:
@onerror
*/
- virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor )
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -247,7 +243,8 @@ public:
@onerror
*/
- virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor )
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -262,7 +259,7 @@ public:
@onerror
*/
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -277,8 +274,10 @@ public:
@onerror
*/
- virtual void SAL_CALL setRange( sal_Int32 nMin ,
- sal_Int32 nMax ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setRange(
+ sal_Int32 nMin ,
+ sal_Int32 nMax
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -293,7 +292,7 @@ public:
@onerror
*/
- virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XWindow
@@ -312,11 +311,13 @@ public:
@onerror
*/
- virtual void SAL_CALL setPosSize( sal_Int32 nX ,
- sal_Int32 nY ,
- sal_Int32 nWidth ,
- sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setPosSize(
+ sal_Int32 nX ,
+ sal_Int32 nY ,
+ sal_Int32 nWidth ,
+ sal_Int32 nHeight ,
+ sal_Int16 nFlags
+ ) throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XControl
@@ -335,7 +336,9 @@ public:
@onerror
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel(
+ const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -350,7 +353,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// BaseControl
@@ -369,7 +373,7 @@ public:
@onerror
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_________________________________________________________________________________________________________
@short
@@ -384,7 +388,7 @@ public:
@onerror
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//____________________________________________________________________________________________________________
// protected methods
@@ -405,9 +409,11 @@ protected:
@onerror
*/
- virtual void impl_paint( sal_Int32 nX ,
- sal_Int32 nY ,
- const UNO3_REFERENCE< UNO3_XGRAPHICS >& xGraphics );
+ virtual void impl_paint(
+ sal_Int32 nX ,
+ sal_Int32 nY ,
+ const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics
+ );
/**_________________________________________________________________________________________________________
@short
@@ -430,17 +436,22 @@ protected:
private:
- sal_Bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal]
- UNO3_SIZE m_aBlockSize ; // width and height of a block [>=0,0]
- sal_Int32 m_nForegroundColor ; // (alpha,r,g,b)
- sal_Int32 m_nBackgroundColor ; // (alpha,r,g,b)
- sal_Int32 m_nMinRange ; // lowest value = 0% [long, <_nMaxRange]
- sal_Int32 m_nMaxRange ; // highest value = 100% [long, >_nMinRange]
- double m_nBlockValue ; // value for one block [long, >0]
- sal_Int32 m_nValue ; // value for progress [long]
+ sal_Bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal]
+ CSS_AWT::Size m_aBlockSize ; // width and height of a block [>=0,0]
+ sal_Int32 m_nForegroundColor ; // (alpha,r,g,b)
+ sal_Int32 m_nBackgroundColor ; // (alpha,r,g,b)
+ sal_Int32 m_nMinRange ; // lowest value = 0% [long, <_nMaxRange]
+ sal_Int32 m_nMaxRange ; // highest value = 100% [long, >_nMinRange]
+ double m_nBlockValue ; // value for one block [long, >0]
+ sal_Int32 m_nValue ; // value for progress [long]
}; // class ProgressBar
+// The namespace aliases are only used in the header
+#undef CSS_UNO
+#undef CSS_LANG
+#undef CSS_AWT
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 30d227071d39..08353d11f4a0 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -83,25 +83,9 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_RECTANGLE ::com::sun::star::awt::Rectangle
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_SIZE ::com::sun::star::awt::Size
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_XACTIONLISTENER ::com::sun::star::awt::XActionListener
-#define UNO3_XBUTTON ::com::sun::star::awt::XButton
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XFIXEDTEXT ::com::sun::star::awt::XFixedText
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_XLAYOUTCONSTRAINS ::com::sun::star::awt::XLayoutConstrains
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_XPROGRESSBAR ::com::sun::star::awt::XProgressBar
-#define UNO3_XPROGRESSMONITOR ::com::sun::star::awt::XProgressMonitor
-#define UNO3_XTOOLKIT ::com::sun::star::awt::XToolkit
-#define UNO3_XWINDOWPEER ::com::sun::star::awt::XWindowPeer
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_AWT ::com::sun::star::awt
+#define CSS_LANG ::com::sun::star::lang
//____________________________________________________________________________________________________________
// defines
@@ -109,9 +93,7 @@ namespace unocontrols{
#define SERVICENAME_PROGRESSMONITOR "com.sun.star.awt.XProgressMonitor"
#define IMPLEMENTATIONNAME_PROGRESSMONITOR "stardiv.UnoControls.ProgressMonitor"
-#define FREEBORDER 10 // border around and between the controls
-#define WIDTH_RELATION 4 // reserve 1/4 for button width and rest for progressbar width
-#define HEIGHT_RELATION 5 // reserve 1/5 for button and progressbar heigth and rest for text height
+#define PROGRESSMONITOR_FREEBORDER 10 // border around and between the controls
#define FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText"
#define BUTTON_SERVICENAME "com.sun.star.awt.UnoControlButton"
#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
@@ -120,17 +102,13 @@ namespace unocontrols{
#define CONTROLNAME_BUTTON "Button" // -||-
#define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
#define DEFAULT_BUTTONLABEL "Abbrechen"
-#define DEFAULT_TOPIC "\0"
-#define DEFAULT_TEXT "\0"
-#define BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
-#define LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
-#define HEIGHT_PROGRESSBAR 15
-// Overwrite defines from basecontrol.hxx!!!
-#undef DEFAULT_WIDTH
-#undef DEFAULT_HEIGHT
-#define DEFAULT_WIDTH 350
-#define DEFAULT_HEIGHT 100
+#define PROGRESSMONITOR_DEFAULT_TOPIC "\0"
+#define PROGRESSMONITOR_DEFAULT_TEXT "\0"
+#define PROGRESSMONITOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
+#define PROGRESSMONITOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+#define PROGRESSMONITOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define PROGRESSMONITOR_DEFAULT_WIDTH 350
+#define PROGRESSMONITOR_DEFAULT_HEIGHT 100
//____________________________________________________________________________________________________________
// structs, types
@@ -139,8 +117,8 @@ namespace unocontrols{
/// Item of TextList
struct IMPL_TextlistItem
{
- UNO3_OUSTRING sTopic ; /// Left site of textline in dialog
- UNO3_OUSTRING sText ; /// Right site of textline in dialog
+ ::rtl::OUString sTopic ; /// Left site of textline in dialog
+ ::rtl::OUString sText ; /// Right site of textline in dialog
};
/// Define a list-class for struct IMPL_TextlistItem
@@ -151,9 +129,9 @@ DECLARE_LIST( IMPL_Textlist, IMPL_TextlistItem* )
// class declaration
//____________________________________________________________________________________________________________
-class ProgressMonitor : public UNO3_XLAYOUTCONSTRAINS
- , public UNO3_XBUTTON
- , public UNO3_XPROGRESSMONITOR
+class ProgressMonitor : public CSS_AWT::XLayoutConstrains
+ , public CSS_AWT::XButton
+ , public CSS_AWT::XProgressMonitor
, public BaseContainerControl
{
@@ -180,7 +158,7 @@ public:
@onerror
*/
- ProgressMonitor( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ ProgressMonitor( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_______________________________________________________________________________________________________
@short
@@ -214,7 +192,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -265,7 +244,7 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XAggregation
@@ -284,7 +263,8 @@ public:
@onerror -
*/
- virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XProgressMonitor
@@ -310,9 +290,11 @@ public:
RELEASE = nothing
*/
- virtual void SAL_CALL addText( const UNO3_OUSTRING& sTopic ,
- const UNO3_OUSTRING& sText ,
- sal_Bool bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL addText(
+ const ::rtl::OUString& sTopic ,
+ const ::rtl::OUString& sText ,
+ sal_Bool bbeforeProgress
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -327,8 +309,10 @@ public:
@onerror -
*/
- virtual void SAL_CALL removeText( const UNO3_OUSTRING& sTopic ,
- sal_Bool bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL removeText(
+ const ::rtl::OUString& sTopic ,
+ sal_Bool bbeforeProgress
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -343,9 +327,11 @@ public:
@onerror -
*/
- virtual void SAL_CALL updateText( const UNO3_OUSTRING& sTopic ,
- const UNO3_OUSTRING& sText ,
- sal_Bool bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL updateText(
+ const ::rtl::OUString& sTopic ,
+ const ::rtl::OUString& sText ,
+ sal_Bool bbeforeProgress
+ ) throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XProgressBar
@@ -364,7 +350,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -379,7 +365,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -394,7 +380,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -410,7 +396,7 @@ public:
*/
virtual void SAL_CALL setRange( sal_Int32 nMin ,
- sal_Int32 nMax ) throw( UNO3_RUNTIMEEXCEPTION );
+ sal_Int32 nMax ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -425,7 +411,7 @@ public:
@onerror -
*/
- virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XButton
@@ -444,7 +430,9 @@ public:
@onerror -
*/
- virtual void SAL_CALL addActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL addActionListener(
+ const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -459,7 +447,9 @@ public:
@onerror -
*/
- virtual void SAL_CALL removeActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL removeActionListener(
+ const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -474,7 +464,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setLabel( const UNO3_OUSTRING& sLabel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setLabel( const ::rtl::OUString& sLabel ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -489,7 +479,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL setActionCommand( const UNO3_OUSTRING& sCommand ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setActionCommand( const ::rtl::OUString& sCommand )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XLayoutConstrains
@@ -508,7 +499,7 @@ public:
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -523,7 +514,7 @@ public:
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -538,7 +529,8 @@ public:
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XControl
@@ -557,8 +549,10 @@ public:
@onerror -
*/
- virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit ,
- const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL createPeer(
+ const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -573,7 +567,8 @@ public:
@onerror -
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -588,7 +583,8 @@ public:
@onerror -
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XComponent
@@ -607,7 +603,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XWindow
@@ -630,7 +626,7 @@ public:
sal_Int32 nY ,
sal_Int32 nWidth ,
sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw( UNO3_RUNTIMEEXCEPTION );
+ sal_Int16 nFlags ) throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// BaseControl
@@ -649,7 +645,7 @@ public:
@onerror -
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_______________________________________________________________________________________________________
@short -
@@ -664,7 +660,7 @@ public:
@onerror -
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//____________________________________________________________________________________________________________
// protected methods
@@ -685,9 +681,9 @@ protected:
@onerror -
*/
- virtual void impl_paint( sal_Int32 nX ,
- sal_Int32 nY ,
- const UNO3_REFERENCE< UNO3_XGRAPHICS >& xGraphics );
+ virtual void impl_paint( sal_Int32 nX ,
+ sal_Int32 nY ,
+ const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics );
//____________________________________________________________________________________________________________
// private methods
@@ -753,8 +749,7 @@ private:
@onerror -
*/
- IMPL_TextlistItem* impl_searchTopic( const UNO3_OUSTRING& sTopic ,
- sal_Bool bbeforeProgress );
+ IMPL_TextlistItem* impl_searchTopic( const ::rtl::OUString& sTopic , sal_Bool bbeforeProgress );
//____________________________________________________________________________________________________________
// debug methods
@@ -777,8 +772,8 @@ private:
#ifdef DBG_UTIL
- sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& sTopic, const UNO3_OUSTRING& sText, sal_Bool bbeforeProgress ); // addText, updateText
- sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& rTopic, sal_Bool bbeforeProgress ); // removeText
+ sal_Bool impl_debug_checkParameter( const ::rtl::OUString& sTopic, const ::rtl::OUString& sText, sal_Bool bbeforeProgress ); // addText, updateText
+ sal_Bool impl_debug_checkParameter( const ::rtl::OUString& rTopic, sal_Bool bbeforeProgress ); // removeText
#endif
//____________________________________________________________________________________________________________
@@ -787,20 +782,25 @@ private:
private:
- IMPL_Textlist* m_pTextlist_Top ; // Elements before progress
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xTopic_Top ; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xText_Top ;
+ IMPL_Textlist* m_pTextlist_Top ; // Elements before progress
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xTopic_Top ; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xText_Top ;
- IMPL_Textlist* m_pTextlist_Bottom ; // Elements below of progress
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xTopic_Bottom ; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xText_Bottom ;
+ IMPL_Textlist* m_pTextlist_Bottom ; // Elements below of progress
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xTopic_Bottom ; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xText_Bottom ;
- UNO3_REFERENCE< UNO3_XPROGRESSBAR > m_xProgressBar ;
- UNO3_REFERENCE< UNO3_XBUTTON > m_xButton ;
- UNO3_RECTANGLE m_a3DLine ;
+ CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar ;
+ CSS_UNO::Reference< CSS_AWT::XButton > m_xButton ;
+ CSS_AWT::Rectangle m_a3DLine ;
}; // class ProgressMonitor
+// The namespaces aliases are only used the this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index d89fecf90152..d8e888f9dc42 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -54,45 +54,28 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_RECTANGLE ::com::sun::star::awt::Rectangle
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_SIZE ::com::sun::star::awt::Size
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XFIXEDTEXT ::com::sun::star::awt::XFixedText
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_XLAYOUTCONSTRAINS ::com::sun::star::awt::XLayoutConstrains
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_XPROGRESSBAR ::com::sun::star::awt::XProgressBar
-#define UNO3_XSTATUSINDICATOR ::com::sun::star::task::XStatusIndicator
-#define UNO3_XTOOLKIT ::com::sun::star::awt::XToolkit
-#define UNO3_XWINDOWPEER ::com::sun::star::awt::XWindowPeer
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_AWT ::com::sun::star::awt
+#define CSS_LANG ::com::sun::star::lang
+#define CSS_TASK ::com::sun::star::task
//____________________________________________________________________________________________________________
// defines
//____________________________________________________________________________________________________________
-#define SERVICENAME_STATUSINDICATOR "com.sun.star.task.XStatusIndicator"
-#define IMPLEMENTATIONNAME_STATUSINDICATOR "stardiv.UnoControls.StatusIndicator"
-#undef FREEBORDER
-#define FREEBORDER 5 // border around and between the controls
-#define FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText"
-#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
-#define CONTROLNAME_TEXT "Text" // identifier the control in container
-#define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
-#define DEFAULT_TEXT "\0"
-#define BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
-#define LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
-// Overwrite defines from basecontrol.hxx!!!
-#undef DEFAULT_WIDTH
-#undef DEFAULT_HEIGHT
-#define DEFAULT_WIDTH 300
-#define DEFAULT_HEIGHT 25
+#define SERVICENAME_STATUSINDICATOR "com.sun.star.task.XStatusIndicator"
+#define IMPLEMENTATIONNAME_STATUSINDICATOR "stardiv.UnoControls.StatusIndicator"
+#define STATUSINDICATOR_FREEBORDER 5 // border around and between the controls
+#define FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText"
+#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
+#define CONTROLNAME_TEXT "Text" // identifier the control in container
+#define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
+#define STATUSINDICATOR_DEFAULT_TEXT "\0"
+#define STATUSINDICATOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
+#define STATUSINDICATOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+#define STATUSINDICATOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define STATUSINDICATOR_DEFAULT_WIDTH 300
+#define STATUSINDICATOR_DEFAULT_HEIGHT 25
//____________________________________________________________________________________________________________
// structs, types
@@ -102,8 +85,8 @@ namespace unocontrols{
// class declaration
//____________________________________________________________________________________________________________
-class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
- , public UNO3_XSTATUSINDICATOR
+class StatusIndicator : public CSS_AWT::XLayoutConstrains
+ , public CSS_TASK::XStatusIndicator
, public BaseContainerControl
{
@@ -130,7 +113,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror
*/
- StatusIndicator( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ StatusIndicator( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_______________________________________________________________________________________________________
@short
@@ -164,7 +147,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -215,7 +199,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XAggregation
@@ -234,7 +219,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XStatusIndicator
@@ -253,8 +239,10 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL start( const UNO3_OUSTRING& sText ,
- sal_Int32 nRange ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL start(
+ const ::rtl::OUString& sText ,
+ sal_Int32 nRange
+ ) throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -269,7 +257,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL end() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL end() throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -284,7 +272,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL reset() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL reset() throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -299,7 +287,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL setText( const UNO3_OUSTRING& sText ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setText( const ::rtl::OUString& sText ) throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -314,7 +302,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XLayoutConstrains
@@ -333,7 +321,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -348,7 +336,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -363,7 +351,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XControl
@@ -382,8 +371,10 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit ,
- const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL createPeer(
+ const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -398,7 +389,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -413,7 +405,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XComponent
@@ -432,7 +425,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XWindow
@@ -455,7 +448,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
sal_Int32 nY ,
sal_Int32 nWidth ,
sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw( UNO3_RUNTIMEEXCEPTION );
+ sal_Int16 nFlags ) throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// BaseControl
@@ -474,7 +467,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_______________________________________________________________________________________________________
@short -
@@ -489,7 +482,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//____________________________________________________________________________________________________________
// protected methods
@@ -510,7 +503,9 @@ protected:
@onerror -
*/
- virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+ virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+ );
/**_______________________________________________________________________________________________________
@short -
@@ -525,7 +520,11 @@ protected:
@onerror -
*/
- virtual void impl_paint ( sal_Int32 nX, sal_Int32 nY, const UNO3_REFERENCE< UNO3_XGRAPHICS > & rGraphics );
+ virtual void impl_paint (
+ sal_Int32 nX,
+ sal_Int32 nY,
+ const CSS_UNO::Reference< CSS_AWT::XGraphics > & rGraphics
+ );
/**_______________________________________________________________________________________________________
@short -
@@ -540,7 +539,7 @@ protected:
@onerror -
*/
- virtual void impl_recalcLayout( const UNO3_WINDOWEVENT& aEvent );
+ virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
//____________________________________________________________________________________________________________
// debug methods
@@ -561,21 +560,23 @@ private:
@onerror -
*/
- #if OSL_DEBUG_LEVEL > 1
-
- #endif
-
//____________________________________________________________________________________________________________
// private variables
//____________________________________________________________________________________________________________
private:
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xText ;
- UNO3_REFERENCE< UNO3_XPROGRESSBAR > m_xProgressBar ;
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xText ;
+ CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar ;
}; // class StatusIndicator
+// The name space aliases are only used in the header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+#undef CSS_TASK
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
generated by cgit (git 2.34.1) at 2024-07-01 03:52:34 +0000