reduce static_initialization_and_destruction chain

Change-Id: I0c1b2f2d908c31d1510662880c13504d81445a6a

4 files changed, 24 insertions, 42 deletions

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 19a7a0e3844a..96c8e3017cda 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -624,20 +624,17 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
 //-----------------------------------------------
 ::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    static ::rtl::OUString LOCALE_PACKAGE("/org.openoffice.Setup");
-    static ::rtl::OUString LOCALE_PATH("L10N");
-    static ::rtl::OUString LOCALE_KEY("ooLocale");
-
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
     css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR;
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
-    css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig(xSMGR, LOCALE_PACKAGE, LOCALE_PATH, fpc::ConfigurationHelper::E_READONLY);
+    css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig(xSMGR,
+        "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
     css::uno::Reference< css::beans::XPropertySet > xProp     (xCFG, css::uno::UNO_QUERY_THROW);
     ::rtl::OUString                                 sISOLocale;
-    xProp->getPropertyValue(LOCALE_KEY) >>= sISOLocale;
+    xProp->getPropertyValue("ooLocale") >>= sISOLocale;
 
     if (sISOLocale.isEmpty())
         return ::comphelper::Locale::EN_US();
@@ -1666,20 +1663,17 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
 //-----------------------------------------------
 ::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    static ::rtl::OUString LOCALE_PACKAGE("/org.openoffice.Setup");
-    static ::rtl::OUString LOCALE_PATH("L10N");
-    static ::rtl::OUString LOCALE_KEY("ooLocale");
-
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
     css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR;
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
-    css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig(xSMGR, LOCALE_PACKAGE, LOCALE_PATH, fpc::ConfigurationHelper::E_READONLY);
+    css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig(xSMGR,
+        "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
     css::uno::Reference< css::beans::XPropertySet > xProp     (xCFG, css::uno::UNO_QUERY_THROW);
     ::rtl::OUString                                 sISOLocale;
-    xProp->getPropertyValue(LOCALE_KEY) >>= sISOLocale;
+    xProp->getPropertyValue("ooLocale") >>= sISOLocale;
 
     if (sISOLocale.isEmpty())
         return ::comphelper::Locale::EN_US();
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index ee88be39c325..a72d8f22c577 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -83,43 +83,37 @@ namespace framework
 //-----------------------------------------------
 ::rtl::OUString PresetHandler::PRESET_DEFAULT()
 {
-    static ::rtl::OUString RSTYPE = DECLARE_ASCII("default");
-    return RSTYPE;
+    return ::rtl::OUString("default");
 }
 
 //-----------------------------------------------
 ::rtl::OUString PresetHandler::TARGET_CURRENT()
 {
-    static ::rtl::OUString RSTYPE = DECLARE_ASCII("current");
-    return RSTYPE;
+    return ::rtl::OUString("current");
 }
 
 //-----------------------------------------------
 ::rtl::OUString PresetHandler::RESOURCETYPE_MENUBAR()
 {
-    static ::rtl::OUString RSTYPE = DECLARE_ASCII("menubar");
-    return RSTYPE;
+    return ::rtl::OUString("menubar");
 }
 
 //-----------------------------------------------
 ::rtl::OUString PresetHandler::RESOURCETYPE_TOOLBAR()
 {
-    static ::rtl::OUString RSTYPE = DECLARE_ASCII("toolbar");
-    return RSTYPE;
+    return ::rtl::OUString("toolbar");
 }
 
 //-----------------------------------------------
 ::rtl::OUString PresetHandler::RESOURCETYPE_ACCELERATOR()
 {
-    static ::rtl::OUString RSTYPE = DECLARE_ASCII("accelerator");
-    return RSTYPE;
+    return ::rtl::OUString("accelerator");
 }
 
 //-----------------------------------------------
 ::rtl::OUString PresetHandler::RESOURCETYPE_STATUSBAR()
 {
-    static ::rtl::OUString RSTYPE = DECLARE_ASCII("statusbar");
-    return RSTYPE;
+    return ::rtl::OUString("statusbar");
 }
 
 //-----------------------------------------------
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 52bc730e3758..644ab5416c44 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -103,10 +103,6 @@ TaskCreator::~TaskCreator()
 css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName    ,
                                                                          sal_Bool         bVisible )
 {
-    static ::rtl::OUString PACKAGE("org.openoffice.Office.TabBrowse");
-    static ::rtl::OUString RELPATH("TaskCreatorService");
-    static ::rtl::OUString KEY("ImplementationName");
-
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );
     css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR;
@@ -123,7 +119,11 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::
             ( TargetHelper::matchSpecialTarget(sName, TargetHelper::E_DEFAULT) )
            )
         {
-            ::comphelper::ConfigurationHelper::readDirectKey(xSMGR, PACKAGE, RELPATH, KEY, ::comphelper::ConfigurationHelper::E_READONLY) >>= sCreator;
+            ::comphelper::ConfigurationHelper::readDirectKey(xSMGR,
+                "org.openoffice.Office.TabBrowse",
+                "TaskCreatorService",
+                "ImplementationName",
+                ::comphelper::ConfigurationHelper::E_READONLY) >>= sCreator;
         }
 
         xCreator = css::uno::Reference< css::lang::XSingleServiceFactory >(
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 2f5d4fe62878..fc1ee34366cb 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -119,23 +119,17 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
 {
-    static ::rtl::OUString     DEFAULTVAL_FRAMENAME                     = ::rtl::OUString();
-    static sal_Bool            DEFAULTVAL_MAKEVISIBLE                   = sal_False;
-    static sal_Bool            DEFAULTVAL_CREATETOPWINDOW               = sal_True;
-    static css::awt::Rectangle DEFAULTVAL_POSSIZE                       = css::awt::Rectangle(0, 0, 0, 0); // only possize=[0,0,0,0] triggers default handling of vcl !
-    static sal_Bool            DEFAULTVAL_SUPPORTPERSSISTENTWINDOWSTATE = sal_False;
-    static sal_Bool            DEFAULTVAL_ENABLE_TITLEBARUPDATE         = sal_True;
-
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
 
     css::uno::Reference< css::frame::XFrame > xParentFrame                  = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_PARENTFRAME)                  , css::uno::Reference< css::frame::XFrame >());
