diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-04 08:29:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-04 14:10:44 +0200 |
| commit | 59b072e22b0610abc7ffdbc75873ef5cbba58de7 (patch) | |
| tree | 663c2d01a983508f9b22ec87fae29b16ab5a1683 /unotools | |
| parent | baa411b59c3840a4dddf5447a0b4583eb5edea74 (diff) | |
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/lingucfg.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 0d8f516046eb..40dcf5d5a392 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -64,7 +64,7 @@ namespace utl OUString makeImplName() { OUString uri; - rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); + rtl::Bootstrap::get( "BRAND_BASE_DIR", uri); return uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap"); } } @@ -736,7 +736,7 @@ bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, { // try to open version.ini (versionrc) OUString uri; - rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); + rtl::Bootstrap::get( "BRAND_BASE_DIR", uri); rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 5249ac567a89..6d0e8b1b603c 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -912,7 +912,7 @@ bool SvtLinguConfig::GetSupportedDictionaryFormatsFor( xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rSetName ), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rSetEntry ), uno::UNO_QUERY_THROW ); - if (xNA->getByName( OUString(aG_SupportedDictionaryFormats) ) >>= rFormatList) + if (xNA->getByName( aG_SupportedDictionaryFormats ) >>= rFormatList) bSuccess = true; DBG_ASSERT( rFormatList.getLength(), "supported dictionary format list is empty" ); } @@ -953,16 +953,16 @@ bool SvtLinguConfig::GetDictionaryEntry( { uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW ); - xNA.set( xNA->getByName(OUString(aG_Dictionaries)), uno::UNO_QUERY_THROW ); + xNA.set( xNA->getByName( aG_Dictionaries ), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rNodeName ), uno::UNO_QUERY_THROW ); // read group data... uno::Sequence< OUString > aLocations; OUString aFormatName; uno::Sequence< OUString > aLocaleNames; - bSuccess = (xNA->getByName( OUString(aG_Locations) ) >>= aLocations) && - (xNA->getByName( OUString(aG_Format) ) >>= aFormatName) && - (xNA->getByName( OUString(aG_Locales) ) >>= aLocaleNames); + bSuccess = (xNA->getByName( aG_Locations ) >>= aLocations) && + (xNA->getByName( aG_Format ) >>= aFormatName) && + (xNA->getByName( aG_Locales ) >>= aLocaleNames); DBG_ASSERT( aLocations.getLength(), "Dictionary locations not set" ); DBG_ASSERT( !aFormatName.isEmpty(), "Dictionary format name not set" ); DBG_ASSERT( aLocaleNames.getLength(), "No locales set for the dictionary" ); @@ -1000,7 +1000,7 @@ uno::Sequence< OUString > SvtLinguConfig::GetDisabledDictionaries() const { uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName("ServiceManager"), uno::UNO_QUERY_THROW ); - xNA->getByName( OUString(aG_DisabledDictionaries) ) >>= aResult; + xNA->getByName( aG_DisabledDictionaries ) >>= aResult; } catch (uno::Exception &) { |