[Libreoffice-commits] .: sd/source

[Olivier Hallot]

 sd/source/ui/tools/ConfigurationAccess.cxx |   16 +++++++---------
 sd/source/ui/tools/EventMultiplexer.cxx    |    3 +--
 sd/source/ui/tools/PropertySet.cxx         |    3 +--
 sd/source/ui/tools/SlotStateListener.cxx   |    6 ++----
 4 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 00e60cf7c9b1c9dcd0cee90bd67877b02be46c32
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date:   Sun Apr 8 16:23:02 2012 -0300

    More RTL_CONSTASCII_USTRINGPARAM removals

diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 60dd311..f56e7da 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -52,7 +52,7 @@ ConfigurationAccess::ConfigurationAccess (
     {
         Reference<lang::XMultiServiceFactory> xProvider (
             xFactory->createInstanceWithContext(
-                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")),
+                "com.sun.star.configuration.ConfigurationProvider",
                 rxContext),
             UNO_QUERY);
         if (xProvider.is())
@@ -70,7 +70,7 @@ ConfigurationAccess::ConfigurationAccess (
 {
     Reference<lang::XMultiServiceFactory> xProvider (
         ::comphelper::getProcessServiceFactory()->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
+            "com.sun.star.configuration.ConfigurationProvider"),
         UNO_QUERY);
     if (xProvider.is())
         Initialize(xProvider, rsRootName, eMode);
@@ -88,27 +88,25 @@ void ConfigurationAccess::Initialize (
     {
         Sequence<Any> aCreationArguments(3);
         aCreationArguments[0] = makeAny(beans::PropertyValue(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+            "nodepath",
             0,
             makeAny(rsRootName),
             beans::PropertyState_DIRECT_VALUE));
         aCreationArguments[1] = makeAny(beans::PropertyValue(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("depth")),
+            "depth",
             0,
             makeAny((sal_Int32)-1),
             beans::PropertyState_DIRECT_VALUE));
         aCreationArguments[2] = makeAny(beans::PropertyValue(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")),
+            "lazywrite",
             0,
             makeAny(true),
             beans::PropertyState_DIRECT_VALUE));
         OUString sAccessService;
         if (eMode == READ_ONLY)
-            sAccessService = OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.configuration.ConfigurationAccess"));
+            sAccessService = "com.sun.star.configuration.ConfigurationAccess";
         else
-            sAccessService = OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.configuration.ConfigurationUpdateAccess"));
+            sAccessService = "com.sun.star.configuration.ConfigurationUpdateAccess";
 
         mxRoot = rxProvider->createInstanceWithArguments(
             sAccessService,
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 10e48d9..447a348 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -710,8 +710,7 @@ void EventMultiplexer::Implementation::ThrowIfDisposed (void)
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
         throw lang::DisposedException (
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "SlideSorterController object has already been disposed")),
+            "SlideSorterController object has already been disposed",
             static_cast<uno::XWeak*>(this));
     }
 }
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index 62d2f66..5f0b3ba 100644
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -223,8 +223,7 @@ void PropertySet::ThrowIfDisposed (void)
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
         throw lang::DisposedException (
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "PropertySet object has already been disposed")),
+                "PropertySet object has already been disposed",
             static_cast<uno::XWeak*>(this));
     }
 }
diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx
index 2ae092f..5675674 100644
--- a/sd/source/ui/tools/SlotStateListener.cxx
+++ b/sd/source/ui/tools/SlotStateListener.cxx
@@ -133,7 +133,7 @@ util::URL SlotStateListener::MakeURL (const OUString& rSlotName) const
     if (xServiceManager.is())
     {
         uno::Reference<util::XURLTransformer> xTransformer(xServiceManager->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+            "com.sun.star.util.URLTransformer"),
             uno::UNO_QUERY);
         if (xTransformer.is())
             xTransformer->parseStrict(aURL);
@@ -209,9 +209,7 @@ void SlotStateListener::ThrowIfDisposed (void)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
-        throw lang::DisposedException (
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "SlideSorterController object has already been disposed")),
+        throw lang::DisposedException ("SlideSorterController object has already been disposed",
             static_cast<uno::XWeak*>(this));
     }
 }