More RTL_CONSTASCII_USTRINGPARAM removals

8 files changed, 21 insertions, 37 deletions

diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 0e01cc916438..a892f651776c 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -86,8 +86,7 @@ Reference<XInterface> SAL_CALL Configuration_createInstance (
 
 OUString Configuration_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.Draw.framework.configuration.Configuration"));
+    return OUString("com.sun.star.comp.Draw.framework.configuration.Configuration");
 }
 
 
@@ -96,8 +95,7 @@ OUString Configuration_getImplementationName (void) throw(RuntimeException)
 Sequence<rtl::OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
-    static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.drawing.framework.Configuration")));
+    static const OUString sServiceName("com.sun.star.drawing.framework.Configuration");
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -289,8 +287,8 @@ OUString SAL_CALL Configuration::getName (void)
     OUString aString;
 
     if (rBHelper.bDisposed || rBHelper.bInDispose)
-        aString += OUString(RTL_CONSTASCII_USTRINGPARAM("DISPOSED "));
-    aString += OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration["));
+        aString += "DISPOSED ";
+    aString += "Configuration[";
 
     ResourceContainer::const_iterator iResource;
     for (iResource=mpResourceContainer->begin();
@@ -298,10 +296,10 @@ OUString SAL_CALL Configuration::getName (void)
          ++iResource)
     {
         if (iResource != mpResourceContainer->begin())
-            aString += OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
+            aString += ", ";
         aString += FrameworkHelper::ResourceIdToString(*iResource);
     }
-    aString += OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
+    aString += "]";
 
     return aString;
 }
@@ -355,9 +353,7 @@ void Configuration::ThrowIfDisposed (void) const
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
-        throw lang::DisposedException (
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "Configuration object has already been disposed")),
+        throw lang::DisposedException ("Configuration object has already been disposed",
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
     }
 }
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 5bfec329d329..0f49baee6bb9 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -66,8 +66,7 @@ Reference<XInterface> SAL_CALL ConfigurationController_createInstance (
 
 OUString ConfigurationController_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.Draw.framework.configuration.ConfigurationController"));
+    return OUString("com.sun.star.comp.Draw.framework.configuration.ConfigurationController");
 }
 
 
@@ -76,8 +75,7 @@ OUString ConfigurationController_getImplementationName (void) throw(RuntimeExcep
 Sequence<rtl::OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
-    static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.drawing.framework.ConfigurationController")));
+    static const OUString sServiceName("com.sun.star.drawing.framework.ConfigurationController");
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -656,18 +654,14 @@ void ConfigurationController::ThrowIfDisposed (void) const
 {
     if (mbIsDisposed)
     {
-        throw lang::DisposedException (
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "ConfigurationController object has already been disposed")),
+        throw lang::DisposedException ("ConfigurationController object has already been disposed",
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
     }
 
     if (mpImplementation.get() == NULL)
     {
         OSL_ASSERT(mpImplementation.get() != NULL);
-        throw RuntimeException(
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "ConfigurationController not initialized")),
+        throw RuntimeException("ConfigurationController not initialized",
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
     }
 }
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index ec03006920b3..0c2796471771 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -56,8 +56,7 @@ void ConfigurationControllerBroadcaster::AddListener(
     const Any& rUserData)
 {
     if ( ! rxListener.is())
-        throw lang::IllegalArgumentException(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
+        throw lang::IllegalArgumentException("invalid listener",
             mxConfigurationController,
             0);
 
@@ -76,8 +75,7 @@ void ConfigurationControllerBroadcaster::RemoveListener(
     const Reference<XConfigurationChangeListener>& rxListener)
 {
     if ( ! rxListener.is())
-        throw lang::IllegalArgumentException(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
+        throw lang::IllegalArgumentException("invalid listener",
             mxConfigurationController,
             0);
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 32685cfc30ae..1700b95d55c2 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -68,7 +68,7 @@ void ConfigurationTracer::TraceBoundResources (
 {
     Sequence<Reference<XResourceId> > aResourceList (
         rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT));
-    const ::rtl::OUString sIndentation (RTL_CONSTASCII_USTRINGPARAM("    "));
+    const ::rtl::OUString sIndentation ("    ");
     for (sal_Int32 nIndex=0; nIndex<aResourceList.getLength(); ++nIndex)
     {
         ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL());
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 498f22b8d02c..01f60c59642e 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -85,8 +85,8 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
 OUString SAL_CALL GenericConfigurationChangeRequest::getName (void)
     throw (RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("GenericConfigurationChangeRequest "))
-        + (meMode==Activation ? OUString(RTL_CONSTASCII_USTRINGPARAM("activate ")) : OUString(RTL_CONSTASCII_USTRINGPARAM("deactivate ")))
+    return OUString("GenericConfigurationChangeRequest ")
+        + (meMode==Activation ? OUString("activate ") : OUString("deactivate "))
         + FrameworkHelper::ResourceIdToString(mxResourceId);
 }
 
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index f4c0965b5d6e..4f77bf2a7edd 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -54,8 +54,7 @@ ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManag
     Reference<lang::XMultiServiceFactory> xServiceManager (
         ::comphelper::getProcessServiceFactory());
     mxURLTransformer = Reference<util::XURLTransformer>(
-        xServiceManager->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+        xServiceManager->createInstance("com.sun.star.util.URLTransformer"),
         UNO_QUERY);
 }
 
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 83b531ef1f16..aece40c1d8a0 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -63,8 +63,7 @@ Reference<XInterface> SAL_CALL ResourceId_createInstance (
 
 ::rtl::OUString ResourceId_getImplementationName (void) throw(RuntimeException)
 {
-    return ::rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.ResourceId"));
+    return ::rtl::OUString("com.sun.star.comp.Draw.framework.ResourceId");
 }
 
 
@@ -73,8 +72,7 @@ Reference<XInterface> SAL_CALL ResourceId_createInstance (
 Sequence<rtl::OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
-    static const ::rtl::OUString sServiceName(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ResourceId")));
+    static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ResourceId");
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -602,8 +600,7 @@ void ResourceId::ParseResourceURL (void)
         Reference<lang::XMultiServiceFactory> xServiceManager (
             ::comphelper::getProcessServiceFactory());
         xURLTransformer = Reference<util::XURLTransformer>(
-            xServiceManager->createInstance(
-                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+            xServiceManager->createInstance("com.sun.star.util.URLTransformer"),
             UNO_QUERY);
         mxURLTransformerWeak = xURLTransformer;
         SdGlobalResourceContainer::Instance().AddResource(
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index 827b3d68b2d0..959bfa410bee 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -69,7 +69,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu
 OUString SAL_CALL UpdateRequest::getName (void)
     throw (RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateRequest"));
+    return OUString("UpdateRequest");
 }