diff options
Diffstat (limited to 'desktop/source/app/langselect.cxx')
| -rw-r--r-- | desktop/source/app/langselect.cxx | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index e9a39207cb50..e8b50cdd295e 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -39,7 +39,7 @@ #include <rtl/string.hxx> #endif #ifndef _SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #include <tools/resid.hxx> #include <i18npool/mslangid.hxx> @@ -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& ) |