diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:11:06 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:11:06 +0000 |
| commit | a55617ea2061b1cc1e47f105f56e9d7f88c6fd51 (patch) | |
| tree | 5d5efd8a03210915d3bf442d975878d0e8118e59 /connectivity | |
| parent | 14b0ea8c39172f5755b384b3dedaf7393ff5f852 (diff) | |
INTEGRATION: CWS internatiodel (1.25.26); FILE MERGED
2006/02/10 19:23:33 er 1.25.26.3: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId
2006/01/19 15:18:53 er 1.25.26.2: RESYNC: (1.25-1.26); FILE MERGED
2005/06/24 13:07:46 er 1.25.26.1: #i50205# get rid of class International
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/file/fcode.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 00b6d475c031..38a5daa5c26c 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fcode.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2005-09-08 05:58:22 $ + * last change: $Author: vg $ $Date: 2006-04-07 13:11:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,11 +42,8 @@ #ifndef _CONNECTIVITY_SQLPARSE_HXX #include "connectivity/sqlparse.hxx" #endif -#ifndef _TOOLS_INTN_HXX -#include <tools/intn.hxx> -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> @@ -340,7 +337,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con static String sLanguage; static String sCountry; if (!sLanguage.Len()) - ConvertLanguageToIsoNames(Application::GetAppInternational().GetLanguage(), sLanguage, sCountry); + MsLangId::convertLanguageToIsoNames(Application::GetAppInternational().GetLanguage(), sLanguage, sCountry); static rtl::OLocale aLocale = rtl::OLocale::registerLocale(sLanguage, sCountry); INT32 nRes = compareIgnoreCase(aLH, aRH, aLocale); |