summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2012-04-13 15:50:41 -0300
committerOlivier Hallot <olivier.hallot@alta.org.br>2012-04-13 20:47:56 -0300
commit5aa0bc7b9a830fe497c6e74b109bbb7af40141a6 (patch)
treecabe704af95f226871d8f33eabf6bb0bf6b55167
parent4b641686ebbb406868057ea11040caf107312717 (diff)
More RTL_CONSTASCII_USTRINGPARAM removals
-rw-r--r--sd/source/ui/framework/configuration/Configuration.cxx18
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationController.cxx14
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx6
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationTracer.cxx2
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx4
-rw-r--r--sd/source/ui/framework/configuration/ResourceFactoryManager.cxx3
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx9
-rw-r--r--sd/source/ui/framework/configuration/UpdateRequest.cxx2
-rw-r--r--sd/source/ui/framework/factories/BasicPaneFactory.cxx18
-rw-r--r--sd/source/ui/framework/factories/BasicToolBarFactory.cxx10
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx6
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx3
-rw-r--r--sd/source/ui/framework/factories/Pane.cxx4
-rw-r--r--sd/source/ui/framework/factories/PresentationFactory.cxx13
-rw-r--r--sd/source/ui/framework/factories/TaskPanelFactory.cxx6
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx24
-rw-r--r--sd/source/ui/framework/module/ReadOnlyModeObserver.cxx4
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx95
18 files changed, 83 insertions, 158 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");
}
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 2b6b9d67bd15..76e97a8ae6d0 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -107,8 +107,7 @@ Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance (
::rtl::OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.BasicPaneFactory"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory");
}
@@ -117,8 +116,7 @@ Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicPaneFactory")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -324,9 +322,7 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
{
// The requested pane can not be created by any of the factories
// managed by the called BasicPaneFactory object.
- throw lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicPaneFactory::createPane() called for unknown resource id")),
+ throw lang::IllegalArgumentException("BasicPaneFactory::createPane() called for unknown resource id",
NULL,
0);
}
@@ -383,9 +379,7 @@ void SAL_CALL BasicPaneFactory::releaseResource (
// The given XPane reference is either empty or the pane was not
// created by any of the factories managed by the called
// BasicPaneFactory object.
- throw lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicPaneFactory::releasePane() called for pane that that was not created by same factory.")),
+ throw lang::IllegalArgumentException("BasicPaneFactory::releasePane() called for pane that that was not created by same factory.",
NULL,
0);
}
@@ -524,9 +518,7 @@ void BasicPaneFactory::ThrowIfDisposed (void) const
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicPaneFactory object has already been disposed")),
+ throw lang::DisposedException ("BasicPaneFactory object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index d2721190331d..0b05ca453d40 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -55,8 +55,7 @@ Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance (
::rtl::OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.BasicToolBarFactory"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory");
}
@@ -65,8 +64,7 @@ Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicToolBarFactory")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -232,9 +230,7 @@ void BasicToolBarFactory::ThrowIfDisposed (void) const
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "BasicToolBarFactory object has already been disposed")),
+ throw lang::DisposedException ("BasicToolBarFactory object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 3159e6bcce66..9badf15dd459 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -76,8 +76,7 @@ Reference<XInterface> SAL_CALL BasicViewFactory_createInstance (
::rtl::OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.BasicViewFactory"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.BasicViewFactory");
}
@@ -86,8 +85,7 @@ Reference<XInterface> SAL_CALL BasicViewFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicViewFactory")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 90380019cf48..0c50698154df 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -252,8 +252,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void)
Reference<lang::XMultiServiceFactory> xFactory (
mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
return Reference<rendering::XCanvas>(
- xFactory->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.SpriteCanvas.VCL")),
+ xFactory->createInstanceWithArguments("com.sun.star.rendering.SpriteCanvas.VCL",
aArg),
UNO_QUERY);
}
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 449b3d68b2db..6ae18d03d0e6 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -247,9 +247,7 @@ void Pane::ThrowIfDisposed (void) const
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Pane object has already been disposed")),
+ throw lang::DisposedException ("Pane object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 3aef9f5962f7..48c98f263650 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -118,8 +118,7 @@ Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance (
::rtl::OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.Draw.framework.PresentationFactoryProvider"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider");
}
@@ -128,8 +127,7 @@ Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance (
Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.drawing.framework.PresentationFactoryProvider"));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -138,8 +136,7 @@ Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedService
//===== PresentationFactory ===================================================
-const ::rtl::OUString PresentationFactory::msPresentationViewURL(
- RTL_CONSTASCII_USTRINGPARAM("private:resource/view/Presentation"));
+const ::rtl::OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation");
PresentationFactory::PresentationFactory (
@@ -252,9 +249,7 @@ void PresentationFactory::ThrowIfDisposed (void) const
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "PresentationFactory object has already been disposed")),
+ throw lang::DisposedException ("PresentationFactory object has already been disposed",
const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
}
}
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 1c3c52e4e710..fe5cd6cde6cd 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -54,8 +54,7 @@ Reference<XInterface> SAL_CALL TaskPanelFactory_createInstance (
::rtl::OUString TaskPanelFactory_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.TaskPanelFactory"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.TaskPanelFactory");
}
@@ -64,8 +63,7 @@ Reference<XInterface> SAL_CALL TaskPanelFactory_createInstance (
Sequence<rtl::OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const OUString sServiceName(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.TaskPanelFactory"));
+ static const OUString sServiceName("com.sun.star.drawing.framework.TaskPanelFactory");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 98216e5a7a8e..e60f0745bd04 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -89,8 +89,7 @@ Reference<XInterface> SAL_CALL ModuleController_createInstance (
::rtl::OUString ModuleController_getImplementationName (void) throw(RuntimeException)
{
- return ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.framework.module.ModuleController"));
+ return ::rtl::OUString("com.sun.star.comp.Draw.framework.module.ModuleController");
}
@@ -99,8 +98,7 @@ Reference<XInterface> SAL_CALL ModuleController_createInstance (
Sequence<rtl::OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ModuleController"));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.ModuleController");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -155,15 +153,14 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont
{
ConfigurationAccess aConfiguration (
rxContext,
- OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/")),
+ "/org.openoffice.Office.Impress/",
ConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xFactories (
- aConfiguration.GetConfigurationNode(
- OUString(RTL_CONSTASCII_USTRINGPARAM("MultiPaneGUI/Framework/ResourceFactories"))),
+ aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/ResourceFactories"),
UNO_QUERY);
::std::vector<rtl::OUString> aProperties (snFactoryPropertyCount);
- aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceName"));
- aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceList"));
+ aProperties[0] = "ServiceName";
+ aProperties[1] = "ResourceList";
ConfigurationAccess::ForAll(
xFactories,
aProperties,
@@ -191,7 +188,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
::std::vector<rtl::OUString> aURLs;
tools::ConfigurationAccess::FillList(
xResources,
- OUString(RTL_CONSTASCII_USTRINGPARAM("URL")),
+ "URL",
aURLs);
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::adding factory " <<
@@ -215,14 +212,13 @@ void ModuleController::InstantiateStartupServices (void)
try
{
tools::ConfigurationAccess aConfiguration (
- OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/")),
+ "/org.openoffice.Office.Impress/",
tools::ConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xFactories (
- aConfiguration.GetConfigurationNode(
- OUString(RTL_CONSTASCII_USTRINGPARAM("MultiPaneGUI/Framework/StartupServices"))),
+ aConfiguration.GetConfigurationNode("MultiPaneGUI/Framework/StartupServices"),
UNO_QUERY);
::std::vector<rtl::OUString> aProperties (snStartupPropertyCount);
- aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceName"));
+ aProperties[0] = "ServiceName";
tools::ConfigurationAccess::ForAll(
xFactories,
aProperties,
diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
index 4d0f2c1b8614..1f5577cfb203 100644
--- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
+++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
@@ -65,13 +65,13 @@ ReadOnlyModeObserver::ReadOnlyModeObserver (
mpBroadcaster(new ModifyBroadcaster(maMutex))
{
// Create a URL object for the slot name.
- maSlotNameURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:EditDoc"));
+ maSlotNameURL.Complete = ".uno:EditDoc";
uno::Reference<lang::XMultiServiceFactory> xServiceManager (
::comphelper::getProcessServiceFactory());
if (xServiceManager.is())
{
Reference<util::XURLTransformer> xTransformer(xServiceManager->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+ "com.sun.star.util.URLTransformer"),
UNO_QUERY);
if (xTransformer.is())
xTransformer->parseStrict(maSlotNameURL);
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 92dc51acf824..a269dcd06ab6 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -174,85 +174,54 @@ namespace sd { namespace framework {
// Pane URLS.
-const OUString FrameworkHelper::msPaneURLPrefix(
- RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/"));
-const OUString FrameworkHelper::msCenterPaneURL(
- msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CenterPane")));
-const OUString FrameworkHelper::msFullScreenPaneURL(
- msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("FullScreenPane")));
-const OUString FrameworkHelper::msLeftImpressPaneURL(
- msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("LeftImpressPane")));
-const OUString FrameworkHelper::msLeftDrawPaneURL(
- msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("LeftDrawPane")));
-const OUString FrameworkHelper::msRightPaneURL(
- msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("RightPane")));
+const OUString FrameworkHelper::msPaneURLPrefix("private:resource/pane/");
+const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane");
+const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
+const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane");
+const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + "LeftDrawPane");
+const OUString FrameworkHelper::msRightPaneURL( msPaneURLPrefix + "RightPane");
// View URLs.
-const OUString FrameworkHelper::msViewURLPrefix(
- RTL_CONSTASCII_USTRINGPARAM("private:resource/view/"));
-const OUString FrameworkHelper::msImpressViewURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressView")));
-const OUString FrameworkHelper::msDrawViewURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicView")));
-const OUString FrameworkHelper::msOutlineViewURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("OutlineView")));
-const OUString FrameworkHelper::msNotesViewURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("NotesView")));
-const OUString FrameworkHelper::msHandoutViewURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("HandoutView")));
-const OUString FrameworkHelper::msSlideSorterURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorter")));
-const OUString FrameworkHelper::msPresentationViewURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationView")));
-const OUString FrameworkHelper::msTaskPaneURL(
- msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("TaskPane")));
+const OUString FrameworkHelper::msViewURLPrefix("private:resource/view/");
+const OUString FrameworkHelper::msImpressViewURL( msViewURLPrefix + "ImpressView");
+const OUString FrameworkHelper::msDrawViewURL( msViewURLPrefix + "GraphicView");
+const OUString FrameworkHelper::msOutlineViewURL( msViewURLPrefix + "OutlineView");
+const OUString FrameworkHelper::msNotesViewURL( msViewURLPrefix + "NotesView");
+const OUString FrameworkHelper::msHandoutViewURL( msViewURLPrefix + "HandoutView");
+const OUString FrameworkHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter");
+const OUString FrameworkHelper::msPresentationViewURL( msViewURLPrefix + "PresentationView");
+const OUString FrameworkHelper::msTaskPaneURL( msViewURLPrefix + "TaskPane");
// Tool bar URLs.
-const OUString FrameworkHelper::msToolBarURLPrefix(
- RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/"));
-const OUString FrameworkHelper::msViewTabBarURL(
- msToolBarURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("ViewTabBar")));
+const OUString FrameworkHelper::msToolBarURLPrefix("private:resource/toolbar/");
+const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBar");
// Task panel URLs.
-const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix(
- RTL_CONSTASCII_USTRINGPARAM("private:resource/toolpanel/DrawingFramework/"));
-const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL(
- msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("MasterPages")));
-const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL(
- msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("Layouts")));
-const ::rtl::OUString FrameworkHelper::msTableDesignPanelURL(
- msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("TableDesign")));
-const ::rtl::OUString FrameworkHelper::msCustomAnimationTaskPanelURL(
- msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CustomAnimations")));
-const ::rtl::OUString FrameworkHelper::msSlideTransitionTaskPanelURL(
- msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideTransitions")));
+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");
// Event URLs.
-const OUString FrameworkHelper::msResourceActivationRequestEvent(
- RTL_CONSTASCII_USTRINGPARAM("ResourceActivationRequested"));
-const OUString FrameworkHelper::msResourceDeactivationRequestEvent(
- RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivationRequest"));
-const OUString FrameworkHelper::msResourceActivationEvent(
- RTL_CONSTASCII_USTRINGPARAM("ResourceActivation"));
-const OUString FrameworkHelper::msResourceDeactivationEvent(
- RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivation"));
-const OUString FrameworkHelper::msConfigurationUpdateStartEvent(
- RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateStart"));
-const OUString FrameworkHelper::msConfigurationUpdateEndEvent(
- RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd"));
+const OUString FrameworkHelper::msResourceActivationRequestEvent("ResourceActivationRequested");
+const OUString FrameworkHelper::msResourceDeactivationRequestEvent("ResourceDeactivationRequest");
+const OUString FrameworkHelper::msResourceActivationEvent("ResourceActivation");
+const OUString FrameworkHelper::msResourceDeactivationEvent("ResourceDeactivation");
+const OUString FrameworkHelper::msConfigurationUpdateStartEvent("ConfigurationUpdateStart");
+const OUString FrameworkHelper::msConfigurationUpdateEndEvent("ConfigurationUpdateEnd");
// Service names of controllers.
-const OUString FrameworkHelper::msModuleControllerService(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ModuleController"));
-const OUString FrameworkHelper::msConfigurationControllerService(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ConfigurationController"));
+const OUString FrameworkHelper::msModuleControllerService("com.sun.star.drawing.framework.ModuleController");
+const OUString FrameworkHelper::msConfigurationControllerService("com.sun.star.drawing.framework.ConfigurationController");
//----- helper ----------------------------------------------------------------
namespace
@@ -907,7 +876,7 @@ OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxRe
Sequence<OUString> aAnchorURLs (rxResourceId->getAnchorURLs());
for (sal_Int32 nIndex=0; nIndex < aAnchorURLs.getLength(); ++nIndex)
{
- sString += OUString(RTL_CONSTASCII_USTRINGPARAM(" | "));
+ sString += " | ";
sString += aAnchorURLs[nIndex];
}
}