fdo#38835 strip out OUString globals

they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.

Change-Id: I07f73484f82d0582252cb4324d4107c998432c37

5 files changed, 13 insertions, 16 deletions

diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 7a7d73fc3951..519c795fa3a7 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -481,7 +481,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
 
         Reference< XDispatch > xMenuItemDispatch;
 
-        static const OUString s_sDefault("_default");
+        static const char s_sDefault[] = "_default";
         // query for dispatcher
         std::vector< MenuItemHandler* >::iterator p;
         for ( p = aNewPickVector.begin(); p != aNewPickVector.end(); ++p )
diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index 082f099baa30..5afd5dd8e101 100644
--- a/framework/source/fwi/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
@@ -23,20 +23,17 @@ namespace framework{
 
 const OUString JobConst::ANSWER_DEACTIVATE_JOB()
 {
-    static const OUString PROP("Deactivate");
-    return PROP;
+    return OUString("Deactivate");
 }
 
 const OUString JobConst::ANSWER_SAVE_ARGUMENTS()
 {
-    static const OUString PROP("SaveArguments");
-    return PROP;
+    return OUString("SaveArguments");
 }
 
 const OUString JobConst::ANSWER_SEND_DISPATCHRESULT()
 {
-    static const OUString PROP("SendDispatchResult");
-    return PROP;
+    return OUString("SendDispatchResult");
 }
 
 } // namespace framework
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index c0a31e8fe178..3e85ed351e7c 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -450,7 +450,7 @@ bool isEnabled( const OUString& sAdminTime ,
         we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated
         to "~" ...
      */
-    static OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*");
+    static const char PATTERN_ISO8601[] = "\?\?\?\?-\?\?-\?\?*";
     WildCard aISOPattern(PATTERN_ISO8601);
 
     bool bValidAdmin = aISOPattern.Matches(sAdminTime);
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 16741aca86a3..0342061beaab 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -40,19 +40,19 @@
 namespace framework{
 
 /** address job configuration inside argument set provided on method execute(). */
-static const OUString PROP_JOBCONFIG("JobConfig");
+static const char PROP_JOBCONFIG[] = "JobConfig";
 
 /** address job configuration property "Command". */
-static const OUString PROP_COMMAND("Command");
+static const char PROP_COMMAND[] = "Command";
 
 /** address job configuration property "Arguments". */
-static const OUString PROP_ARGUMENTS("Arguments");
+static const char PROP_ARGUMENTS[] = "Arguments";
 
 /** address job configuration property "DeactivateJobIfDone". */
-static const OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone");
+static const char PROP_DEACTIVATEJOBIFDONE[] = "DeactivateJobIfDone";
 
 /** address job configuration property "CheckExitCode". */
-static const OUString PROP_CHECKEXITCODE("CheckExitCode");
+static const char PROP_CHECKEXITCODE[] = "CheckExitCode";
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(ShellJob                   ,
                                    ::cppu::OWeakObject        ,
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index f6526dd2f7a4..64eca8ea1f8a 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -737,8 +737,8 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>&, OUStrin
 void LoadEnv::impl_detectTypeAndFilter()
     throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception)
 {
-    static OUString TYPEPROP_PREFERREDFILTER("PreferredFilter");
-    static OUString FILTERPROP_FLAGS        ("Flags");
+    static const char TYPEPROP_PREFERREDFILTER[] = "PreferredFilter";
+    static const char FILTERPROP_FLAGS        [] = "Flags";
     static sal_Int32       FILTERFLAG_TEMPLATEPATH  = 16;
 
     // SAFE ->
@@ -1673,7 +1673,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
 
 void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
-    static OUString PACKAGE_SETUP_MODULES("/org.openoffice.Setup/Office/Factories");
+    static const char PACKAGE_SETUP_MODULES[] = "/org.openoffice.Setup/Office/Factories";
 
     // no window -> action not possible
     if (!xWindow.is())