diff options
Diffstat (limited to 'framework/source/services/license.cxx')
| -rw-r--r-- | framework/source/services/license.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 768f7aef289c..c2a63843d45b 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -167,7 +167,7 @@ DEFINE_INIT_SERVICE ( License, ) - +#if 0 IMPL_STATIC_LINK_NOINSTANCE( License, Terminate, void*, EMPTYARG ) { /* @@ -182,6 +182,7 @@ IMPL_STATIC_LINK_NOINSTANCE( License, Terminate, void*, EMPTYARG ) */ return 0; } +#endif static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime) { @@ -318,9 +319,9 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na #endif // check if we need to show the license at all // open org.openoffice.Setup/Office/ooLicenseAcceptDate - ::rtl::OUString sConfigSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"); + ::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER; ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"); - ::rtl::OUString sReadSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"); + ::rtl::OUString sReadSrvc = SERVICENAME_CFGREADACCESS; // get configuration provider Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >( @@ -332,11 +333,10 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); - Any result = pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")); // if we find a date there, compare it to baseinstall license date ::rtl::OUString aAcceptDate; - if (result >>= aAcceptDate) + if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate) { // get LicenseFileDate from base install ::rtl::OUString aLicenseURL = aLicensePath; |