diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-21 13:54:41 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-21 14:02:45 +0100 |
commit | 8b0351023010a2954b6dfe3f6c7aaf2eccd35125 (patch) | |
tree | 144560cc6c2f2c62132ceee321e93bad913d13d6 /UnoControls | |
parent | 0c128345eaa94686b67039346b7ce20ef43ab024 (diff) |
expand and remove CSS* macro
Diffstat (limited to 'UnoControls')
-rw-r--r-- | UnoControls/inc/basecontainercontrol.hxx | 105 | ||||
-rw-r--r-- | UnoControls/inc/basecontrol.hxx | 225 | ||||
-rw-r--r-- | UnoControls/inc/multiplexer.hxx | 148 | ||||
-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 |
9 files changed, 408 insertions, 494 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 6d32b9d5bd3a..7052c580bd61 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -56,18 +56,13 @@ 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_CONTAINER ::com::sun::star::container - //____________________________________________________________________________________________________________ // structs, types, forwards //____________________________________________________________________________________________________________ struct IMPL_ControlInfo { - CSS_UNO::Reference< CSS_AWT::XControl > xControl ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl ; ::rtl::OUString sName ; }; @@ -75,8 +70,8 @@ struct IMPL_ControlInfo // classes //____________________________________________________________________________________________________________ -class BaseContainerControl : public CSS_AWT::XControlModel - , public CSS_AWT::XControlContainer +class BaseContainerControl : public ::com::sun::star::awt::XControlModel + , public ::com::sun::star::awt::XControlContainer , public BaseControl { @@ -103,7 +98,7 @@ public: @onerror - */ - BaseContainerControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory ); + BaseContainerControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); /**_______________________________________________________________________________________________________ @short - @@ -137,9 +132,9 @@ 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 ); //________________________________________________________________________________________________________ // XTypeProvider @@ -158,8 +153,8 @@ 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 @@ -178,9 +173,9 @@ 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 ); //________________________________________________________________________________________________________ // XControl @@ -200,9 +195,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 - @@ -218,8 +213,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 - @@ -234,8 +229,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 @@ -254,7 +249,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XEventListener @@ -273,7 +268,7 @@ public: @onerror - */ - virtual void SAL_CALL disposing( const CSS_LANG::EventObject& rEvent ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XControlContainer @@ -294,8 +289,8 @@ public: virtual void SAL_CALL addControl( const ::rtl::OUString& sName , - const CSS_UNO::Reference< CSS_AWT::XControl >& xControl - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -311,8 +306,8 @@ public: */ virtual void SAL_CALL addContainerListener( - const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -328,8 +323,8 @@ public: */ virtual void SAL_CALL removeControl( - const CSS_UNO::Reference< CSS_AWT::XControl >& xControl - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -345,8 +340,8 @@ public: */ virtual void SAL_CALL removeContainerListener( - const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -363,7 +358,7 @@ public: virtual void SAL_CALL setStatusText( const ::rtl::OUString& sStatusText - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -378,9 +373,9 @@ public: @onerror - */ - virtual CSS_UNO::Reference< CSS_AWT::XControl > SAL_CALL getControl( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::rtl::OUString& sName - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -395,8 +390,8 @@ public: @onerror - */ - virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XControl > > SAL_CALL getControls() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls() + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XUnoControlContainer @@ -416,8 +411,8 @@ public: */ virtual void SAL_CALL addTabController( - const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& xTabController + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -433,8 +428,8 @@ public: */ virtual void SAL_CALL removeTabController( - const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >& xTabController + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -450,8 +445,8 @@ public: */ virtual void SAL_CALL setTabControllers( - const CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >& xTabControllers - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > >& xTabControllers + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -466,8 +461,8 @@ public: @onerror - */ - virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > > SAL_CALL getTabControllers() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > SAL_CALL getTabControllers() + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XWindow @@ -486,7 +481,7 @@ public: @onerror - */ - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________________ // protected methods @@ -507,8 +502,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 ); /**_______________________________________________________________________________________________________ @@ -527,7 +522,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 ); //____________________________________________________________________________________________________________ @@ -575,18 +570,12 @@ private: ::std::vector< IMPL_ControlInfo* > maControlInfoList; // list of references of XTabController to hold tab-order in this container - CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > > m_xTabControllerList ; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > > m_xTabControllerList ; ::cppu::OMultiTypeInterfaceContainerHelper m_aListeners ; }; // class BaseContainerControl -// The namespace aliases are only used in this header -#undef CSS_UNO -#undef CSS_AWT -#undef CSS_LANG -#undef CSS_CONTAINER - } // namespace unocontrols #endif // ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index e8eb59bce4ac..f35aa213a181 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -111,10 +111,6 @@ namespace unocontrols{ -#define CSS_UNO ::com::sun::star::uno -#define CSS_AWT ::com::sun::star::awt -#define CSS_LANG ::com::sun::star::lang - //____________________________________________________________________________________________________________ // macros //____________________________________________________________________________________________________________ @@ -136,12 +132,12 @@ struct IMPL_MutexContainer // classes //____________________________________________________________________________________________________________ -class BaseControl : public CSS_LANG::XServiceInfo - , public CSS_AWT::XPaintListener - , public CSS_AWT::XWindowListener - , public CSS_AWT::XView - , public CSS_AWT::XWindow - , public CSS_AWT::XControl +class BaseControl : public ::com::sun::star::lang::XServiceInfo + , public ::com::sun::star::awt::XPaintListener + , public ::com::sun::star::awt::XWindowListener + , public ::com::sun::star::awt::XView + , public ::com::sun::star::awt::XWindow + , public ::com::sun::star::awt::XControl , public IMPL_MutexContainer , public ::cppu::OComponentHelper { @@ -168,7 +164,7 @@ public: @onerror - */ - BaseControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory ); + BaseControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); /**_______________________________________________________________________________________________________ @short - @@ -202,9 +198,9 @@ 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 @@ -255,8 +251,8 @@ 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 ); /**_______________________________________________________________________________________________________ @short get implementation id @@ -272,8 +268,8 @@ public: @onerror A RuntimeException is thrown. */ - virtual CSS_UNO::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XAggregation @@ -293,8 +289,8 @@ public: */ virtual void SAL_CALL setDelegator( - const CSS_UNO::Reference< CSS_UNO::XInterface >& xDelegator - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDelegator + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -309,9 +305,9 @@ 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 ); //________________________________________________________________________________________________________ // XServiceInfo @@ -332,7 +328,7 @@ public: virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName - ) throw( CSS_UNO::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -348,7 +344,7 @@ public: */ virtual ::rtl::OUString SAL_CALL getImplementationName() - throw( CSS_UNO::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -363,8 +359,8 @@ public: @onerror - */ - virtual CSS_UNO::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XComponent @@ -383,7 +379,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -399,8 +395,8 @@ public: */ virtual void SAL_CALL addEventListener( - const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -416,8 +412,8 @@ public: */ virtual void SAL_CALL removeEventListener( - const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XControl @@ -437,9 +433,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 - @@ -455,8 +451,8 @@ public: */ virtual void SAL_CALL setContext( - const CSS_UNO::Reference< CSS_UNO::XInterface >& xContext - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xContext + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -472,8 +468,8 @@ public: */ virtual sal_Bool SAL_CALL setModel( - const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel - ) throw( CSS_UNO::RuntimeException ) = 0 ; + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel + ) throw( ::com::sun::star::uno::RuntimeException ) = 0 ; /**_______________________________________________________________________________________________________ @short - @@ -488,7 +484,7 @@ public: @onerror - */ - virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -503,8 +499,8 @@ public: @onerror - */ - virtual CSS_UNO::Reference< CSS_UNO::XInterface > SAL_CALL getContext() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -519,8 +515,8 @@ public: @onerror - */ - virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel() - throw( CSS_UNO::RuntimeException ) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() + throw( ::com::sun::star::uno::RuntimeException ) = 0; /**_______________________________________________________________________________________________________ @short - @@ -535,8 +531,8 @@ public: @onerror - */ - virtual CSS_UNO::Reference< CSS_AWT::XWindowPeer > SAL_CALL getPeer() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -551,8 +547,8 @@ public: @onerror - */ - virtual CSS_UNO::Reference< CSS_AWT::XView > SAL_CALL getView() - throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -567,7 +563,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isDesignMode() throw( CSS_UNO::RuntimeException ); + virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -582,7 +578,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isTransparent() throw( CSS_UNO::RuntimeException ); + virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XWindow @@ -605,7 +601,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 ); /**_______________________________________________________________________________________________________ @short - @@ -620,7 +616,7 @@ public: @onerror - */ - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -635,7 +631,7 @@ public: @onerror - */ - virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -650,7 +646,7 @@ public: @onerror - */ - virtual void SAL_CALL setFocus() throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -665,7 +661,7 @@ public: @onerror - */ - virtual CSS_AWT::Rectangle SAL_CALL getPosSize() throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -681,8 +677,8 @@ public: */ virtual void SAL_CALL addWindowListener( - const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -698,8 +694,8 @@ public: */ virtual void SAL_CALL addFocusListener( - const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -715,8 +711,8 @@ public: */ virtual void SAL_CALL addKeyListener( - const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener ) - throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) + throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -732,8 +728,8 @@ public: */ virtual void SAL_CALL addMouseListener( - const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -749,8 +745,8 @@ public: */ virtual void SAL_CALL addMouseMotionListener( - const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -766,8 +762,8 @@ public: */ virtual void SAL_CALL addPaintListener( - const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -783,8 +779,8 @@ public: */ virtual void SAL_CALL removeWindowListener( - const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -800,8 +796,8 @@ public: */ virtual void SAL_CALL removeFocusListener( - const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -817,8 +813,8 @@ public: */ virtual void SAL_CALL removeKeyListener( - const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -834,8 +830,8 @@ public: */ virtual void SAL_CALL removeMouseListener( - const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -851,8 +847,8 @@ public: */ virtual void SAL_CALL removeMouseMotionListener( - const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -868,8 +864,8 @@ public: */ virtual void SAL_CALL removePaintListener( - const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener + ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XView @@ -889,7 +885,7 @@ public: */ virtual void SAL_CALL draw( sal_Int32 nX , - sal_Int32 nY ) throw( CSS_UNO::RuntimeException ); + sal_Int32 nY ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -905,8 +901,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 - @@ -922,7 +918,7 @@ public: */ virtual void SAL_CALL setZoom( float fZoomX , - float fZoomY ) throw( CSS_UNO::RuntimeException ); + float fZoomY ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @short - @@ -937,8 +933,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 ); /**_______________________________________________________________________________________________________ @short - @@ -953,10 +949,10 @@ public: @onerror - */ - virtual CSS_AWT::Size SAL_CALL getSize() throw( CSS_UNO::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ - // CSS_LANG::XEventListener + // ::com::sun::star::lang::XEventListener //________________________________________________________________________________________________________ /**_______________________________________________________________________________________________________ @@ -973,8 +969,8 @@ public: */ virtual void SAL_CALL disposing( - const CSS_LANG::EventObject& rSource - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::lang::EventObject& rSource + ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XPaintListener @@ -994,8 +990,8 @@ public: */ virtual void SAL_CALL windowPaint( - const CSS_AWT::PaintEvent& rEvent - ) throw( CSS_UNO::RuntimeException ); + const ::com::sun::star::awt::PaintEvent& rEvent + ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // XWindowListener @@ -1014,10 +1010,10 @@ public: @onerror - */ - virtual void SAL_CALL windowResized( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException ); - virtual void SAL_CALL windowMoved( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException ); - virtual void SAL_CALL windowShown( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException ); - virtual void SAL_CALL windowHidden( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException ); + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ // impl but public method to register service @@ -1036,7 +1032,7 @@ public: @onerror - */ - static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); /**_______________________________________________________________________________________________________ @short - @@ -1073,7 +1069,7 @@ protected: @onerror - */ - const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > impl_getMultiServiceFactory(); + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > impl_getMultiServiceFactory(); /**_______________________________________________________________________________________________________ @short - @@ -1088,7 +1084,7 @@ protected: @onerror - */ - const CSS_UNO::Reference< CSS_AWT::XWindow > impl_getPeerWindow(); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > impl_getPeerWindow(); /**_______________________________________________________________________________________________________ @short - @@ -1103,7 +1099,7 @@ protected: @onerror - */ - const CSS_UNO::Reference< CSS_AWT::XGraphics > impl_getGraphicsPeer(); + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > impl_getGraphicsPeer(); /**_______________________________________________________________________________________________________ @short - @@ -1148,8 +1144,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 ); /**_______________________________________________________________________________________________________ @@ -1167,7 +1163,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 ); /**_______________________________________________________________________________________________________ @short - @@ -1182,7 +1178,7 @@ protected: @onerror - */ - virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent ); + virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent& aEvent ); /**_______________________________________________________________________________________________________ @short - @@ -1197,7 +1193,7 @@ protected: @onerror - */ - CSS_UNO::Reference< CSS_UNO::XInterface > impl_getDelegator(); + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > impl_getDelegator(); //____________________________________________________________________________________________________________ // private methods @@ -1241,15 +1237,15 @@ private: private: - CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > m_xFactory ; - CSS_UNO::Reference< CSS_UNO::XInterface > m_xDelegator ; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory ; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator ; OMRCListenerMultiplexerHelper* m_pMultiplexer ; // multiplex events - CSS_UNO::Reference< CSS_UNO::XInterface > m_xMultiplexer ; - CSS_UNO::Reference< CSS_UNO::XInterface > m_xContext ; - CSS_UNO::Reference< CSS_AWT::XWindowPeer > m_xPeer ; - CSS_UNO::Reference< CSS_AWT::XWindow > m_xPeerWindow ; - CSS_UNO::Reference< CSS_AWT::XGraphics > m_xGraphicsView ; // graphics for CSS_AWT::XView-operations - CSS_UNO::Reference< CSS_AWT::XGraphics > m_xGraphicsPeer ; // graphics for painting on a peer + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMultiplexer ; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xContext ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > m_xPeer ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeerWindow ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsView ; // graphics for ::com::sun::star::awt::XView-operations + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > m_xGraphicsPeer ; // graphics for painting on a peer sal_Int32 m_nX ; // Position ... sal_Int32 m_nY ; sal_Int32 m_nWidth ; // ... and size of window @@ -1260,11 +1256,6 @@ private: }; // class BaseControl -// The namespace aliaes are only used in this header -#undef CSS_UNO -#undef CSS_AWT -#undef CSS_LANG - } // namespace unocontrols #endif // ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index b9a90c5a33f1..de455361e75c 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -68,21 +68,17 @@ namespace unocontrols{ -#define CSS_UNO ::com::sun::star::uno -#define CSS_AWT ::com::sun::star::awt -#define CSS_LANG ::com::sun::star::lang - //____________________________________________________________________________________________________________ // class //____________________________________________________________________________________________________________ -class OMRCListenerMultiplexerHelper : public CSS_AWT::XFocusListener - , public CSS_AWT::XWindowListener - , public CSS_AWT::XKeyListener - , public CSS_AWT::XMouseListener - , public CSS_AWT::XMouseMotionListener - , public CSS_AWT::XPaintListener - , public CSS_AWT::XTopWindowListener +class OMRCListenerMultiplexerHelper : public ::com::sun::star::awt::XFocusListener + , public ::com::sun::star::awt::XWindowListener + , public ::com::sun::star::awt::XKeyListener + , public ::com::sun::star::awt::XMouseListener + , public ::com::sun::star::awt::XMouseMotionListener + , public ::com::sun::star::awt::XPaintListener + , public ::com::sun::star::awt::XTopWindowListener , public ::cppu::OWeakObject { @@ -110,8 +106,8 @@ public: @onerror - */ - OMRCListenerMultiplexerHelper( const CSS_UNO::Reference< CSS_AWT::XWindow >& xControl , - const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer ); + OMRCListenerMultiplexerHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xControl , + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer ); /**_______________________________________________________________________________________________________ @short copy-constructor @@ -160,8 +156,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 @@ -212,7 +208,7 @@ public: @onerror - */ - operator CSS_UNO::Reference< CSS_UNO::XInterface >() const; + operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() const; /**_______________________________________________________________________________________________________ @short - @@ -246,7 +242,7 @@ public: @onerror - */ - void setPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer ); + void setPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer ); /**_______________________________________________________________________________________________________ @short Remove all listeners and send a disposing message. @@ -276,8 +272,8 @@ public: @onerror - */ - void advise( const CSS_UNO::Type& aType , - const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener ); + void advise( const ::com::sun::star::uno::Type& aType , + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ); /**_______________________________________________________________________________________________________ @short Remove the specified listener from the source. @@ -292,8 +288,8 @@ public: @onerror - */ - void unadvise( const CSS_UNO::Type& aType , - const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener ); + void unadvise( const ::com::sun::star::uno::Type& aType , + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ); //________________________________________________________________________________________________________ // XEventListener @@ -313,8 +309,8 @@ public: @onerror - */ - virtual void SAL_CALL disposing(const CSS_LANG::EventObject& aSource) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource) + throw( ::com::sun::star::uno::RuntimeException ) ; //________________________________________________________________________________________________________ // XFocusListener @@ -334,8 +330,8 @@ public: @onerror - */ - virtual void SAL_CALL focusGained(const CSS_AWT::FocusEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -351,8 +347,8 @@ public: @onerror - */ - virtual void SAL_CALL focusLost(const CSS_AWT::FocusEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; //________________________________________________________________________________________________________ // XWindowListener @@ -372,8 +368,8 @@ public: @onerror - */ - virtual void SAL_CALL windowResized(const CSS_AWT::WindowEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -389,8 +385,8 @@ public: @onerror - */ - virtual void SAL_CALL windowMoved(const CSS_AWT::WindowEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -406,8 +402,8 @@ public: @onerror - */ - virtual void SAL_CALL windowShown(const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -423,8 +419,8 @@ public: @onerror - */ - virtual void SAL_CALL windowHidden(const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; //________________________________________________________________________________________________________ // XKeyListener @@ -444,8 +440,8 @@ public: @onerror - */ - virtual void SAL_CALL keyPressed( const CSS_AWT::KeyEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -461,8 +457,8 @@ public: @onerror - */ - virtual void SAL_CALL keyReleased( const CSS_AWT::KeyEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; //________________________________________________________________________________________________________ // XMouseListener @@ -482,8 +478,8 @@ public: @onerror - */ - virtual void SAL_CALL mousePressed(const CSS_AWT::MouseEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -499,8 +495,8 @@ public: @onerror - */ - virtual void SAL_CALL mouseReleased(const CSS_AWT::MouseEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -516,8 +512,8 @@ public: @onerror - */ - virtual void SAL_CALL mouseEntered(const CSS_AWT::MouseEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -533,8 +529,8 @@ public: @onerror - */ - virtual void SAL_CALL mouseExited(const CSS_AWT::MouseEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; //________________________________________________________________________________________________________ // XMouseMotionListener @@ -554,8 +550,8 @@ public: @onerror - */ - virtual void SAL_CALL mouseDragged(const CSS_AWT::MouseEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -571,8 +567,8 @@ public: @onerror - */ - virtual void SAL_CALL mouseMoved(const CSS_AWT::MouseEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; //________________________________________________________________________________________________________ // XPaintListener @@ -592,8 +588,8 @@ public: @onerror - */ - virtual void SAL_CALL windowPaint(const CSS_AWT::PaintEvent& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; //________________________________________________________________________________________________________ // XTopWindowListener @@ -613,8 +609,8 @@ public: @onerror - */ - virtual void SAL_CALL windowOpened( const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -630,8 +626,8 @@ public: @onerror - */ - virtual void SAL_CALL windowClosing( const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -647,8 +643,8 @@ public: @onerror - */ - virtual void SAL_CALL windowClosed( const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -664,8 +660,8 @@ public: @onerror - */ - virtual void SAL_CALL windowMinimized( const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -681,8 +677,8 @@ public: @onerror - */ - virtual void SAL_CALL windowNormalized( const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -698,8 +694,8 @@ public: @onerror - */ - virtual void SAL_CALL windowActivated( const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; /**_______________________________________________________________________________________________________ @short - @@ -715,8 +711,8 @@ public: @onerror - */ - virtual void SAL_CALL windowDeactivated( const CSS_LANG::EventObject& aEvent ) - throw( CSS_UNO::RuntimeException ) ; + virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& aEvent ) + throw( ::com::sun::star::uno::RuntimeException ) ; //____________________________________________________________________________________________________________ // protected methods @@ -738,8 +734,8 @@ protected: @onerror - */ - void impl_adviseToPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer , - const CSS_UNO::Type& aType ); + void impl_adviseToPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer , + const ::com::sun::star::uno::Type& aType ); /**_______________________________________________________________________________________________________ @short Add the listener to the peer. @@ -755,8 +751,8 @@ protected: @onerror - */ - void impl_unadviseFromPeer( const CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer , - const CSS_UNO::Type& aType ); + void impl_unadviseFromPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xPeer , + const ::com::sun::star::uno::Type& aType ); //____________________________________________________________________________________________________________ // private variables @@ -765,18 +761,12 @@ protected: private: ::osl::Mutex m_aMutex ; - CSS_UNO::Reference< CSS_AWT::XWindow > m_xPeer ; /// The source of the events. Normally this is the peer object. - CSS_UNO::WeakReference< CSS_AWT::XWindow > m_xControl ; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xPeer ; /// The source of the events. Normally this is the peer object. + ::com::sun::star::uno::WeakReference< ::com::sun::star::awt::XWindow > m_xControl ; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder ; }; // class OMRCListenerMultiplexerHelper -// The namespace aliases are only used in this header -#undef CSS_UNO -#undef CSS_AWT -#undef CSS_LANG - - } // namespace unocontrols #endif // ifndef _UNOCONTROLS_MULTIPLEXER_HXX 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 |