-    ::rtl::OUString                           sFrameName                    = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_FRAMENAME)                    , DEFAULTVAL_FRAMENAME                       );
-    sal_Bool                                  bVisible                      = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_MAKEVISIBLE)                  , DEFAULTVAL_MAKEVISIBLE                     );
-    sal_Bool                                  bCreateTopWindow              = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_CREATETOPWINDOW)              , DEFAULTVAL_CREATETOPWINDOW                 );
-    css::awt::Rectangle                       aPosSize                      = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_POSSIZE)                      , DEFAULTVAL_POSSIZE                         );
+    ::rtl::OUString                           sFrameName                    = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_FRAMENAME)                    , ::rtl::OUString()                          );
+    sal_Bool                                  bVisible                      = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_MAKEVISIBLE)                  , sal_False                                  );
+    sal_Bool                                  bCreateTopWindow              = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_CREATETOPWINDOW)              , sal_True                                   );
+    // only possize=[0,0,0,0] triggers default handling of vcl !
+    css::awt::Rectangle                       aPosSize                      = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_POSSIZE)                      , css::awt::Rectangle(0, 0, 0, 0)            );
     css::uno::Reference< css::awt::XWindow >  xContainerWindow              = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_CONTAINERWINDOW)              , css::uno::Reference< css::awt::XWindow >() );
-    sal_Bool                                  bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , DEFAULTVAL_SUPPORTPERSSISTENTWINDOWSTATE   );
-    sal_Bool                                  bEnableTitleBarUpdate         = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_ENABLE_TITLEBARUPDATE)        , DEFAULTVAL_ENABLE_TITLEBARUPDATE           );
+    sal_Bool                                  bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False                                  );
+    sal_Bool                                  bEnableTitleBarUpdate         = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_ENABLE_TITLEBARUPDATE)        , sal_True                                   );
 
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );