summaryrefslogtreecommitdiff
path: root/sd/source/ui/framework/configuration
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sd/source/ui/framework/configuration
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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/configuration')
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx2
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx7
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationClassifier.cxx1
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx7
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx3
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx8
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx1
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationTracer.cxx6
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx1
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx1
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx4
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.cxx1
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.hxx14
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx11
-rw-r--r--sd/source/ui/framework/configuration/UpdateRequest.cxx1
-rw-r--r--sd/source/ui/framework/configuration/UpdateRequest.hxx4
16 files changed, 31 insertions, 41 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);
};