diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 18c51694009e..857a8d7c50a2 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -47,7 +47,7 @@ namespace unocontrols{ struct IMPL_ControlInfo { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl ; - ::rtl::OUString sName ; + OUString sName ; }; class BaseContainerControl : public ::com::sun::star::awt::XControlModel @@ -268,7 +268,7 @@ public: */ virtual void SAL_CALL addControl( - const ::rtl::OUString& sName , + const OUString& sName , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl ) throw( ::com::sun::star::uno::RuntimeException ); @@ -337,7 +337,7 @@ public: */ virtual void SAL_CALL setStatusText( - const ::rtl::OUString& sStatusText + const OUString& sStatusText ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @@ -354,7 +354,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( - const ::rtl::OUString& sName + const OUString& sName ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 68d90e201805..f54033ef84d8 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -307,7 +307,7 @@ public: */ virtual sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& sServiceName + const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @@ -323,7 +323,7 @@ public: @onerror - */ - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); /**_______________________________________________________________________________________________________ @@ -339,7 +339,7 @@ public: @onerror - */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); //________________________________________________________________________________________________________ @@ -1012,7 +1012,7 @@ public: @onerror - */ - static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); /**_______________________________________________________________________________________________________ @short - @@ -1027,7 +1027,7 @@ public: @onerror - */ - static const ::rtl::OUString impl_getStaticImplementationName(); + static const OUString impl_getStaticImplementationName(); //____________________________________________________________________________________________________________ // protected methods diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index a729de6d2a3f..7f4340ccd808 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -396,7 +396,7 @@ public: @onerror */ - static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); /**_________________________________________________________________________________________________________ @short @@ -411,7 +411,7 @@ public: @onerror */ - static const ::rtl::OUString impl_getStaticImplementationName(); + static const OUString impl_getStaticImplementationName(); //______________________________________________________________________________________________________________ // protected methods @@ -553,7 +553,7 @@ private: */ void impl_createFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer , - const ::rtl::OUString& sURL , + const OUString& sURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqArguments ); /**_________________________________________________________________________________________________________ @@ -594,7 +594,7 @@ private: private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame ; - ::rtl::OUString m_sComponentURL ; + OUString m_sComponentURL ; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_seqLoaderArguments ; ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer ; OConnectionPointContainerHelper m_aConnectionPointContainer ; diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index 7bd2d6f1cff7..8fb3d8bcdeab 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -345,7 +345,7 @@ public: @onerror */ - static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); + static const ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); /**_________________________________________________________________________________________________________ @short @@ -360,7 +360,7 @@ public: @onerror */ - static const ::rtl::OUString impl_getStaticImplementationName(); + static const OUString impl_getStaticImplementationName(); //____________________________________________________________________________________________________________ // protected methods