diff options
| -rw-r--r-- | framework/inc/macros/xserviceinfo.hxx | 2 | ||||
| -rw-r--r-- | framework/source/inc/pattern/configuration.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 8c72a556f4a7..f031a37ff8b4 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -157,7 +157,7 @@ ________________________________________________________________________________ throw( css::uno::Exception ) \ { \ /* retrieve component context from the given service manager */ \ - static const ::rtl::OUString PROP_DEFAULTCONTEXT = ::rtl::OUString::createFromAscii("DefaultContext"); \ + static const ::rtl::OUString PROP_DEFAULTCONTEXT(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")); \ css::uno::Reference< css::beans::XPropertySet > xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW); \ css::uno::Reference< css::uno::XComponentContext > xComponentContext; \ xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext; \ diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index 580c20195cd1..f5c6a296863b 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -119,7 +119,7 @@ class ConfigurationHelper const ::rtl::OUString& sRelPath , sal_Int32 nOpenFlags) { - static ::rtl::OUString PATH_SEPERATOR = ::rtl::OUString::createFromAscii("/"); + static ::rtl::OUString PATH_SEPERATOR(RTL_CONSTASCII_USTRINGPARAM("/")); css::uno::Reference< css::uno::XInterface > xCFG; @@ -143,13 +143,13 @@ class ConfigurationHelper css::uno::Sequence< css::uno::Any > lParams(c); css::beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString::createFromAscii("nodepath"); + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Value <<= sPath.makeStringAndClear(); lParams[0] <<= aParam; if (bAllLocales) { - aParam.Name = ::rtl::OUString::createFromAscii("*"); + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); aParam.Value <<= sal_True; lParams[1] <<= aParam; } |