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 /sd/source/ui/framework | |
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 'sd/source/ui/framework')
36 files changed, 100 insertions, 126 deletions
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 2ddb21823636..3b0182e4b947 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -42,7 +42,7 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest) Reference<container::XNamed> xNamed (rxRequest, UNO_QUERY); if (xNamed.is()) SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << - ::rtl::OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr()); } #endif diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 864766ea062f..9ad7bf4a1bff 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; namespace { /** Use the XResourceId::compareTo() method to implement a compare operator @@ -83,11 +82,11 @@ OUString Configuration_getImplementationName (void) throw(RuntimeException) -Sequence<rtl::OUString> SAL_CALL Configuration_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void) throw (RuntimeException) { static const OUString sServiceName("com.sun.star.drawing.framework.Configuration"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } @@ -185,7 +184,7 @@ void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxRes Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( const Reference<XResourceId>& rxAnchorId, - const ::rtl::OUString& rsResourceURLPrefix, + const OUString& rsResourceURLPrefix, AnchorBindingMode eMode) throw (::com::sun::star::uno::RuntimeException) { diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 212a235ea8bd..b8c0d757ee6c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index efdbde6460fc..275f1ab04553 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using rtl::OUString; using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { @@ -63,11 +62,11 @@ OUString ConfigurationController_getImplementationName (void) throw(RuntimeExcep -Sequence<rtl::OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void) throw (RuntimeException) { static const OUString sServiceName("com.sun.star.drawing.framework.ConfigurationController"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } @@ -219,7 +218,7 @@ void ConfigurationController::RequestSynchronousUpdate (void) void SAL_CALL ConfigurationController::addConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Any& rUserData) throw (RuntimeException) { diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index a612fe63612f..a5640f85fbb0 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using rtl::OUString; namespace sd { namespace framework { @@ -43,7 +42,7 @@ ConfigurationControllerBroadcaster::ConfigurationControllerBroadcaster ( void ConfigurationControllerBroadcaster::AddListener( const Reference<XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Any& rUserData) { if ( ! rxListener.is()) diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 1858b69f860c..fd1ceddb3bfa 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -68,7 +68,7 @@ public: void AddListener( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Any& rUserData); /** Remove all references to the given listener. When one listener has @@ -96,7 +96,7 @@ public: the given arguments. */ void NotifyListeners ( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const css::uno::Reference<css::drawing::framework::XResource>& rxResourceObject); @@ -117,9 +117,9 @@ private: }; typedef ::std::vector<ListenerDescriptor> ListenerList; typedef ::boost::unordered_map - <rtl::OUString, + <OUString, ListenerList, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> ListenerMap; ListenerMap maListenerMap; diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index b974b3b4e92c..4b9f3e8b7adb 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 74839b903aee..24d0f1f1dd99 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -59,11 +59,11 @@ void ConfigurationTracer::TraceBoundResources ( const int nIndentation) { Sequence<Reference<XResourceId> > aResourceList ( - rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT)); - const ::rtl::OUString sIndentation (" "); + rxConfiguration->getResources(rxResourceId, OUString(), AnchorBindingMode_DIRECT)); + const OUString sIndentation (" "); for (sal_Int32 nIndex=0; nIndex<aResourceList.getLength(); ++nIndex) { - ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL()); + OUString sLine (aResourceList[nIndex]->getResourceURL()); for (int i=0; i<nIndentation; ++i) sLine = sIndentation + sLine; SAL_INFO("sd.ui","" << OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr()); diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 8b2171cdeb88..14cd1ad29e8c 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; using ::sd::framework::FrameworkHelper; -using ::rtl::OUString; using ::std::vector; namespace { diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index d2d54bb67cef..cde24baacd29 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 28b56736bfd0..4fa341a239c1 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -94,13 +94,13 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual ::rtl::OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName (void) throw (::com::sun::star::uno::RuntimeException); /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const ::rtl::OUString& rName) + virtual void SAL_CALL setName (const OUString& rName) throw (::com::sun::star::uno::RuntimeException); private: diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 7a13659d156b..f059efdb8c81 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index 81b1efd01d22..fd83529202e6 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -47,7 +47,7 @@ public: The factory that will create resource objects of the specfied type. */ void AddFactory ( - const ::rtl::OUString& rsURL, + const OUString& rsURL, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory) throw (css::uno::RuntimeException); @@ -57,7 +57,7 @@ public: is registered for other URLs then these remain registered. */ void RemoveFactoryForURL( - const ::rtl::OUString& rsURL) + const OUString& rsURL) throw (css::uno::RuntimeException); /** Unregister the specified factory. @@ -78,21 +78,21 @@ public: is returned. Otherwise an empty reference is returned. */ css::uno::Reference<css::drawing::framework::XResourceFactory> GetFactory ( - const ::rtl::OUString& rsURL) + const OUString& rsURL) throw (css::uno::RuntimeException); private: ::osl::Mutex maMutex; typedef ::boost::unordered_map< - ::rtl::OUString, + OUString, css::uno::Reference<css::drawing::framework::XResourceFactory>, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> FactoryMap; FactoryMap maFactoryMap; typedef ::std::vector< ::std::pair< - rtl::OUString, + OUString, css::uno::Reference<css::drawing::framework::XResourceFactory> > > FactoryPatternList; FactoryPatternList maFactoryPatternList; @@ -108,7 +108,7 @@ private: When the factory has not yet been added then return NULL. */ css::uno::Reference<css::drawing::framework::XResourceFactory> FindFactory ( - const ::rtl::OUString& rsURLBase) + const OUString& rsURLBase) throw (css::uno::RuntimeException); }; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 2c8a1362d243..fb1c771dc687 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; /** When the USE_OPTIMIZATIONS symbol is defined then at some optimizations are activated that work only together with XResourceId objects that are @@ -53,19 +52,19 @@ Reference<XInterface> SAL_CALL ResourceId_createInstance ( -::rtl::OUString ResourceId_getImplementationName (void) throw(RuntimeException) +OUString ResourceId_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.ResourceId"); + return OUString("com.sun.star.comp.Draw.framework.ResourceId"); } -Sequence<rtl::OUString> SAL_CALL ResourceId_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ResourceId"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.ResourceId"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index aa781777c2d3..621a2f41b98a 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index 0ce2797ef046..e1f72d03d1d9 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -70,13 +70,13 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual ::rtl::OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName (void) throw (::com::sun::star::uno::RuntimeException); /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const ::rtl::OUString& rName) + virtual void SAL_CALL setName (const OUString& rName) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 042bfdf28a9c..4d2651dff923 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { @@ -96,19 +95,19 @@ Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance ( -::rtl::OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory"); } -Sequence<rtl::OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 66e060290f01..5a2c061087c7 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -44,19 +44,19 @@ Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance ( -::rtl::OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory"); } -Sequence<rtl::OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void) throw (RuntimeException) { - const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + const OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 6cac67a66f00..927a26159cd4 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; @@ -65,19 +64,19 @@ Reference<XInterface> SAL_CALL BasicViewFactory_createInstance ( -::rtl::OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException) +OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicViewFactory"); + return OUString("com.sun.star.comp.Draw.framework.BasicViewFactory"); } -Sequence<rtl::OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory"); + return Sequence<OUString>(&sServiceName, 1); } diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 4cb0bc8727fc..c4d5dd11bf72 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index b80fcce5c399..4eeb5c5f3e0c 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 7bca561c972e..ce7b026ff834 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; @@ -107,19 +106,19 @@ Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance ( -::rtl::OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException) +OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider"); + return OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider"); } -Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider"); + return Sequence<OUString>(&sServiceName, 1); } @@ -127,7 +126,7 @@ Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedService //===== PresentationFactory =================================================== -const ::rtl::OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation"); +const OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation"); PresentationFactory::PresentationFactory ( diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 2269463471bc..b8e7e79cfb7e 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace sd { namespace framework { @@ -43,19 +42,19 @@ Reference<XInterface> SAL_CALL TaskPanelFactory_createInstance ( -::rtl::OUString TaskPanelFactory_getImplementationName (void) throw(RuntimeException) +OUString TaskPanelFactory_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.TaskPanelFactory"); + return OUString("com.sun.star.comp.Draw.framework.TaskPanelFactory"); } -Sequence<rtl::OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void) throw (RuntimeException) { const OUString sServiceName("com.sun.star.drawing.framework.TaskPanelFactory"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } @@ -173,13 +172,13 @@ void SAL_CALL TaskPanelFactory::initialize( namespace { - void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< ::rtl::OUString >& o_rResourceURLs ) + void lcl_collectResourceURLs( const Reference< XResourceId >& i_rResourceId, ::std::vector< OUString >& o_rResourceURLs ) { ENSURE_OR_RETURN_VOID( i_rResourceId.is(), "illegal resource ID" ); o_rResourceURLs.resize(0); Reference< XResourceId > xResourceId( i_rResourceId ); - ::rtl::OUString sResourceURL = xResourceId->getResourceURL(); + OUString sResourceURL = xResourceId->getResourceURL(); while ( !sResourceURL.isEmpty() ) { o_rResourceURLs.push_back( sResourceURL ); @@ -209,10 +208,10 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); // assume that the top-level anchor is the URL of the pane - ::std::vector< ::rtl::OUString > aResourceURLs; + ::std::vector< OUString > aResourceURLs; lcl_collectResourceURLs( rxResourceId, aResourceURLs ); - const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + const OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); @@ -237,18 +236,18 @@ void SAL_CALL TaskPanelFactory::releaseResource ( const Reference< XResourceId > xResourceId( rxResource->getResourceId(), UNO_SET_THROW ); // assume that the top-level anchor is the URL of the pane - ::std::vector< ::rtl::OUString > aResourceURLs; + ::std::vector< OUString > aResourceURLs; lcl_collectResourceURLs( xResourceId, aResourceURLs ); OSL_ENSURE( !aResourceURLs.empty(), "TaskPanelFactory::releaseResource: illegal resource/URL!" ); if ( !aResourceURLs.empty() ) { - const ::rtl::OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; + const OUString sPaneURL = aResourceURLs[ aResourceURLs.size() - 1 ]; ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); const ::boost::shared_ptr< ViewShell > pPaneViewShell( pFrameworkHelper->GetViewShell( sPaneURL ) ); if ( pPaneViewShell != NULL ) { - const ::rtl::OUString sPanelResourceURL( xResourceId->getResourceURL() ); + const OUString sPanelResourceURL( xResourceId->getResourceURL() ); const toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sPanelResourceURL ) ); toolpanel::ToolPanelViewShell* pToolPanel = dynamic_cast< toolpanel::ToolPanelViewShell* >( pPaneViewShell.get() ); diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index bc50d9b8dc46..e017cbf21566 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -55,7 +55,6 @@ using ::com::sun::star::awt::XWindow; using ::com::sun::star::rendering::XCanvas; using ::com::sun::star::lang::DisposedException; -using ::rtl::OUString; using ::sd::toolpanel::ToolPanelViewShell; namespace sd { namespace framework { diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 5be26e1b5c0a..067f46c86a19 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 4e5080fbaaa7..a1825f28bd86 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::tools::ConfigurationAccess; namespace sd { namespace framework { @@ -44,9 +43,9 @@ static const sal_uInt32 snStartupPropertyCount (1); class ModuleController::ResourceToFactoryMap : public ::boost::unordered_map< - rtl::OUString, - rtl::OUString, - ::rtl::OUStringHash, + OUString, + OUString, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -56,9 +55,9 @@ public: class ModuleController::LoadedFactoryContainer : public ::boost::unordered_map< - rtl::OUString, + OUString, WeakReference<XInterface>, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -78,19 +77,19 @@ Reference<XInterface> SAL_CALL ModuleController_createInstance ( -::rtl::OUString ModuleController_getImplementationName (void) throw(RuntimeException) +OUString ModuleController_getImplementationName (void) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.Draw.framework.module.ModuleController"); + return OUString("com.sun.star.comp.Draw.framework.module.ModuleController"); } -Sequence<rtl::OUString> SAL_CALL ModuleController_getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void) throw (RuntimeException) { - static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ModuleController"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.drawing.framework.ModuleController"); + return Sequence<OUString>(&sServiceName, 1); } @@ -149,7 +148,7 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont Reference<container::XNameAccess> xFactories ( aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/ResourceFactories"), UNO_QUERY); - ::std::vector<rtl::OUString> aProperties (snFactoryPropertyCount); + ::std::vector<OUString> aProperties (snFactoryPropertyCount); aProperties[0] = "ServiceName"; aProperties[1] = "ResourceList"; ConfigurationAccess::ForAll( @@ -171,12 +170,12 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) OSL_ASSERT(rValues.size() == snFactoryPropertyCount); // Get the service name of the factory. - rtl::OUString sServiceName; + OUString sServiceName; rValues[0] >>= sServiceName; // Get all resource URLs that are created by the factory. Reference<container::XNameAccess> xResources (rValues[1], UNO_QUERY); - ::std::vector<rtl::OUString> aURLs; + ::std::vector<OUString> aURLs; tools::ConfigurationAccess::FillList( xResources, "URL", @@ -186,7 +185,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8).getStr()); // Add the resource URLs to the map. - ::std::vector<rtl::OUString>::const_iterator iResource; + ::std::vector<OUString>::const_iterator iResource; for (iResource=aURLs.begin(); iResource!=aURLs.end(); ++iResource) { (*mpResourceToFactoryMap)[*iResource] = sServiceName; @@ -208,7 +207,7 @@ void ModuleController::InstantiateStartupServices (void) Reference<container::XNameAccess> xFactories ( aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/StartupServices"), UNO_QUERY); - ::std::vector<rtl::OUString> aProperties (snStartupPropertyCount); + ::std::vector<OUString> aProperties (snStartupPropertyCount); aProperties[0] = "ServiceName"; tools::ConfigurationAccess::ForAll( xFactories, @@ -231,7 +230,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) try { // Get the service name of the startup service. - rtl::OUString sServiceName; + OUString sServiceName; rValues[0] >>= sServiceName; // Instantiate service. diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index c0b07c71bfeb..352ea00ff208 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 71e440840899..67979a8e1ab6 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -59,8 +59,8 @@ public: /** Remember the given URL as one of a center pane view for which to activate the resource managed by the called object. */ - void AddActiveMainView (const ::rtl::OUString& rsMainViewURL); - sal_Bool IsResourceActive (const ::rtl::OUString& rsMainViewURL); + void AddActiveMainView (const OUString& rsMainViewURL); + sal_Bool IsResourceActive (const OUString& rsMainViewURL); virtual void SaveResourceState (void); virtual void SAL_CALL disposing (void); @@ -91,10 +91,10 @@ private: /// The anchor of the main view. css::uno::Reference<css::drawing::framework::XResourceId> mxMainViewAnchorId; - ::rtl::OUString msCurrentMainViewURL; + OUString msCurrentMainViewURL; void HandleMainViewSwitch ( - const ::rtl::OUString& rsViewURL, + const OUString& rsViewURL, const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration, const bool bIsActivated); diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index f0a8ad973423..6d56720d39d0 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 7852136b537d..412a7c608e48 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index 64897c09d5c9..ce4c41eb83bd 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -36,7 +36,7 @@ class SlideSorterModule public: SlideSorterModule ( const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::OUString& rsLeftPaneURL); + const OUString& rsLeftPaneURL); virtual ~SlideSorterModule (void); virtual void SaveResourceState (void); diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index 5d15204d5b50..c731435182cb 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 880a49d2ffe7..aa2c9e8a9e24 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index d02404fa9a14..ce28ef826330 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -35,7 +35,7 @@ class ToolPanelModule public: ToolPanelModule ( const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::OUString& rsRightPaneURL); + const OUString& rsRightPaneURL); virtual ~ToolPanelModule (void); virtual void SaveResourceState (void); diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index cee1e8a1fe3a..e490cdbfcd44 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::sd::framework::FrameworkHelper; namespace { diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 97c0ba9440dd..fb7fa1a2a328 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { @@ -193,12 +192,12 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa // Task panel URLs. -const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); -const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages"); -const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts"); -const ::rtl::OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign"); -const ::rtl::OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations"); -const ::rtl::OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions"); +const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); +const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages"); +const OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts"); +const OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign"); +const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations"); +const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions"); // Event URLs. @@ -262,9 +261,9 @@ namespace */ class FrameworkHelper::ViewURLMap : public ::boost::unordered_map< - rtl::OUString, + OUString, ViewShell::ShellType, - ::rtl::OUStringHash, + OUStringHash, ::comphelper::UStringEqual> { public: @@ -571,7 +570,7 @@ void FrameworkHelper::RequestTaskPanel ( -ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) +ViewShell::ShellType FrameworkHelper::GetViewId (const OUString& rsViewURL) { if (mpViewURLMap->empty()) { @@ -594,7 +593,7 @@ ViewShell::ShellType FrameworkHelper::GetViewId (const rtl::OUString& rsViewURL) -::rtl::OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) +OUString FrameworkHelper::GetViewURL (ViewShell::ShellType eType) { switch (eType) { @@ -656,7 +655,7 @@ void FrameworkHelper::HandleModeChangeSlot ( Reference<XView> xView (GetView(xPaneId)); ::boost::shared_ptr<ViewShell> pCenterViewShell (GetViewShell(xView)); - ::rtl::OUString sRequestedView; + OUString sRequestedView; if (bIsActive) { switch (nSlotId) @@ -721,7 +720,7 @@ void FrameworkHelper::HandleModeChangeSlot ( void FrameworkHelper::RunOnConfigurationEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const Callback& rCallback) { RunOnEvent( @@ -814,7 +813,7 @@ void FrameworkHelper::WaitForUpdate (void) const void FrameworkHelper::RunOnEvent( - const ::rtl::OUString& rsEventType, + const OUString& rsEventType, const ConfigurationChangeEventFilter& rFilter, const Callback& rCallback) const { @@ -878,7 +877,7 @@ OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxRe -Reference<XResourceId> FrameworkHelper::CreateResourceId (const ::rtl::OUString& rsResourceURL) +Reference<XResourceId> FrameworkHelper::CreateResourceId (const OUString& rsResourceURL) { return new ::sd::framework::ResourceId(rsResourceURL); } @@ -911,7 +910,7 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId ( Reference<XResourceId> FrameworkHelper::CreateResourceId ( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const Reference<XResourceId>& rxAnchorId) { if (rxAnchorId.is()) |