diff options
Diffstat (limited to 'UnoControls/source/inc/framecontrol.hxx')
| -rw-r--r-- | UnoControls/source/inc/framecontrol.hxx | 113 |
1 files changed, 50 insertions, 63 deletions
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 |