diff options
| author | Eike Rathke <er@openoffice.org> | 2001-06-25 11:58:00 +0000 |
|---|---|---|
| committer | Eike Rathke <er@openoffice.org> | 2001-06-25 11:58:00 +0000 |
| commit | 3abb3f2fd0d080989b3dbdaa09b8a9eeae783037 (patch) | |
| tree | ea9dcfa5aeb67e013623cfec6a27c01475356a62 /svtools/source/numbers/zforlist.cxx | |
| parent | f6a4928fb469cbfbe68fc754ec899467761aa32e (diff) | |
#87257# use Application::GetSettings().GetLanguage() instead of System::GetLanguage()
Diffstat (limited to 'svtools/source/numbers/zforlist.cxx')
| -rw-r--r-- | svtools/source/numbers/zforlist.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/svtools/source/numbers/zforlist.cxx b/svtools/source/numbers/zforlist.cxx index b9bce64278..37470bef3e 100644 --- a/svtools/source/numbers/zforlist.cxx +++ b/svtools/source/numbers/zforlist.cxx @@ -2,9 +2,9 @@ * * $RCSfile: zforlist.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: er $ $Date: 2001-06-18 09:45:43 $ + * last change: $Author: er $ $Date: 2001-06-25 12:58:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,9 +72,6 @@ #ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> #endif -#ifndef _SYSTEM_HXX //autogen -#include <vcl/system.hxx> -#endif #ifndef _SV_SVAPP_HXX //autogen #include <vcl/svapp.hxx> #endif @@ -362,7 +359,7 @@ LanguageType SvNumberFormatter::GetProperLanguage( LanguageType eLang ) eLang = UNKNOWN_SUBSTITUTE; break; case LANGUAGE_NONE : - eLang = Application::GetAppInternational().GetLanguage(); + eLang = Application::GetSettings().GetUILanguage(); break; case LANGUAGE_PROCESS_OR_USER_DEFAULT : case LANGUAGE_SYSTEM_DEFAULT : @@ -370,7 +367,7 @@ LanguageType SvNumberFormatter::GetProperLanguage( LanguageType eLang ) break; } if ( eLang == LANGUAGE_SYSTEM ) - eLang = International::GetRealLanguage( eLang ); + eLang = Application::GetSettings().GetLanguage(); return eLang; } @@ -592,7 +589,7 @@ void SvNumberFormatter::SetFormatUsed(ULONG nFIndex) BOOL SvNumberFormatter::Load( SvStream& rStream ) { - LanguageType eSysLang = System::GetLanguage(); + LanguageType eSysLang = Application::GetSettings().GetLanguage(); SvNumberFormatter* pConverter = NULL; ImpSvNumMultipleReadHeader aHdr( rStream ); @@ -799,7 +796,7 @@ BOOL SvNumberFormatter::Save( SvStream& rStream ) const ImpSvNumMultipleWriteHeader aHdr( rStream ); // ab 364i wird gespeichert was SYSTEM wirklich war, vorher hart LANGUAGE_SYSTEM rStream << (USHORT) SV_NUMBERFORMATTER_VERSION; - rStream << (USHORT) System::GetLanguage() << (USHORT) SysLnge; + rStream << (USHORT) Application::GetSettings().GetLanguage() << (USHORT) SysLnge; SvNumberFormatTable* pTable = (SvNumberFormatTable*) &aFTable; SvNumberformat* pEntry = (SvNumberformat*) pTable->First(); while (pEntry) @@ -3175,7 +3172,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() if ( bCurrencyTableInitialized ) return ; - LanguageType eSysLang = System::GetLanguage(); + LanguageType eSysLang = Application::GetSettings().GetLanguage(); LocaleDataWrapper* pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), ConvertLanguageToLocale( eSysLang ) ); |