From 59b072e22b0610abc7ffdbc75873ef5cbba58de7 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 4 Nov 2015 08:29:36 +0200
Subject: yyyyy

Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
---
 comphelper/source/container/embeddedobjectcontainer.cxx           | 6 +++---
 comphelper/source/misc/mimeconfighelper.cxx                       | 3 +--
 comphelper/source/misc/officeresourcebundle.cxx                   | 3 +--
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 6 ++----
 4 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'comphelper')

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index fa86241957ec..09e93dd3e515 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -80,12 +80,12 @@ const uno::Reference < embed::XStorage >& EmbedImpl::GetReplacements()
         try
         {
             mxImageStorage = mxStorage->openStorageElement(
-                OUString("ObjectReplacements"), embed::ElementModes::READWRITE );
+                "ObjectReplacements", embed::ElementModes::READWRITE );
         }
         catch (const uno::Exception&)
         {
             mxImageStorage = mxStorage->openStorageElement(
-                OUString("ObjectReplacements"), embed::ElementModes::READ );
+                "ObjectReplacements", embed::ElementModes::READ );
         }
     }
 
@@ -1282,7 +1282,7 @@ namespace {
         try
         {
             uno::Reference< embed::XStorage > xPictures = xDocStor->openStorageElement(
-                                        OUString( "Pictures" ),
+                                        "Pictures",
                                         embed::ElementModes::READWRITE );
             uno::Reference< io::XStream > xObjReplStr = xPictures->openStreamElement(
                                         aStreamName,
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 6dc3e21d332e..c927c7e40efa 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -532,8 +532,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString&
                     OUString aEntryDocName;
 
                     if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is()
-                      && ( xObjectProps->getByName(
-                                  OUString( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
+                      && ( xObjectProps->getByName( "ObjectDocumentServiceName" ) >>= aEntryDocName )
                       && aEntryDocName == aDocName )
                     {
                         xObjectProps->getByName("ObjectFactory") >>= aResult;
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index daffd7cb618b..c9c281198db2 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -155,8 +155,7 @@ namespace comphelper
         Reference< XResourceBundleLoader > xLoader;
         try
         {
-            Any aValue( m_xContext->getValueByName(
-                OUString( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ) );
+            Any aValue( m_xContext->getValueByName( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) );
             OSL_VERIFY( aValue >>= xLoader );
         }
         catch( const Exception& )
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 7ba751c0951b..01d3efbe7a0c 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -281,9 +281,7 @@ void OfficeInstallationDirectories::initDirs()
 
             uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(m_xCtx);
 
-            *m_pOfficeBrandDir =
-                xExpander->expandMacros(
-                     OUString( "$BRAND_BASE_DIR" ) );
+            *m_pOfficeBrandDir = xExpander->expandMacros( "$BRAND_BASE_DIR" );
 
             OSL_ENSURE( !m_pOfficeBrandDir->isEmpty(),
                         "Unable to obtain office brand installation directory!" );
@@ -292,7 +290,7 @@ void OfficeInstallationDirectories::initDirs()
 
             *m_pUserDir =
                 xExpander->expandMacros(
-                    OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) );
+                    "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" );
 
             OSL_ENSURE( !m_pUserDir->isEmpty(),
                         "Unable to obtain office user data directory!" );
-- 
cgit