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 /desktop | |
| parent | 37d6ff0691f7be9fa4d742779fa59883de3586d9 (diff) | |
remove static OUStrings from static_initialization_and_destruction chain
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/appfirststart.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx index bf42f7537d51..a28414386695 100644 --- a/desktop/source/app/appfirststart.cxx +++ b/desktop/source/app/appfirststart.cxx @@ -44,7 +44,7 @@ using namespace ::desktop; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; -static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) ); +static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess"; /* Local function - get access to the configuration */ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rPath ) @@ -56,7 +56,7 @@ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rP NamedValue aValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), makeAny( rPath ) ); aArgs[0] <<= aValue; return Reference< XPropertySet >( - xConfigProvider->createInstanceWithArguments( sAccessSrvc, aArgs ), UNO_QUERY_THROW ); + xConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), aArgs ), UNO_QUERY_THROW ); } void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart ) diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 7b3578a1eab0..9a48732091f7 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -218,9 +218,9 @@ void SilentCommandEnv::pop() throw (uno::RuntimeException) } // end namespace -//----------------------------------------------------------------------------- -static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) ); -//------------------------------------------------------------------------------ + +static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdateAccess"; + static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > &xContext ) { rtl::OUString sServiceName = UNISTRING("com.sun.star.deployment.ui.UpdateRequiredDialog"); @@ -333,7 +333,7 @@ static void impl_setNeedsCompatCheck() makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( - theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW ); + theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); Any value = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("never")) ); @@ -385,7 +385,7 @@ static bool impl_needsCompatCheck() makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( - theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW ); + theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); Any result = pset->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")) ); |