diff options
Diffstat (limited to 'UnoControls/source/inc')
| -rw-r--r-- | UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 35 | ||||
| -rw-r--r-- | UnoControls/source/inc/OConnectionPointHelper.hxx | 45 | ||||
| -rw-r--r-- | UnoControls/source/inc/framecontrol.hxx | 113 | ||||
| -rw-r--r-- | UnoControls/source/inc/progressbar.hxx | 53 | ||||
| -rw-r--r-- | UnoControls/source/inc/progressmonitor.hxx | 99 | ||||
| -rw-r--r-- | UnoControls/source/inc/statusindicator.hxx | 79 |
6 files changed, 184 insertions, 240 deletions
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index e0cc5a9b70b9..a2825fb1263f 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -48,9 +48,6 @@ namespace unocontrols{ -#define CSS_UNO ::com::sun::star::uno -#define CSS_LANG ::com::sun::star::lang - //______________________________________________________________________________________________________________ // defines //______________________________________________________________________________________________________________ @@ -59,7 +56,7 @@ namespace unocontrols{ // class declaration OConnectionPointContainerHelper //______________________________________________________________________________________________________________ -class OConnectionPointContainerHelper : public CSS_LANG::XConnectionPointContainer +class OConnectionPointContainerHelper : public ::com::sun::star::lang::XConnectionPointContainer , public ::cppu::OWeakObject { @@ -120,8 +117,8 @@ public: @onerror A RuntimeException is thrown. */ - virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -172,8 +169,8 @@ public: @onerror */ - virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes() + throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -188,9 +185,9 @@ public: @onerror */ - virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint( - const CSS_UNO::Type& aType - ) throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( + const ::com::sun::star::uno::Type& aType + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -206,9 +203,9 @@ public: */ virtual void SAL_CALL advise( - const CSS_UNO::Type& aType , - const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Type& aType , + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -224,9 +221,9 @@ public: */ virtual void SAL_CALL unadvise( - const CSS_UNO::Type& aType , - const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Type& aType , + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -254,10 +251,6 @@ private: }; // 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 b36147e727cb..a0907ae00bf7 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -49,9 +49,6 @@ namespace unocontrols{ -#define CSS_UNO ::com::sun::star::uno -#define CSS_LANG ::com::sun::star::lang - //______________________________________________________________________________________________________________ // defines //______________________________________________________________________________________________________________ @@ -60,7 +57,7 @@ namespace unocontrols{ // class declaration OConnectionPointHelper //______________________________________________________________________________________________________________ -class OConnectionPointHelper : public CSS_LANG::XConnectionPoint +class OConnectionPointHelper : public ::com::sun::star::lang::XConnectionPoint , public ::cppu::OWeakObject { @@ -89,7 +86,7 @@ public: OConnectionPointHelper( ::osl::Mutex& aMutex , OConnectionPointContainerHelper* pContainerImplementation , - CSS_UNO::Type aType ); + ::com::sun::star::uno::Type aType ); /**_________________________________________________________________________________________________________ @short @@ -123,8 +120,8 @@ public: @onerror A RuntimeException is thrown. */ - virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -175,8 +172,8 @@ public: @onerror */ - virtual CSS_UNO::Type SAL_CALL getConnectionType() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Type SAL_CALL getConnectionType() + throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -191,8 +188,8 @@ public: @onerror */ - virtual CSS_UNO::Reference< CSS_LANG::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() + throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -208,11 +205,11 @@ public: */ virtual void SAL_CALL advise( - const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ) throw ( - CSS_LANG::ListenerExistException, - CSS_LANG::InvalidListenerException , - CSS_UNO::RuntimeException + ::com::sun::star::lang::ListenerExistException, + ::com::sun::star::lang::InvalidListenerException , + ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @@ -228,8 +225,8 @@ public: @onerror */ - virtual void SAL_CALL unadvise( const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener ) - throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ) + throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -244,8 +241,8 @@ public: @onerror */ - virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_UNO::XInterface > > SAL_CALL getConnections() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getConnections() + throw( ::com::sun::star::uno::RuntimeException ); //______________________________________________________________________________________________________________ // private methods @@ -290,18 +287,14 @@ private: private: ::osl::Mutex& m_aSharedMutex ; - CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...> + ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...> // It is a ring-reference => and must be a wekreference! OConnectionPointContainerHelper* m_pContainerImplementation ; - CSS_UNO::Type m_aInterfaceType ; - CSS_UNO::Reference< CSS_UNO::XInterface > m_xLock ; + ::com::sun::star::uno::Type m_aInterfaceType ; + ::com::sun::star::uno::Reference< ::com::sun::star::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 5d068ad0cfa1..185e596e8494 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -55,12 +55,6 @@ namespace unocontrols{ -#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 //______________________________________________________________________________________________________________ @@ -80,8 +74,8 @@ namespace unocontrols{ // class //______________________________________________________________________________________________________________ -class FrameControl : public CSS_AWT::XControlModel - , public CSS_LANG::XConnectionPointContainer +class FrameControl : public ::com::sun::star::awt::XControlModel + , public ::com::sun::star::lang::XConnectionPointContainer , public BaseControl // This order is neccessary for right initialization of m_aMutex! , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper @@ -110,7 +104,7 @@ public: @onerror */ - FrameControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory ); + FrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); /**_________________________________________________________________________________________________________ @short @@ -144,9 +138,9 @@ public: @onerror */ - virtual CSS_UNO::Any SAL_CALL queryInterface( - const CSS_UNO::Type& aType - ) throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + const ::com::sun::star::uno::Type& aType + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -197,8 +191,8 @@ public: @onerror */ - virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XAggregation @@ -217,9 +211,9 @@ public: @onerror */ - CSS_UNO::Any SAL_CALL queryAggregation( - const CSS_UNO::Type& aType - ) throw( CSS_UNO::RuntimeException ); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( + const ::com::sun::star::uno::Type& aType + ) throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XControl @@ -239,9 +233,9 @@ public: */ 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 ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent + ) throw ( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -257,8 +251,8 @@ public: */ virtual sal_Bool SAL_CALL setModel( - const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -273,8 +267,8 @@ public: @onerror */ - virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() + throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XComponent @@ -293,7 +287,7 @@ public: @onerror */ - virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XView @@ -313,8 +307,8 @@ public: */ virtual sal_Bool SAL_CALL setGraphics( - const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -329,8 +323,8 @@ public: @onerror */ - virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() + throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XConnectionPointContainer @@ -349,8 +343,8 @@ public: @onerror */ - virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes() + throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -365,9 +359,9 @@ public: @onerror */ - virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint( - const CSS_UNO::Type& aType - ) throw ( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( + const ::com::sun::star::uno::Type& aType + ) throw ( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -383,9 +377,9 @@ public: */ virtual void SAL_CALL advise( - const CSS_UNO::Type& aType , - const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Type& aType , + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -401,9 +395,9 @@ public: */ virtual void SAL_CALL unadvise( - const CSS_UNO::Type& aType , - const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Type& aType , + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // impl but public methods to register service! @@ -422,7 +416,7 @@ public: @onerror */ - static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); /**_________________________________________________________________________________________________________ @short @@ -463,11 +457,11 @@ protected: */ virtual sal_Bool SAL_CALL convertFastPropertyValue( - CSS_UNO::Any& rConvertedValue , - CSS_UNO::Any& rOldValue , + ::com::sun::star::uno::Any& rConvertedValue , + ::com::sun::star::uno::Any& rOldValue , sal_Int32 nHandle , - const CSS_UNO::Any& rValue - ) throw( CSS_LANG::IllegalArgumentException ); + const ::com::sun::star::uno::Any& rValue + ) throw( ::com::sun::star::lang::IllegalArgumentException ); /**_________________________________________________________________________________________________________ @short @@ -484,7 +478,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const CSS_UNO::Any& rValue + const ::com::sun::star::uno::Any& rValue ) throw ( ::com::sun::star::uno::Exception ); /**_________________________________________________________________________________________________________ @@ -500,7 +494,7 @@ protected: @onerror */ - virtual void SAL_CALL getFastPropertyValue( CSS_UNO::Any& rValue , + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue , sal_Int32 nHandle ) const ; /**_________________________________________________________________________________________________________ @@ -535,8 +529,8 @@ protected: @onerror */ - CSS_UNO::Reference< CSS_BEANS::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( CSS_UNO::RuntimeException ); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // BaseControl @@ -555,8 +549,8 @@ protected: @onerror */ - virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor( - const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer + virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor( + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer ); //______________________________________________________________________________________________________________ @@ -578,9 +572,9 @@ private: @onerror */ - void impl_createFrame( const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xPeer , + void impl_createFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer , const ::rtl::OUString& sURL , - const CSS_UNO::Sequence< CSS_BEANS::PropertyValue >& seqArguments ); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqArguments ); /**_________________________________________________________________________________________________________ @short @@ -610,7 +604,7 @@ private: @onerror */ - static const CSS_UNO::Sequence< CSS_BEANS::Property > impl_getStaticPropertyDescriptor(); + static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); //______________________________________________________________________________________________________________ @@ -619,21 +613,14 @@ private: private: - CSS_UNO::Reference< CSS_FRAME::XFrame > m_xFrame ; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame ; ::rtl::OUString m_sComponentURL ; - CSS_UNO::Sequence< CSS_BEANS::PropertyValue > m_seqLoaderArguments ; + ::com::sun::star::uno::Sequence< ::com::sun::star::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 97cad21816dd..f10505afbac1 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -47,10 +47,6 @@ namespace unocontrols{ -#define CSS_UNO ::com::sun::star::uno -#define CSS_LANG ::com::sun::star::lang -#define CSS_AWT ::com::sun::star::awt - //____________________________________________________________________________________________________________ // defines //____________________________________________________________________________________________________________ @@ -73,8 +69,8 @@ namespace unocontrols{ // classes //____________________________________________________________________________________________________________ -class ProgressBar : public CSS_AWT::XControlModel - , public CSS_AWT::XProgressBar +class ProgressBar : public ::com::sun::star::awt::XControlModel + , public ::com::sun::star::awt::XProgressBar , public BaseControl { @@ -101,7 +97,7 @@ public: @onerror */ - ProgressBar( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory ); + ProgressBar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); /**_________________________________________________________________________________________________________ @short @@ -135,8 +131,8 @@ public: @onerror */ - virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -187,8 +183,8 @@ public: @onerror */ - virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XAggregation @@ -207,8 +203,8 @@ public: @onerror */ - CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XProgressBar @@ -228,7 +224,7 @@ public: */ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) - throw( CSS_UNO::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -244,7 +240,7 @@ public: */ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) - throw( CSS_UNO::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -259,7 +255,7 @@ public: @onerror */ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -277,7 +273,7 @@ public: virtual void SAL_CALL setRange( sal_Int32 nMin , sal_Int32 nMax - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -292,7 +288,7 @@ public: @onerror */ - virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException ); + virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XWindow @@ -317,7 +313,7 @@ public: sal_Int32 nWidth , sal_Int32 nHeight , sal_Int16 nFlags - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // XControl @@ -337,8 +333,8 @@ public: */ virtual sal_Bool SAL_CALL setModel( - const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel + ) throw( ::com::sun::star::uno::RuntimeException ); /**_________________________________________________________________________________________________________ @short @@ -353,8 +349,8 @@ public: @onerror */ - virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() + throw( ::com::sun::star::uno::RuntimeException ); //__________________________________________________________________________________________________________ // BaseControl @@ -373,7 +369,7 @@ public: @onerror */ - static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); /**_________________________________________________________________________________________________________ @short @@ -412,7 +408,7 @@ protected: virtual void impl_paint( sal_Int32 nX , sal_Int32 nY , - const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics ); /**_________________________________________________________________________________________________________ @@ -437,7 +433,7 @@ protected: private: sal_Bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal] - CSS_AWT::Size m_aBlockSize ; // width and height of a block [>=0,0] + ::com::sun::star::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] @@ -447,11 +443,6 @@ private: }; // 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 6d829249449f..1f41368034b0 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -85,10 +85,6 @@ namespace unocontrols{ -#define CSS_UNO ::com::sun::star::uno -#define CSS_AWT ::com::sun::star::awt -#define CSS_LANG ::com::sun::star::lang - //____________________________________________________________________________________________________________ // defines //____________________________________________________________________________________________________________ @@ -127,9 +123,9 @@ struct IMPL_TextlistItem // class declaration //____________________________________________________________________________________________________________ -class ProgressMonitor : public CSS_AWT::XLayoutConstrains - , public CSS_AWT::XButton - , public CSS_AWT::XProgressMonitor +class ProgressMonitor : public ::com::sun::star::awt::XLayoutConstrains + , public ::com::sun::star::awt::XButton + , public ::com::sun::star::awt::XProgressMonitor , public BaseContainerControl { @@ -156,7 +152,7 @@ public: @onerror */ - ProgressMonitor( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory ); + ProgressMonitor( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); /**_______________________________________________________________________________________________________ @short @@ -190,8 +186,8 @@ public: @onerror A RuntimeException is thrown. */ - virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -242,7 +238,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XAggregation @@ -261,8 +257,8 @@ public: @onerror - */ - virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XProgressMonitor @@ -292,7 +288,7 @@ public: const ::rtl::OUString& sTopic , const ::rtl::OUString& sText , sal_Bool bbeforeProgress - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -310,7 +306,7 @@ public: virtual void SAL_CALL removeText( const ::rtl::OUString& sTopic , sal_Bool bbeforeProgress - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -329,7 +325,7 @@ public: const ::rtl::OUString& sTopic , const ::rtl::OUString& sText , sal_Bool bbeforeProgress - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XProgressBar @@ -348,7 +344,7 @@ public: @onerror - */ - virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -363,7 +359,7 @@ public: @onerror - */ - virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -378,7 +374,7 @@ public: @onerror - */ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -394,7 +390,7 @@ public: */ virtual void SAL_CALL setRange( sal_Int32 nMin , - sal_Int32 nMax ) throw( CSS_UNO::RuntimeException ); + sal_Int32 nMax ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -409,7 +405,7 @@ public: @onerror - */ - virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException ); + virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XButton @@ -429,8 +425,8 @@ public: */ virtual void SAL_CALL addActionListener( - const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -446,8 +442,8 @@ public: */ virtual void SAL_CALL removeActionListener( - const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -462,7 +458,7 @@ public: @onerror - */ - virtual void SAL_CALL setLabel( const ::rtl::OUString& sLabel ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setLabel( const ::rtl::OUString& sLabel ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -478,7 +474,7 @@ public: */ virtual void SAL_CALL setActionCommand( const ::rtl::OUString& sCommand ) - throw( CSS_UNO::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XLayoutConstrains @@ -497,7 +493,7 @@ public: @onerror - */ - virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -512,7 +508,7 @@ public: @onerror - */ - virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -527,8 +523,8 @@ public: @onerror - */ - virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XControl @@ -548,9 +544,9 @@ public: */ 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 ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -565,8 +561,8 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel ) - throw( CSS_UNO::RuntimeException ); + virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -581,8 +577,8 @@ public: @onerror - */ - virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XComponent @@ -601,7 +597,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XWindow @@ -624,7 +620,7 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( CSS_UNO::RuntimeException ); + sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // BaseControl @@ -643,7 +639,7 @@ public: @onerror - */ - static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); /**_______________________________________________________________________________________________________ @short - @@ -681,7 +677,7 @@ protected: virtual void impl_paint( sal_Int32 nX , sal_Int32 nY , - const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics ); //____________________________________________________________________________________________________________ // private methods @@ -780,24 +776,19 @@ private: private: ::std::vector < IMPL_TextlistItem* > maTextlist_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 ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Top ; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText") + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Top ; ::std::vector < IMPL_TextlistItem* > maTextlist_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 ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xTopic_Bottom ; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText") + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText_Bottom ; - CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar ; - CSS_UNO::Reference< CSS_AWT::XButton > m_xButton ; - CSS_AWT::Rectangle m_a3DLine ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XProgressBar > m_xProgressBar ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton > m_xButton ; + ::com::sun::star::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 d8e888f9dc42..733b80388d64 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -54,11 +54,6 @@ namespace unocontrols{ -#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 //____________________________________________________________________________________________________________ @@ -85,8 +80,8 @@ namespace unocontrols{ // class declaration //____________________________________________________________________________________________________________ -class StatusIndicator : public CSS_AWT::XLayoutConstrains - , public CSS_TASK::XStatusIndicator +class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains + , public ::com::sun::star::task::XStatusIndicator , public BaseContainerControl { @@ -113,7 +108,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror */ - StatusIndicator( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory ); + StatusIndicator( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); /**_______________________________________________________________________________________________________ @short @@ -147,8 +142,8 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -199,8 +194,8 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() + throw( ::com::sun::star::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XAggregation @@ -219,8 +214,8 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) + throw( ::com::sun::star::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XStatusIndicator @@ -242,7 +237,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains virtual void SAL_CALL start( const ::rtl::OUString& sText , sal_Int32 nRange - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); /*-****************************************************************************************************//** @short - @@ -257,7 +252,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL end() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL end() throw( ::com::sun::star::uno::RuntimeException ); /*-****************************************************************************************************//** @short - @@ -272,7 +267,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL reset() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL reset() throw( ::com::sun::star::uno::RuntimeException ); /*-****************************************************************************************************//** @short - @@ -287,7 +282,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL setText( const ::rtl::OUString& sText ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setText( const ::rtl::OUString& sText ) throw( ::com::sun::star::uno::RuntimeException ); /*-****************************************************************************************************//** @short - @@ -302,7 +297,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XLayoutConstrains @@ -321,7 +316,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -336,7 +331,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -351,8 +346,8 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize ) - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) + throw( ::com::sun::star::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XControl @@ -372,9 +367,9 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains */ 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 ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -389,8 +384,8 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel ) - throw( CSS_UNO::RuntimeException ); + virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -405,8 +400,8 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() + throw( ::com::sun::star::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XComponent @@ -425,7 +420,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XWindow @@ -448,7 +443,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( CSS_UNO::RuntimeException ); + sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // BaseControl @@ -467,7 +462,7 @@ class StatusIndicator : public CSS_AWT::XLayoutConstrains @onerror - */ - static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); /**_______________________________________________________________________________________________________ @short - @@ -503,8 +498,8 @@ protected: @onerror - */ - virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor( - const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer + virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor( + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer ); /**_______________________________________________________________________________________________________ @@ -523,7 +518,7 @@ protected: virtual void impl_paint ( sal_Int32 nX, sal_Int32 nY, - const CSS_UNO::Reference< CSS_AWT::XGraphics > & rGraphics + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & rGraphics ); /**_______________________________________________________________________________________________________ @@ -539,7 +534,7 @@ protected: @onerror - */ - virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent ); + virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent& aEvent ); //____________________________________________________________________________________________________________ // debug methods @@ -566,17 +561,11 @@ private: private: - CSS_UNO::Reference< CSS_AWT::XFixedText > m_xText ; - CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFixedText > m_xText ; + ::com::sun::star::uno::Reference< ::com::sun::star::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 |