summaryrefslogtreecommitdiff
path: root/sd/source/ui/framework/configuration/Configuration.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/framework/configuration/Configuration.cxx')
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx18
1 files changed, 7 insertions, 11 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)));
}
}