diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-28 22:19:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-29 12:44:23 +0100 |
| commit | 9ce98add53128716524ec06dd1f90548326adce0 (patch) | |
| tree | 5b5eba190310fa1f25b84af3f3af30b7894ae629 /framework | |
| parent | 37d6ff0691f7be9fa4d742779fa59883de3586d9 (diff) | |
remove static OUStrings from static_initialization_and_destruction chain
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/modulemanager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 665d3dcda42c..fd358bfba848 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -54,8 +54,8 @@ namespace framework { -static const ::rtl::OUString CFGPATH_FACTORIES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); -static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier")); +static const char CFGPATH_FACTORIES[] = "/org.openoffice.Setup/Office/Factories"; +static const char MODULEPROP_IDENTIFIER[] = "ooSetupFactoryModuleIdentifier"; /*----------------------------------------------- 04.12.2003 09:32 @@ -212,7 +212,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , // we can close it without a flush ... and our read data wont be affected .-) css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig( xSMGR, - CFGPATH_FACTORIES, + rtl::OUString(CFGPATH_FACTORIES), ::comphelper::ConfigurationHelper::E_STANDARD); css::uno::Reference< css::container::XNameAccess > xModules (xCfg, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameReplace > xModule ; @@ -266,7 +266,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName) sal_Int32 c = lPropNames.getLength(); sal_Int32 i = 0; - lProps[MODULEPROP_IDENTIFIER] <<= sName; + lProps[rtl::OUString(MODULEPROP_IDENTIFIER)] <<= sName; for (i=0; i<c; ++i) { const ::rtl::OUString& sPropName = lPropNames[i]; @@ -375,7 +375,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf { xCfg = ::comphelper::ConfigurationHelper::openConfig( xSMGR, - CFGPATH_FACTORIES, + rtl::OUString(CFGPATH_FACTORIES), ::comphelper::ConfigurationHelper::E_READONLY); } catch(const css::uno::RuntimeException&) |