diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-26 15:10:09 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-26 15:10:09 +0100 |
| commit | 17091ce9aa0c94e2aaca95dd21f469a7d48f552e (patch) | |
| tree | 73d409f538488e8bc21a52a17e259632964414aa /desktop/source/app/langselect.cxx | |
| parent | 083c537e73f99e962caa69642e75e284e75d7f3f (diff) | |
#i103496#: shorten timespan when locale settings are inconsistent as they are stored at three different locations
Diffstat (limited to 'desktop/source/app/langselect.cxx')
| -rw-r--r-- | desktop/source/app/langselect.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 114997b5d1..e8b50cdd29 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -143,6 +143,18 @@ bool LanguageSelection::prepareLanguage() xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString)); Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges(); + MsLangId::setConfiguredSystemUILanguage( MsLangId::convertLocaleToLanguage(loc) ); + + OUString sLocale; + xProp->getPropertyValue(OUString::createFromAscii("ooSetupSystemLocale")) >>= sLocale; + if ( sLocale.getLength() ) + { + loc = LanguageSelection::IsoStringToLocale(aLocaleString); + MsLangId::setConfiguredSystemLanguage( MsLangId::convertLocaleToLanguage(loc) ); + } + else + MsLangId::setConfiguredSystemLanguage( MsLangId::getSystemLanguage() ); + bSuccess = sal_True; } catch ( PropertyVetoException& ) |