diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:03:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 15:03:38 +0000 |
| commit | ab86a6675ad3940af297081183a328a00eb53a10 (patch) | |
| tree | 81f15be795243875be987811b159ae574c8f47f7 /svtools/source/numbers/zforscan.cxx | |
| parent | 19223c145236953f9ae24eb13346147dbe04bd64 (diff) | |
INTEGRATION: CWS internatiodel (1.42.18); FILE MERGED
2006/02/10 19:32:09 er 1.42.18.2: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006/01/25 16:06:22 er 1.42.18.1: RESYNC: adapt merged code
Diffstat (limited to 'svtools/source/numbers/zforscan.cxx')
| -rw-r--r-- | svtools/source/numbers/zforscan.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/svtools/source/numbers/zforscan.cxx b/svtools/source/numbers/zforscan.cxx index 0ec087df5475..316aa13b64b9 100644 --- a/svtools/source/numbers/zforscan.cxx +++ b/svtools/source/numbers/zforscan.cxx @@ -4,9 +4,9 @@ * * $RCSfile: zforscan.cxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: kz $ $Date: 2006-01-05 14:43:21 $ + * last change: $Author: vg $ $Date: 2006-04-07 16:03:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,11 +41,8 @@ #ifndef _DEBUG_HXX //autogen #include <tools/debug.hxx> #endif -#ifndef _INTN_HXX //autogen -// #include <tools/intn.hxx> -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _UNOTOOLS_CHARCLASS_HXX #include <unotools/charclass.hxx> @@ -219,7 +216,7 @@ void ImpSvNumberformatScan::SetDependentKeywords() // #80023# be sure to generate keywords for the loaded Locale, not for the // requested Locale, otherwise number format codes might not match lang::Locale aLoadedLocale = pLocaleData->getLoadedLocale(); - LanguageType eLang = ConvertIsoNamesToLanguage( aLoadedLocale.Language, aLoadedLocale.Country ); + LanguageType eLang = MsLangId::convertLocaleToLanguage( aLoadedLocale ); NumberFormatCodeWrapper aNumberFormatCode( pFormatter->GetServiceManager(), aLoadedLocale ); i18n::NumberFormatCode aFormat = aNumberFormatCode.getFormatCode( NF_NUMBER_STANDARD ); @@ -550,8 +547,8 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos } // The Thai T NatNum modifier during Xcl import. if (i == 0 && bConvertMode && sString.GetChar(0) == 'T' && eTmpLnge == - LANGUAGE_ENGLISH_US && SvNumberFormatter::GetProperLanguage( - eNewLnge) == LANGUAGE_THAI) + LANGUAGE_ENGLISH_US && MsLangId::getRealLanguage( eNewLnge) == + LANGUAGE_THAI) i = NF_KEY_THAI_T; return i; // 0 => not found } |