yyyyy

Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548

6 files changed, 23 insertions, 29 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 036caaa378cc..3f422737b952 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -660,13 +660,13 @@ bool Desktop::QueryExit()
 
     Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );
     Reference< XPropertySet > xPropertySet(xDesktop, UNO_QUERY_THROW);
-    xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(true) );
+    xPropertySet->setPropertyValue( SUSPEND_QUICKSTARTVETO, Any(true) );
 
     bool bExit = xDesktop->terminate();
 
     if ( !bExit )
     {
-        xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(false) );
+        xPropertySet->setPropertyValue( SUSPEND_QUICKSTARTVETO, Any(false) );
     }
     else if (!Application::IsEventTestingModeEnabled())
     {
@@ -1941,8 +1941,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
     {
         try
         {
-            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/swriter"),
-                OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/swriter",
+                "_blank", 0, args ), UNO_QUERY_THROW );
             xDoc->close( sal_False );
         }
         catch ( const css::uno::Exception& )
@@ -1953,8 +1953,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
     {
         try
         {
-            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/scalc"),
-                OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/scalc",
+                "_blank", 0, args ), UNO_QUERY_THROW );
             xDoc->close( sal_False );
         }
         catch ( const css::uno::Exception& )
@@ -1965,8 +1965,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
     {
         try
         {
-            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/sdraw"),
-                OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/sdraw",
+                "_blank", 0, args ), UNO_QUERY_THROW );
             xDoc->close( sal_False );
         }
         catch ( const css::uno::Exception& )
@@ -1977,8 +1977,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
     {
         try
         {
-            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/simpress"),
-                OUString("_blank"), 0, args ), UNO_QUERY_THROW );
+            Reference < css::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( "private:factory/simpress",
+                "_blank", 0, args ), UNO_QUERY_THROW );
             xDoc->close( sal_False );
         }
         catch ( const css::uno::Exception& )
@@ -2099,9 +2099,7 @@ void Desktop::PreloadConfigurationData()
     css::frame::thePopupMenuControllerFactory::get( xContext );
     try
     {
-        (void)xPopupMenuControllerFactory->hasController(
-                    OUString( ".uno:CharFontName" ),
-                    OUString() );
+        (void)xPopupMenuControllerFactory->hasController( ".uno:CharFontName", OUString() );
     }
     catch ( const css::uno::Exception& )
     {
@@ -2207,7 +2205,7 @@ void Desktop::OpenClients()
         OUString aDefault( "0" );
         OUString aPreloadData;
 
-        aPerfTuneIniFile.getFrom( OUString( "QuickstartPreloadConfiguration" ), aPreloadData, aDefault );
+        aPerfTuneIniFile.getFrom( "QuickstartPreloadConfiguration", aPreloadData, aDefault );
         if ( aPreloadData == "1" )
         {
             if ( rArgs.IsWriter()  ||
@@ -2526,7 +2524,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
             {
                 // no visible task that could be activated found
                 Reference< css::awt::XWindow > xContainerWindow;
-                Reference< XFrame > xBackingFrame = xDesktop->findFrame(OUString( "_blank" ), 0);
+                Reference< XFrame > xBackingFrame = xDesktop->findFrame( "_blank", 0);
                 if (xBackingFrame.is())
                     xContainerWindow = xBackingFrame->getContainerWindow();
                 if (xContainerWindow.is())
@@ -2696,7 +2694,7 @@ void Desktop::OpenSplashScreen()
             UNO_QUERY);
 
         if(m_rSplashScreen.is())
-                m_rSplashScreen->start(OUString("SplashScreen"), 100);
+                m_rSplashScreen->start("SplashScreen", 100);
     }
 
 }
@@ -2732,7 +2730,7 @@ void Desktop::DoFirstRunInitializations()
     try
     {
         Reference< XJobExecutor > xExecutor = theJobExecutor::get( ::comphelper::getProcessComponentContext() );
-        xExecutor->trigger( OUString("onFirstRunInitialization") );
+        xExecutor->trigger( "onFirstRunInitialization" );
     }
     catch(const css::uno::Exception&)
     {
@@ -2752,7 +2750,7 @@ void Desktop::ShowBackingComponent(Desktop * progress)
     {
         progress->SetSplashScreenProgress(60);
     }
-    Reference< XFrame > xBackingFrame = xDesktop->findFrame(OUString( "_blank" ), 0);
+    Reference< XFrame > xBackingFrame = xDesktop->findFrame( "_blank", 0);
     Reference< css::awt::XWindow > xContainerWindow;
 
     if (xBackingFrame.is())
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 45d30f51cf16..103355af0de0 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -512,7 +512,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
         OUString aDefault( "0" );
         OUString aPreloadData;
 
-        aPerfTuneIniFile.getFrom( OUString( "FastPipeCommunication" ), aPreloadData, aDefault );
+        aPerfTuneIniFile.getFrom( "FastPipeCommunication", aPreloadData, aDefault );
 
 
         OUString aUserInstallPathHashCode;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index cd34cd4d108c..85fbabb65e5c 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -35,7 +35,7 @@
 #include "dp_update.hxx"
 
 #define USER_PACKAGE_MANAGER    OUString("user")
-#define SHARED_PACKAGE_MANAGER  OUString("shared")
+#define SHARED_PACKAGE_MANAGER  "shared"
 
 using namespace ::com::sun::star;
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b81a6f871c57..bcc215be170c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -436,7 +436,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 
         uno::Reference<lang::XComponent> xComponent;
         xComponent = xComponentLoader->loadComponentFromURL(
-                                            aURL, OUString("_blank"), 0,
+                                            aURL, "_blank", 0,
                                             aFilterOptions);
 
         if (!xComponent.is())
@@ -1464,7 +1464,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
     comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback, pLib);
 
     if (pUserProfilePath)
-        rtl::Bootstrap::set(OUString("UserInstallation"), OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8));
+        rtl::Bootstrap::set("UserInstallation", OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8));
 
     OUString aAppPath;
     if (pAppPath)
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 2320851d3410..5d43c9b1ceab 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -249,10 +249,8 @@ Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
             UNO_QUERY );
         if ( rNamingService.is() )
         {
-            rNamingService->registerObject(
-                OUString("StarOffice.ServiceManager" ), m_rContext->getServiceManager() );
-            rNamingService->registerObject(
-                OUString("StarOffice.ComponentContext" ), m_rContext );
+            rNamingService->registerObject( "StarOffice.ServiceManager", m_rContext->getServiceManager() );
+            rNamingService->registerObject( "StarOffice.ComponentContext", m_rContext );
             rInstance = rNamingService;
         }
     }
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index eac18d4ca8f2..5b51a534a72a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -441,9 +441,7 @@ Reference<XComponentContext> getUNO(
 {
     // do not create any user data (for the root user) in --shared mode:
     if (shared) {
-        rtl::Bootstrap::set(
-            OUString("CFG_CacheUrl"),
-            OUString());
+        rtl::Bootstrap::set("CFG_CacheUrl", OUString());
     }
 
     // hold lock during process runtime: