[Libreoffice-commits] .: sd/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 2 14:10:31 PDT 2010
sd/source/ui/dlg/PaneShells.cxx | 6
sd/source/ui/dlg/TemplateScanner.cxx | 22 +--
sd/source/ui/dlg/sdabstdlg.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/framework/configuration/Configuration.cxx | 12 -
sd/source/ui/framework/configuration/ConfigurationController.cxx | 4
sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx | 4
sd/source/ui/framework/configuration/ConfigurationTracer.cxx | 2
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx | 4
sd/source/ui/framework/configuration/ResourceId.cxx | 2
sd/source/ui/framework/configuration/UpdateRequest.cxx | 2
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 10 -
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 2
sd/source/ui/framework/factories/BasicViewFactory.cxx | 2
sd/source/ui/framework/factories/FullScreenPane.cxx | 2
sd/source/ui/framework/factories/PresentationFactory.cxx | 2
sd/source/ui/framework/factories/TaskPanelFactory.cxx | 2
sd/source/ui/framework/module/ModuleController.cxx | 18 +-
sd/source/ui/framework/module/ReadOnlyModeObserver.cxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 64 +++++-----
sd/source/ui/func/fuhhconv.cxx | 4
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/presenter/PresenterCanvas.cxx | 12 -
sd/source/ui/presenter/PresenterCanvasFactory.cxx | 2
sd/source/ui/presenter/PresenterHelper.cxx | 8 -
sd/source/ui/presenter/PresenterPreviewCache.cxx | 4
sd/source/ui/presenter/PresenterTextView.cxx | 24 +--
sd/source/ui/presenter/SlideRenderer.cxx | 10 -
sd/source/ui/slideshow/slideshowimpl.cxx | 8 -
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 2
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 6
sd/source/ui/toolpanel/LayoutMenu.cxx | 2
sd/source/ui/toolpanel/ScrollPanel.cxx | 6
sd/source/ui/toolpanel/SubToolPanel.cxx | 8 -
sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx | 12 -
sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx | 6
sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx | 10 -
sd/source/ui/tools/ConfigurationAccess.cxx | 4
sd/source/ui/unoidl/DrawController.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 12 -
sd/source/ui/view/PresentationViewShellBase.cxx | 4
sd/source/ui/view/UpdateLockManager.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 2
sd/source/ui/view/drviewsa.cxx | 4
sd/source/ui/view/drviewsb.cxx | 2
47 files changed, 165 insertions(+), 165 deletions(-)
New commits:
commit 1f49e35e5036c9527dd7f398988932d39c88af4d
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Tue Nov 2 21:09:45 2010 +0000
RTL_CONSTASCII_USTRINGPARAM macro
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 1b6ae4f..7b43450 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -61,7 +61,7 @@ TYPEINIT1(LeftImpressPaneShell, SfxShell);
LeftImpressPaneShell::LeftImpressPaneShell (void)
: SfxShell()
{
- SetName(rtl::OUString::createFromAscii("LeftImpressPane"));
+ SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftImpressPane")));
}
@@ -97,7 +97,7 @@ TYPEINIT1(LeftDrawPaneShell, SfxShell);
LeftDrawPaneShell::LeftDrawPaneShell (void)
: SfxShell()
{
- SetName(rtl::OUString::createFromAscii("LeftDrawPane"));
+ SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftDrawPane")));
}
@@ -130,7 +130,7 @@ TYPEINIT1( ToolPanelPaneShell, SfxShell );
ToolPanelPaneShell::ToolPanelPaneShell()
:SfxShell()
{
- SetName( ::rtl::OUString::createFromAscii( "ToolPanel" ) );
+ SetName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ToolPanel" )) );
}
ToolPanelPaneShell::~ToolPanelPaneShell(void)
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index b234c39..3443fcf 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -51,19 +51,19 @@ using namespace ::com::sun::star::uno;
namespace {
-const ::rtl::OUString TITLE = ::rtl::OUString::createFromAscii ("Title");
-const ::rtl::OUString TARGET_DIR_URL = ::rtl::OUString::createFromAscii ("TargetDirURL");
-const ::rtl::OUString DESCRIPTION = ::rtl::OUString::createFromAscii ("TypeDescription");
-const ::rtl::OUString TARGET_URL = ::rtl::OUString::createFromAscii ("TargetURL");
+const ::rtl::OUString TITLE(RTL_CONSTASCII_USTRINGPARAM ("Title"));
+const ::rtl::OUString TARGET_DIR_URL(RTL_CONSTASCII_USTRINGPARAM ("TargetDirURL"));
+const ::rtl::OUString DESCRIPTION(RTL_CONSTASCII_USTRINGPARAM ("TypeDescription"));
+const ::rtl::OUString TARGET_URL(RTL_CONSTASCII_USTRINGPARAM ("TargetURL"));
-const ::rtl::OUString DOCTEMPLATES = ::rtl::OUString::createFromAscii ("com.sun.star.frame.DocumentTemplates");
+const ::rtl::OUString DOCTEMPLATES(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.DocumentTemplates"));
// These strings are used to find impress templates in the tree of
// template files. Should probably be determined dynamically.
-const ::rtl::OUString IMPRESS_BIN_TEMPLATE = ::rtl::OUString::createFromAscii ("application/vnd.stardivision.impress");
+const ::rtl::OUString IMPRESS_BIN_TEMPLATE(RTL_CONSTASCII_USTRINGPARAM ("application/vnd.stardivision.impress"));
const ::rtl::OUString IMPRESS_XML_TEMPLATE = MIMETYPE_VND_SUN_XML_IMPRESS;
// The following id comes from the bugdoc in #i2764#.
-const ::rtl::OUString IMPRESS_XML_TEMPLATE_B = ::rtl::OUString::createFromAscii ("Impress 2.0");
+const ::rtl::OUString IMPRESS_XML_TEMPLATE_B(RTL_CONSTASCII_USTRINGPARAM ("Impress 2.0"));
const ::rtl::OUString IMPRESS_XML_TEMPLATE_OASIS = MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION;
@@ -104,19 +104,19 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL)
if (rsURL.getLength() == 0)
nPriority = 100;
- else if (rsURL.indexOf(::rtl::OUString::createFromAscii("presnt"))>=0)
+ else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("presnt")))>=0)
{
nPriority = 30;
}
- else if (rsURL.indexOf(::rtl::OUString::createFromAscii("layout"))>=0)
+ else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("layout")))>=0)
{
nPriority = 20;
}
- else if (rsURL.indexOf(::rtl::OUString::createFromAscii("educate"))>=0)
+ else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("educate")))>=0)
{
nPriority = 40;
}
- else if (rsURL.indexOf(::rtl::OUString::createFromAscii("finance"))>=0)
+ else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("finance")))>=0)
{
nPriority = 40;
}
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 486f707..93f2b60 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -45,7 +45,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
static ::osl::Module aDialogLibrary;
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
- aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
+ aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
if ( fp )
return fp();
return 0;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 8a2fc79..3772a4f 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -227,9 +227,9 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void)
{
if (mnListBoxDropFormatId == SAL_MAX_UINT32)
mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(
- ::rtl::OUString::createFromAscii(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"application/x-openoffice-treelistbox-moveonly;"
- "windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\""));
+ "windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\"")));
return mnListBoxDropFormatId;
}
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 5930d12..4efd283 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -805,7 +805,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void)
break;
Reference<frame::XDesktop> xDesktop (xFactory->createInstance (
- ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY);
if ( ! xDesktop.is())
break;
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 412a91f..e7f14be 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -99,8 +99,8 @@ OUString Configuration_getImplementationName (void) throw(RuntimeException)
Sequence<rtl::OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const OUString sServiceName(OUString::createFromAscii(
- "com.sun.star.drawing.framework.Configuration"));
+ static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.drawing.framework.Configuration")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -296,8 +296,8 @@ OUString SAL_CALL Configuration::getName (void)
OUString aString;
if (rBHelper.bDisposed || rBHelper.bInDispose)
- aString += OUString::createFromAscii("DISPOSED ");
- aString += OUString::createFromAscii("Configuration[");
+ aString += OUString(RTL_CONSTASCII_USTRINGPARAM("DISPOSED "));
+ aString += OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration["));
ResourceContainer::const_iterator iResource;
for (iResource=mpResourceContainer->begin();
@@ -305,10 +305,10 @@ OUString SAL_CALL Configuration::getName (void)
++iResource)
{
if (iResource != mpResourceContainer->begin())
- aString += OUString::createFromAscii(", ");
+ aString += OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
aString += FrameworkHelper::ResourceIdToString(*iResource);
}
- aString += OUString::createFromAscii("]");
+ aString += OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
return aString;
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index f3f4ab4..a4f8b7b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -84,8 +84,8 @@ OUString ConfigurationController_getImplementationName (void) throw(RuntimeExcep
Sequence<rtl::OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const OUString sServiceName(OUString::createFromAscii(
- "com.sun.star.drawing.framework.ConfigurationController"));
+ static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.drawing.framework.ConfigurationController")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index dcd4b32..3f339e3 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -58,7 +58,7 @@ void ConfigurationControllerBroadcaster::AddListener(
{
if ( ! rxListener.is())
throw lang::IllegalArgumentException(
- OUString::createFromAscii("invalid listener"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
mxConfigurationController,
0);
@@ -78,7 +78,7 @@ void ConfigurationControllerBroadcaster::RemoveListener(
{
if ( ! rxListener.is())
throw lang::IllegalArgumentException(
- OUString::createFromAscii("invalid listener"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
mxConfigurationController,
0);
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 2665a78..3cba145 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -69,7 +69,7 @@ void ConfigurationTracer::TraceBoundResources (
{
Sequence<Reference<XResourceId> > aResourceList (
rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT));
- const ::rtl::OUString sIndentation (::rtl::OUString::createFromAscii(" "));
+ const ::rtl::OUString sIndentation (RTL_CONSTASCII_USTRINGPARAM(" "));
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 ed1a798..c1a1b8f 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -86,8 +86,8 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
OUString SAL_CALL GenericConfigurationChangeRequest::getName (void)
throw (RuntimeException)
{
- return OUString::createFromAscii("GenericConfigurationChangeRequest ")
- + OUString::createFromAscii(meMode==Activation ? "activate " : "deactivate ")
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("GenericConfigurationChangeRequest "))
+ + (meMode==Activation ? OUString(RTL_CONSTASCII_USTRINGPARAM("activate ")) : OUString(RTL_CONSTASCII_USTRINGPARAM("deactivate ")))
+ FrameworkHelper::ResourceIdToString(mxResourceId);
}
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index befd9c9..e1f23b8 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -75,7 +75,7 @@ Sequence<rtl::OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.ResourceId"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ResourceId")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index 9918f4a..6b7cab8 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -70,7 +70,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu
OUString SAL_CALL UpdateRequest::getName (void)
throw (RuntimeException)
{
- return OUString::createFromAscii("UpdateRequest");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateRequest"));
}
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 98c1434..f6f6912 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -119,7 +119,7 @@ Sequence<rtl::OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.BasicPaneFactory"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicPaneFactory")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -329,8 +329,8 @@ 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::createFromAscii(
- "BasicPaneFactory::createPane() called for unknown resource id"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "BasicPaneFactory::createPane() called for unknown resource id")),
NULL,
0);
}
@@ -388,8 +388,8 @@ void SAL_CALL BasicPaneFactory::releaseResource (
// created by any of the factories managed by the called
// BasicPaneFactory object.
throw lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii(
- "BasicPaneFactory::releasePane() called for pane that that was not created by same factory."),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "BasicPaneFactory::releasePane() called for pane that that was not created by same factory.")),
NULL,
0);
}
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 8a5b97b..01b1761 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -67,7 +67,7 @@ Sequence<rtl::OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (v
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.BasicToolBarFactory"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicToolBarFactory")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 4e7a33a..e60b805 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -88,7 +88,7 @@ Sequence<rtl::OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.BasicViewFactory"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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 1dd6a8b..ff69f6e 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -255,7 +255,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void)
mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
return Reference<rendering::XCanvas>(
xFactory->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.rendering.SpriteCanvas.VCL"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.SpriteCanvas.VCL")),
aArg),
UNO_QUERY);
}
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 2992903..9c3402b 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -140,7 +140,7 @@ Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedService
//===== PresentationFactory ===================================================
const ::rtl::OUString PresentationFactory::msPresentationViewURL(
- OUString::createFromAscii("private:resource/view/Presentation"));
+ RTL_CONSTASCII_USTRINGPARAM("private:resource/view/Presentation"));
PresentationFactory::PresentationFactory (
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 4717097..1830612 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -66,7 +66,7 @@ Sequence<rtl::OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void
throw (RuntimeException)
{
static const OUString sServiceName(
- OUString::createFromAscii("com.sun.star.drawing.framework.TaskPanelFactory"));
+ RTL_CONSTASCII_USTRINGPARAM("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 2d0e8c7..c3870be 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -104,7 +104,7 @@ Sequence<rtl::OUString> SAL_CALL ModuleController_getSupportedServiceNames (void
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.ModuleController"));
+ RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ModuleController"));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -155,15 +155,15 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont
{
ConfigurationAccess aConfiguration (
rxContext,
- OUString::createFromAscii("/org.openoffice.Office.Impress/"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/")),
ConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xFactories (
aConfiguration.GetConfigurationNode(
- OUString::createFromAscii("MultiPaneGUI/Framework/ResourceFactories")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("MultiPaneGUI/Framework/ResourceFactories"))),
UNO_QUERY);
::std::vector<rtl::OUString> aProperties (snFactoryPropertyCount);
- aProperties[0] = OUString::createFromAscii("ServiceName");
- aProperties[1] = OUString::createFromAscii("ResourceList");
+ aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceName"));
+ aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceList"));
ConfigurationAccess::ForAll(
xFactories,
aProperties,
@@ -191,7 +191,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
::std::vector<rtl::OUString> aURLs;
tools::ConfigurationAccess::FillList(
xResources,
- OUString::createFromAscii("URL"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("URL")),
aURLs);
#if defined VERBOSE && VERBOSE>0
@@ -219,14 +219,14 @@ void ModuleController::InstantiateStartupServices (void)
try
{
tools::ConfigurationAccess aConfiguration (
- OUString::createFromAscii("/org.openoffice.Office.Impress/"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/")),
tools::ConfigurationAccess::READ_ONLY);
Reference<container::XNameAccess> xFactories (
aConfiguration.GetConfigurationNode(
- OUString::createFromAscii("MultiPaneGUI/Framework/StartupServices")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("MultiPaneGUI/Framework/StartupServices"))),
UNO_QUERY);
::std::vector<rtl::OUString> aProperties (snStartupPropertyCount);
- aProperties[0] = OUString::createFromAscii("ServiceName");
+ aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("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 6f8857b..3d827f4 100644
--- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
+++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
@@ -66,7 +66,7 @@ ReadOnlyModeObserver::ReadOnlyModeObserver (
mpBroadcaster(new ModifyBroadcaster(maMutex))
{
// Create a URL object for the slot name.
- maSlotNameURL.Complete = OUString::createFromAscii(".uno:EditDoc");
+ maSlotNameURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:EditDoc"));
uno::Reference<lang::XMultiServiceFactory> xServiceManager (
::comphelper::getProcessServiceFactory());
if (xServiceManager.is())
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index aa5e431..b64f47e 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -175,84 +175,84 @@ namespace sd { namespace framework {
// Pane URLS.
const OUString FrameworkHelper::msPaneURLPrefix(
- OUString::createFromAscii("private:resource/pane/"));
+ RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/"));
const OUString FrameworkHelper::msCenterPaneURL(
- msPaneURLPrefix + OUString::createFromAscii("CenterPane"));
+ msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CenterPane")));
const OUString FrameworkHelper::msFullScreenPaneURL(
- msPaneURLPrefix + OUString::createFromAscii("FullScreenPane"));
+ msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("FullScreenPane")));
const OUString FrameworkHelper::msLeftImpressPaneURL(
- msPaneURLPrefix + OUString::createFromAscii("LeftImpressPane"));
+ msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("LeftImpressPane")));
const OUString FrameworkHelper::msLeftDrawPaneURL(
- msPaneURLPrefix + OUString::createFromAscii("LeftDrawPane"));
+ msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("LeftDrawPane")));
const OUString FrameworkHelper::msRightPaneURL(
- msPaneURLPrefix + OUString::createFromAscii("RightPane"));
+ msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("RightPane")));
// View URLs.
const OUString FrameworkHelper::msViewURLPrefix(
- OUString::createFromAscii("private:resource/view/"));
+ RTL_CONSTASCII_USTRINGPARAM("private:resource/view/"));
const OUString FrameworkHelper::msImpressViewURL(
- msViewURLPrefix + OUString::createFromAscii("ImpressView"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressView")));
const OUString FrameworkHelper::msDrawViewURL(
- msViewURLPrefix + OUString::createFromAscii("GraphicView"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicView")));
const OUString FrameworkHelper::msOutlineViewURL(
- msViewURLPrefix + OUString::createFromAscii("OutlineView"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("OutlineView")));
const OUString FrameworkHelper::msNotesViewURL(
- msViewURLPrefix + OUString::createFromAscii("NotesView"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("NotesView")));
const OUString FrameworkHelper::msHandoutViewURL(
- msViewURLPrefix + OUString::createFromAscii("HandoutView"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("HandoutView")));
const OUString FrameworkHelper::msSlideSorterURL(
- msViewURLPrefix + OUString::createFromAscii("SlideSorter"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorter")));
const OUString FrameworkHelper::msPresentationViewURL(
- msViewURLPrefix + OUString::createFromAscii("PresentationView"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationView")));
const OUString FrameworkHelper::msTaskPaneURL(
- msViewURLPrefix + OUString::createFromAscii("TaskPane"));
+ msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("TaskPane")));
// Tool bar URLs.
const OUString FrameworkHelper::msToolBarURLPrefix(
- OUString::createFromAscii("private:resource/toolbar/"));
+ RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/"));
const OUString FrameworkHelper::msViewTabBarURL(
- msToolBarURLPrefix + OUString::createFromAscii("ViewTabBar"));
+ msToolBarURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("ViewTabBar")));
// Task panel URLs.
const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix(
- OUString::createFromAscii("private:resource/toolpanel/DrawingFramework/"));
+ RTL_CONSTASCII_USTRINGPARAM("private:resource/toolpanel/DrawingFramework/"));
const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL(
- msTaskPanelURLPrefix + OUString::createFromAscii("MasterPages"));
+ msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("MasterPages")));
const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL(
- msTaskPanelURLPrefix + OUString::createFromAscii("Layouts"));
+ msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("Layouts")));
const ::rtl::OUString FrameworkHelper::msTableDesignPanelURL(
- msTaskPanelURLPrefix + OUString::createFromAscii("TableDesign"));
+ msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("TableDesign")));
const ::rtl::OUString FrameworkHelper::msCustomAnimationTaskPanelURL(
- msTaskPanelURLPrefix + OUString::createFromAscii("CustomAnimations"));
+ msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CustomAnimations")));
const ::rtl::OUString FrameworkHelper::msSlideTransitionTaskPanelURL(
- msTaskPanelURLPrefix + OUString::createFromAscii("SlideTransitions"));
+ msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideTransitions")));
// Event URLs.
const OUString FrameworkHelper::msResourceActivationRequestEvent(
- OUString::createFromAscii("ResourceActivationRequested"));
+ RTL_CONSTASCII_USTRINGPARAM("ResourceActivationRequested"));
const OUString FrameworkHelper::msResourceDeactivationRequestEvent(
- OUString::createFromAscii("ResourceDeactivationRequest"));
+ RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivationRequest"));
const OUString FrameworkHelper::msResourceActivationEvent(
- OUString::createFromAscii("ResourceActivation"));
+ RTL_CONSTASCII_USTRINGPARAM("ResourceActivation"));
const OUString FrameworkHelper::msResourceDeactivationEvent(
- OUString::createFromAscii("ResourceDeactivation"));
+ RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivation"));
const OUString FrameworkHelper::msConfigurationUpdateStartEvent(
- OUString::createFromAscii("ConfigurationUpdateStart"));
+ RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateStart"));
const OUString FrameworkHelper::msConfigurationUpdateEndEvent(
- OUString::createFromAscii("ConfigurationUpdateEnd"));
+ RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd"));
// Service names of controllers.
const OUString FrameworkHelper::msModuleControllerService(
- OUString::createFromAscii("com.sun.star.drawing.framework.ModuleController"));
+ RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ModuleController"));
const OUString FrameworkHelper::msConfigurationControllerService(
- OUString::createFromAscii("com.sun.star.drawing.framework.ConfigurationController"));
+ RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ConfigurationController"));
//----- helper ----------------------------------------------------------------
namespace
@@ -892,7 +892,7 @@ OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxRe
Sequence<OUString> aAnchorURLs (rxResourceId->getAnchorURLs());
for (sal_Int32 nIndex=0; nIndex<aAnchorURLs.getLength(); ++nIndex)
{
- sString += OUString::createFromAscii(" | ");
+ sString += OUString(RTL_CONSTASCII_USTRINGPARAM(" | "));
sString += aAnchorURLs[nIndex];
}
}
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 39c202f..05f9e33 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -230,7 +230,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString::createFromAscii("com.sun.star.linguistic2.ChineseTranslationDialog")
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog"))
, xContext), UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
@@ -240,7 +240,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
PropertyValue aParam;
- aParam.Name = rtl::OUString::createFromAscii("ParentWindow");
+ aParam.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
aParam.Value <<= makeAny(xDialogParentWindow);
pArray[0] <<= makeAny(aParam);
xInit->initialize( aSeq );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 743bf75..6ef693e 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -508,7 +508,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
uno::Reference < beans::XPropertySet > xSet( xSup->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginURL"),
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")),
uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
}
}
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 35ffa85..e9c28ba 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -162,7 +162,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
Reference< XPropertySet > xInfo( xStyles->getByName( pNameItem->GetValue() ), UNO_QUERY_THROW );
OUString aUIName;
- xInfo->getPropertyValue( ::rtl::OUString::createFromAscii("DisplayName") ) >>= aUIName;
+ xInfo->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")) ) >>= aUIName;
if ( aUIName.getLength() )
rReq.AppendItem( SfxStringItem( nSId, aUIName ) );
}
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 7c11766..ea3e412 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -64,7 +64,7 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
::rtl::OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException)
{
- return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterCanvasFactory");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterCanvasFactory"));
}
@@ -74,7 +74,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.rendering.Canvas"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.Canvas")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -233,7 +233,7 @@ void SAL_CALL PresenterCanvas::initialize (
if ( ! (rArguments[2] >>= mxSharedWindow))
{
throw lang::IllegalArgumentException(
- OUString::createFromAscii("PresenterCanvas: invalid shared window"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared window")),
static_cast<XWeak*>(this),
1);
}
@@ -241,7 +241,7 @@ void SAL_CALL PresenterCanvas::initialize (
if ( ! (rArguments[3] >>= mxSharedCanvas))
{
throw lang::IllegalArgumentException(
- OUString::createFromAscii("PresenterCanvas: invalid shared canvas"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared canvas")),
static_cast<XWeak*>(this),
2);
}
@@ -249,7 +249,7 @@ void SAL_CALL PresenterCanvas::initialize (
if ( ! (rArguments[4] >>= mxWindow))
{
throw lang::IllegalArgumentException(
- OUString::createFromAscii("PresenterCanvas: invalid window"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid window")),
static_cast<XWeak*>(this),
3);
}
@@ -270,7 +270,7 @@ void SAL_CALL PresenterCanvas::initialize (
else
{
throw RuntimeException(
- OUString::createFromAscii("PresenterCanvas: invalid number of arguments"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid number of arguments")),
static_cast<XWeak*>(this));
}
}
diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
index 9d0fca4..4d17967 100644
--- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx
+++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
@@ -252,7 +252,7 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvas (
xFactory->createInstanceWithArguments(
rsCanvasServiceName.getLength()>0
? rsCanvasServiceName
- : OUString::createFromAscii("com.sun.star.rendering.VCLCanvas"),
+ : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")),
aArg),
UNO_QUERY);
}
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index c3a6be7..6cc56e3 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -61,7 +61,7 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
::rtl::OUString PresenterHelperService_getImplementationName (void)
throw(RuntimeException)
{
- return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper"));
}
@@ -71,7 +71,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterHelper"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterHelper")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -177,7 +177,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas (
|| ! rxWindow.is())
{
throw RuntimeException(
- OUString::createFromAscii("illegal argument"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("illegal argument")),
Reference<XInterface>(static_cast<XWeak*>(this)));
}
@@ -223,7 +223,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
xFactory->createInstanceWithArguments(
rsOptionalCanvasServiceName.getLength()>0
? rsOptionalCanvasServiceName
- : OUString::createFromAscii("com.sun.star.rendering.VCLCanvas"),
+ : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")),
aArg),
UNO_QUERY);
}
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 10fb303..35fbefc 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -100,7 +100,7 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
::rtl::OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException)
{
- return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterPreviewCache");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPreviewCache"));
}
@@ -110,7 +110,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterPreviewCache"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index b67e0c7..35aa82b 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -73,7 +73,7 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
::rtl::OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException)
{
- return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterTextView");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterTextView"));
}
@@ -83,7 +83,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNam
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterTextView"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterTextView")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -193,7 +193,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
else
{
throw RuntimeException(
- OUString::createFromAscii("PresenterTextView: invalid number of arguments"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterTextView: invalid number of arguments")),
static_cast<XWeak*>(this));
}
}
@@ -303,15 +303,15 @@ void PresenterTextView::ThrowIfDisposed (void)
//===== PresenterTextView::Implementation =====================================
PresenterTextView::Implementation::Implementation (void)
- : msTextPropertyName(OUString::createFromAscii("Text")),
- msBitmapPropertyName(OUString::createFromAscii("Bitmap")),
- msSizePropertyName(OUString::createFromAscii("Size")),
- msBackgroundColorPropertyName(OUString::createFromAscii("BackgroundColor")),
- msTextColorPropertyName(OUString::createFromAscii("TextColor")),
- msFontDescriptorPropertyName(OUString::createFromAscii("FontDescriptor")),
- msTopPropertyName(OUString::createFromAscii("Top")),
- msTopRelativePropertyName(OUString::createFromAscii("RelativeTop")),
- msTotalHeightPropertyName(OUString::createFromAscii("TotalHeight")),
+ : msTextPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Text"))),
+ msBitmapPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap"))),
+ msSizePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Size"))),
+ msBackgroundColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor"))),
+ msTextColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"))),
+ msFontDescriptorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("FontDescriptor"))),
+ msTopPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Top"))),
+ msTopRelativePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeTop"))),
+ msTotalHeightPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TotalHeight"))),
mxBitmap(),
mpCanvas(),
mpOutputDevice(new VirtualDevice(*Application::GetDefaultDevice(), 0, 0)),
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index c852ff5..95c0eec 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -54,7 +54,7 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
::rtl::OUString SlideRenderer_getImplementationName (void) throw(RuntimeException)
{
- return OUString::createFromAscii("com.sun.star.comp.Draw.SlideRenderer");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideRenderer"));
}
@@ -64,7 +64,7 @@ Sequence<rtl::OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.SlideRenderer"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -117,7 +117,7 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
else
{
throw RuntimeException(
- OUString::createFromAscii("SlideRenderer: invalid number of arguments"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer: invalid number of arguments")),
static_cast<XWeak*>(this));
}
}
@@ -203,7 +203,7 @@ BitmapEx SlideRenderer::CreatePreview (
const SdPage* pPage = SdPage::getImplementation(rxSlide);
if (pPage == NULL)
throw lang::IllegalArgumentException(
- OUString::createFromAscii("SlideRenderer::createPreview() called with invalid slide"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid slide")),
static_cast<XWeak*>(this),
0);
@@ -211,7 +211,7 @@ BitmapEx SlideRenderer::CreatePreview (
Size aPageSize = pPage->GetSize();
if (aPageSize.Height() <= 0)
throw lang::IllegalArgumentException(
- OUString::createFromAscii("SlideRenderer::createPreview() called with invalid size"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid size")),
static_cast<XWeak*>(this),
1);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 5aae88c..ed63d85 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3012,18 +3012,18 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
uno::Reference< util::XURLTransformer > xParser(
- xFac->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ),
+ xFac->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer" )) ),
uno::UNO_QUERY_THROW);
util::URL aURL;
- aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/setAutoSaveState");
+ aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/setAutoSaveState"));
xParser->parseStrict(aURL);
Sequence< beans::PropertyValue > aArgs(1);
- aArgs[0].Name = OUString::createFromAscii("AutoSaveState");
+ aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSaveState"));
aArgs[0].Value <<= bOn ? sal_True : sal_False;
uno::Reference< frame::XDispatch > xAutoSave(
- xFac->createInstance(OUString::createFromAscii("com.sun.star.frame.AutoRecovery")),
+ xFac->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.AutoRecovery"))),
uno::UNO_QUERY_THROW);
xAutoSave->dispatch(aURL, aArgs);
}
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 27cb286..5de64fb 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -193,7 +193,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli
{
try
{
- const Any aNumber (xSet->getPropertyValue(::rtl::OUString::createFromAscii("Number")));
+ const Any aNumber (xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number"))));
sal_Int16 nNumber (-1);
aNumber >>= nNumber;
nNumber -= 1;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 16c60e9..fe568e8 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -79,7 +79,7 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance (
::rtl::OUString SlideSorterService_getImplementationName (void) throw(RuntimeException)
{
- return OUString::createFromAscii("com.sun.star.comp.Draw.SlideSorter");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideSorter"));
}
@@ -89,7 +89,7 @@ Sequence<rtl::OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (vo
throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
- ::rtl::OUString::createFromAscii("com.sun.star.drawing.SlideSorter"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideSorter")));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -175,7 +175,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments)
else
{
throw RuntimeException(
- OUString::createFromAscii("SlideSorterService: invalid number of arguments"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorterService: invalid number of arguments")),
static_cast<drawing::XDrawView*>(this));
}
}
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 0ebea3f..a8cc474 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -229,7 +229,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
mxListener = new ::sd::tools::SlotStateListener(
aStateChangeLink,
Reference<frame::XDispatchProvider>(mrBase.GetController()->getFrame(), UNO_QUERY),
- ::rtl::OUString::createFromAscii(".uno:VerticalTextState"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:VerticalTextState")));
// Add this new object as shell to the shell factory.
GetShellManager()->AddSubShell(HID_SD_TASK_PANE_PREVIEW_LAYOUTS,this,this);
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 8c0a45d..3f7ac01 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -82,7 +82,7 @@ ScrollPanel::ScrollPanel (
void ScrollPanel::Construct()
{
SetAccessibleName (
- ::rtl::OUString::createFromAscii("Sub Task Panel"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")));
mpControlContainer->SetMultiSelection (true);
SetBorderStyle (WINDOW_BORDER_NORMAL);
@@ -714,8 +714,8 @@ long ScrollPanel::Notify( NotifyEvent& rNEvt )
{
return new ::accessibility::AccessibleScrollPanel (
*this,
- ::rtl::OUString::createFromAscii("Scroll Panel"),
- ::rtl::OUString::createFromAscii("Scroll Panel"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scroll Panel")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scroll Panel")));
}
diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx
index f765104..78a9589 100644
--- a/sd/source/ui/toolpanel/SubToolPanel.cxx
+++ b/sd/source/ui/toolpanel/SubToolPanel.cxx
@@ -55,7 +55,7 @@ SubToolPanel::SubToolPanel (
mnHorizontalBorder(2)
{
SetAccessibleName (
- ::rtl::OUString::createFromAscii("Sub Task Panel"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")));
mpControlContainer->SetMultiSelection (true);
SetBorderStyle (WINDOW_BORDER_NORMAL);
@@ -84,7 +84,7 @@ SubToolPanel::SubToolPanel (
mnHorizontalBorder(2)
{
SetAccessibleName (
- ::rtl::OUString::createFromAscii("Sub Task Panel"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")));
mpControlContainer->SetMultiSelection (true);
SetBorderStyle (WINDOW_BORDER_NORMAL);
@@ -412,8 +412,8 @@ IMPL_LINK(SubToolPanel, WindowEventListener, VclSimpleEvent*, pEvent)
{
return new ::accessibility::AccessibleTreeNode (
*this,
- ::rtl::OUString::createFromAscii("Sub Task Panel"),
- ::rtl::OUString::createFromAscii("Sub Task Panel"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")),
::com::sun::star::accessibility::AccessibleRole::PANEL);
}
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
index f5e8658..67a139d 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
@@ -131,8 +131,8 @@ Image TemplatePreviewProvider::operator() (
{
uno::Reference<lang::XSingleServiceFactory> xStorageFactory(
xServiceManager->createInstance(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.embed.StorageFactory")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.embed.StorageFactory"))),
uno::UNO_QUERY);
if (xStorageFactory.is())
@@ -150,14 +150,14 @@ Image TemplatePreviewProvider::operator() (
{
uno::Reference<embed::XStorage> xStorage (
xDocStorage->openStorageElement(
- ::rtl::OUString::createFromAscii("Thumbnails"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thumbnails")),
embed::ElementModes::READ));
if (xStorage.is())
{
uno::Reference<io::XStream> xThumbnailCopy (
xStorage->cloneStreamElement(
- ::rtl::OUString::createFromAscii(
- "thumbnail.png")));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "thumbnail.png"))));
if (xThumbnailCopy.is())
xIStream = xThumbnailCopy->getInputStream();
}
@@ -183,7 +183,7 @@ Image TemplatePreviewProvider::operator() (
{
uno::Reference<embed::XStorage> xStorage (
xDocStorage->openStorageElement(
- ::rtl::OUString::createFromAscii("Thumbnail"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thumbnail")),
embed::ElementModes::READ));
if (xStorage.is())
{
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index 9ee7a55..9c0d986 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -293,15 +293,15 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati
{
if (msURL.getLength() == 0)
meURLClassification = URLCLASS_UNKNOWN;
- else if (msURL.indexOf(::rtl::OUString::createFromAscii("presnt"))>=0)
+ else if (msURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("presnt")))>=0)
{
meURLClassification = URLCLASS_PRESENTATION;
}
- else if (msURL.indexOf(::rtl::OUString::createFromAscii("layout"))>=0)
+ else if (msURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("layout")))>=0)
{
meURLClassification = URLCLASS_LAYOUT;
}
- else if (msURL.indexOf(::rtl::OUString::createFromAscii("educate"))>=0)
+ else if (msURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("educate")))>=0)
{
meURLClassification = URLCLASS_OTHER;
}
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
index 1dd5109..8b7a211 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
@@ -197,8 +197,8 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
if ( ! xSet.is())
return;
- const String sURLMemberName (OUString::createFromAscii("URL"));
- const String sNameMemberName (OUString::createFromAscii("Name"));
+ const String sURLMemberName (RTL_CONSTASCII_USTRINGPARAM("URL"));
+ const String sNameMemberName (RTL_CONSTASCII_USTRINGPARAM("Name"));
OUString sURL;
OUString sName;
@@ -272,8 +272,8 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
xSet->removeByName (aKeys[i]);
// Fill it with the URLs of this object.
- const String sURLMemberName (OUString::createFromAscii("URL"));
- const String sNameMemberName (OUString::createFromAscii("Name"));
+ const String sURLMemberName (RTL_CONSTASCII_USTRINGPARAM("URL"));
+ const String sNameMemberName (RTL_CONSTASCII_USTRINGPARAM("Name"));
Any aValue;
Reference<lang::XSingleServiceFactory> xChildFactory (
xSet, UNO_QUERY);
@@ -286,7 +286,7 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
++iDescriptor,++nIndex)
{
// Create new child.
- OUString sKey (OUString::createFromAscii("index_"));
+ OUString sKey (RTL_CONSTASCII_USTRINGPARAM("index_"));
sKey += OUString::valueOf(nIndex);
Reference<container::XNameReplace> xChild(
xChildFactory->createInstance(), UNO_QUERY);
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 0574b98..615fd54 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -53,7 +53,7 @@ ConfigurationAccess::ConfigurationAccess (
{
Reference<lang::XMultiServiceFactory> xProvider (
xFactory->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")),
rxContext),
UNO_QUERY);
if (xProvider.is())
@@ -71,7 +71,7 @@ ConfigurationAccess::ConfigurationAccess (
{
Reference<lang::XMultiServiceFactory> xProvider (
::comphelper::getProcessServiceFactory()->createInstance(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
UNO_QUERY);
if (xProvider.is())
Initialize(xProvider, rsRootName, eMode);
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index db4b85f..6f3c1e1 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -247,7 +247,7 @@ OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeExcepti
-static OUString ssServiceName (OUString::createFromAscii(
+static OUString ssServiceName (RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.drawing.DrawingDocumentDrawView"));
sal_Bool SAL_CALL DrawController::supportsService (
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index e0cdcc3..dcd7b2c 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -423,7 +423,7 @@ SdFilterDetect::~SdFilterDetect()
{
// if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("InputStream");
+ lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
lDescriptor[nPropertyCount].Value <<= xStream;
nPropertyCount++;
}
@@ -432,7 +432,7 @@ SdFilterDetect::~SdFilterDetect()
{
// if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("UCBContent");
+ lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent"));
lDescriptor[nPropertyCount].Value <<= xContent;
nPropertyCount++;
}
@@ -442,7 +442,7 @@ SdFilterDetect::~SdFilterDetect()
if ( nIndexOfReadOnlyFlag == -1 )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+ lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
lDescriptor[nPropertyCount].Value <<= bReadOnly;
nPropertyCount++;
}
@@ -453,7 +453,7 @@ SdFilterDetect::~SdFilterDetect()
if ( !bRepairPackage && bRepairAllowed )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("RepairPackage");
+ lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage"));
lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
nPropertyCount++;
@@ -467,7 +467,7 @@ SdFilterDetect::~SdFilterDetect()
if ( nIndexOfTemplateFlag == -1 )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
+ lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate;
nPropertyCount++;
}
@@ -481,7 +481,7 @@ SdFilterDetect::~SdFilterDetect()
if ( nIndexOfDocumentTitle == -1 )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("DocumentTitle");
+ lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle"));
lDescriptor[nPropertyCount].Value <<= aDocumentTitle;
nPropertyCount++;
}
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index d289ea1..2770d85 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -98,12 +98,12 @@ PresentationViewShellBase::PresentationViewShellBase (
if (xFrameSet.is())
{
Reference<beans::XPropertySet> xLayouterSet (
- xFrameSet->getPropertyValue(::rtl::OUString::createFromAscii("LayoutManager")),
+ xFrameSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
UNO_QUERY);
if (xLayouterSet.is())
{
xLayouterSet->setPropertyValue(
- ::rtl::OUString::createFromAscii("AutomaticToolbars"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")),
makeAny(sal_False));
}
}
diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx
index 7c51b4d..260d2a6 100644
--- a/sd/source/ui/view/UpdateLockManager.cxx
+++ b/sd/source/ui/view/UpdateLockManager.cxx
@@ -407,7 +407,7 @@ Reference< ::com::sun::star::frame::XLayoutManager>
try
{
Any aValue (xFrameProperties->getPropertyValue(
- ::rtl::OUString::createFromAscii("LayoutManager")));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))));
aValue >>= xLayoutManager;
}
catch (const beans::UnknownPropertyException& rException)
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5a0e9d2..04034da 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1330,7 +1330,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void)
pHelper->GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
FrameworkHelper::msCenterPaneURL);
pHelper->RunOnConfigurationEvent(
- ::rtl::OUString::createFromAscii("ConfigurationUpdateEnd"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd")),
CurrentPageSetter(mrBase));
}
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index d7efb81..00c806e 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -88,7 +88,7 @@ using namespace ::com::sun::star::uno;
namespace {
static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME(
- ::rtl::OUString::createFromAscii("masterviewtoolbar"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("masterviewtoolbar")));
}
namespace sd {
@@ -390,7 +390,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
if( xMgr.is() )
{
mxScannerManager = ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager >(
- xMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.scanner.ScannerManager" ) ),
+ xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" )) ),
::com::sun::star::uno::UNO_QUERY );
if( mxScannerManager.is() )
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index f89ffac..0dbca9f 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -698,7 +698,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
{
try
{
- com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString::createFromAscii("com.sun.star.comp.ui.XSLTFilterDialog")), com::sun::star::uno::UNO_QUERY);
+ com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), com::sun::star::uno::UNO_QUERY);
if( xDialog.is() )
{
xDialog->execute();
More information about the Libreoffice-commits
mailing list