diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sfx2/workben | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sfx2/workben')
-rw-r--r-- | sfx2/workben/custompanel/ctp_factory.cxx | 26 | ||||
-rw-r--r-- | sfx2/workben/custompanel/ctp_factory.hxx | 12 | ||||
-rw-r--r-- | sfx2/workben/custompanel/ctp_panel.cxx | 10 | ||||
-rw-r--r-- | sfx2/workben/custompanel/ctp_panel.hxx | 6 |
4 files changed, 27 insertions, 27 deletions
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx index 185862030ff6..1fb01a5136b2 100644 --- a/sfx2/workben/custompanel/ctp_factory.cxx +++ b/sfx2/workben/custompanel/ctp_factory.cxx @@ -65,14 +65,14 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const ::rtl::OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) + Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/org.openoffice.example.colorpanel/" ) ) ) throw NoSuchElementException( i_rResourceURL, *this ); - const ::rtl::OUString sColor( i_rResourceURL.copy( i_rResourceURL.lastIndexOf( '/' ) + 1 ) ); + const OUString sColor( i_rResourceURL.copy( i_rResourceURL.lastIndexOf( '/' ) + 1 ) ); const sal_Int32 nPanelColor = sColor.toInt32( 16 ); // retrieve the parent window @@ -91,7 +91,7 @@ namespace sd { namespace colortoolpanel { OSL_FAIL( "ToolPanelFactory::createUIElement: no parent window in the args!" ); throw IllegalArgumentException( - ::rtl::OUString( "No parent window provided in the creation arguments. Cannot create tool panel." ), + OUString( "No parent window provided in the creation arguments. Cannot create tool panel." ), *this, 2 ); @@ -103,22 +103,22 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL ToolPanelFactory::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ); + return OUString( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ); } //------------------------------------------------------------------------------------------------------------------ - ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const OUString& i_rServiceName ) throw (RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* serviceName = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* serviceName = aServiceNames.getConstArray(); serviceName != aServiceNames.getConstArray() + aServiceNames.getLength(); ++serviceName ) @@ -130,16 +130,16 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames() throw (RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException) + Sequence< OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames_static() throw (RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "org.openoffice.example.colorpanel.ToolPanelFactory" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "org.openoffice.example.colorpanel.ToolPanelFactory" ); return aServiceNames; } diff --git a/sfx2/workben/custompanel/ctp_factory.hxx b/sfx2/workben/custompanel/ctp_factory.hxx index 91d6ef8dc7d8..2399807b2106 100644 --- a/sfx2/workben/custompanel/ctp_factory.hxx +++ b/sfx2/workben/custompanel/ctp_factory.hxx @@ -48,16 +48,16 @@ namespace sd { namespace colortoolpanel ~ToolPanelFactory(); // XUIElementFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& i_rResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rArgs ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const OUString& i_rResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rArgs ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ) throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sfx2/workben/custompanel/ctp_panel.cxx b/sfx2/workben/custompanel/ctp_panel.cxx index 34c4a6c7d237..a56e04ab4063 100644 --- a/sfx2/workben/custompanel/ctp_panel.cxx +++ b/sfx2/workben/custompanel/ctp_panel.cxx @@ -84,7 +84,7 @@ namespace sd { namespace colortoolpanel WindowDescriptor aWindow; aWindow.Type = WindowClass_SIMPLE; - aWindow.WindowServiceName = ::rtl::OUString( "window" ); + aWindow.WindowServiceName = OUString( "window" ); aWindow.Parent = i_rParentWindow; aWindow.WindowAttributes = WindowAttribute::BORDER; @@ -135,7 +135,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); return m_xWindow; } @@ -144,7 +144,7 @@ namespace sd { namespace colortoolpanel { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // TODO: the following is wrong, since it doesn't respect i_rParentAccessible. In a real extension, you should // implement this correctly :) @@ -203,7 +203,7 @@ namespace sd { namespace colortoolpanel //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ PanelUIElement::PanelUIElement( const Reference< XComponentContext >& i_rContext, const Reference< XWindow >& i_rParentWindow, - const ::rtl::OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor ) + const OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor ) :PanelUIElement_Base( m_aMutex ) ,m_sResourceURL( i_rResourceURL ) ,m_xToolPanel( new SingleColorPanel( i_rContext, i_rParentWindow, i_nPanelColor ) ) @@ -223,7 +223,7 @@ namespace sd { namespace colortoolpanel } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL PanelUIElement::getResourceURL() throw (RuntimeException) + OUString SAL_CALL PanelUIElement::getResourceURL() throw (RuntimeException) { return m_sResourceURL; } diff --git a/sfx2/workben/custompanel/ctp_panel.hxx b/sfx2/workben/custompanel/ctp_panel.hxx index 82b74d0d2d3f..5ef7f19742f2 100644 --- a/sfx2/workben/custompanel/ctp_panel.hxx +++ b/sfx2/workben/custompanel/ctp_panel.hxx @@ -86,13 +86,13 @@ namespace sd { namespace colortoolpanel PanelUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& i_rParentWindow, - const ::rtl::OUString& i_rResourceURL, + const OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor ); // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface( ) throw (::com::sun::star::uno::RuntimeException); @@ -103,7 +103,7 @@ namespace sd { namespace colortoolpanel ~PanelUIElement(); private: - const ::rtl::OUString m_sResourceURL; + const OUString m_sResourceURL; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XToolPanel > m_xToolPanel; }; |