diff options
Diffstat (limited to 'framework/source/accelerators')
| -rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 18 | ||||
| -rw-r--r-- | framework/source/accelerators/presethandler.cxx | 18 |
2 files changed, 12 insertions, 24 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"); } //----------------------------------------------- |