diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:29:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:29:39 +0000 |
| commit | 3e6ea386cbf9a8da39a32910fd153974f0c9fa03 (patch) | |
| tree | 421112d59a184de5c783b48e087dcb748783a108 | |
| parent | 2fd4720e499f0d3e6f5b66d988eda7d9e7ad75b3 (diff) | |
INTEGRATION: CWS vcl34 (1.161.12); FILE MERGED
2005/01/12 11:58:38 pl 1.161.12.2: RESYNC: (1.161-1.162); FILE MERGED
2004/12/28 13:41:23 ssa 1.161.12.1: #i39040# due to a side effect the appsettings were modified between GetSettings and SetSettings
| -rw-r--r-- | desktop/source/app/app.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 9e3a813a99e0..cddb424c71fa 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.164 $ + * $Revision: 1.165 $ * - * last change: $Author: obo $ $Date: 2005-01-27 12:26:58 $ + * last change: $Author: rt $ $Date: 2005-01-31 09:29:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1447,8 +1447,6 @@ void Desktop::Main() LanguageType eUILanguage = (LanguageType) sLanguage.ToInt32(); */ - AllSettings aSettings( Application::GetSettings() ); - //LanguageSelection langselect; OUString aUILocaleString = LanguageSelection::getLanguageString(); sal_Int32 nIndex = 0; @@ -1458,9 +1456,13 @@ void Desktop::Main() ::com::sun::star::lang::Locale aUILocale( aLanguage, aCountry, aVariant ); - aSettings.SetUILocale( aUILocale ); - LanguageType eLanguage = SvtSysLocaleOptions().GetLocaleLanguageType(); + + // #i39040#, do not call anything between GetSettings and SetSettings that might have + // a side effect on the settings (like, eg, SvtSysLocaleOptions().GetLocaleLanguageType(), + // which changes the MiscSettings !!! ) + AllSettings aSettings( Application::GetSettings() ); + aSettings.SetUILocale( aUILocale ); aSettings.SetLanguage( eLanguage ); Application::SetSettings( aSettings ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "} set locale settings" ); |