diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-11 22:48:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-11 22:49:21 +0100 |
| commit | c1758889cbd5e8e4afb1044425c908715eb3e1cd (patch) | |
| tree | ff58b017da12c009f0b17c067787d1dbbd52eb7a /desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | |
| parent | 4ffcc73fa25f174c2d1e161f02cce2d7afc15e3b (diff) | |
Heavily simplified utl::ConfigManager.
Diffstat (limited to 'desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx')
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 1732b3fb5f88..4c9bd17b9f3c 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -66,18 +66,6 @@ using ::rtl::OUString; namespace { //============================================================================== -struct OfficeLocale : - public rtl::StaticWithInit<lang::Locale, OfficeLocale> { - const lang::Locale operator () () { - OUString slang; - if (! (::utl::ConfigManager::GetDirectConfigProperty( - ::utl::ConfigManager::LOCALE ) >>= slang)) - throw RuntimeException( OUSTR("Cannot determine language!"), 0 ); - return toLocale(slang); - } -}; - -//============================================================================== class CommandEnvironmentImpl : public ::cppu::WeakImplHelper3< XCommandEnvironment, task::XInteractionHandler, @@ -189,7 +177,8 @@ void CommandEnvironmentImpl::printLicense( ->createInstanceWithContext( OUSTR("com.sun.star.i18n.Collator"),m_xComponentContext), UNO_QUERY_THROW ); - xCollator->loadDefaultCollator(OfficeLocale::get(), + xCollator->loadDefaultCollator( + toLocale(utl::ConfigManager::getLocale()), css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE); do |