Tag: cws_src680_internatiodel User: er Date: 06/02/10 11:23:47 Modified: /dba/connectivity/source/drivers/evoab/ LFolderList.cxx, LTable.cxx, makefile.mk /dba/connectivity/source/drivers/file/ fcode.cxx /dba/connectivity/source/drivers/flat/ ETable.cxx, makefile.mk
Log: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId File Changes: Directory: /dba/connectivity/source/drivers/evoab/ ================================================== File [changed]: LFolderList.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LFolderList.cxx?r1=1.6.52.2&r2=1.6.52.3 Delta lines: +7 -9 ------------------- --- LFolderList.cxx 19 Jan 2006 14:53:44 -0000 1.6.52.2 +++ LFolderList.cxx 10 Feb 2006 19:23:20 -0000 1.6.52.3 @@ -4,9 +4,9 @@ * * $RCSfile: LFolderList.cxx,v $ * - * $Revision: 1.6.52.2 $ + * $Revision: 1.6.52.3 $ * - * last change: $Author: er $ $Date: 2006/01/19 14:53:44 $ + * last change: $Author: er $ $Date: 2006/02/10 19:23:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -94,8 +94,8 @@ #ifndef _UTL_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _DBHELPER_DBCONVERSION_HXX_ #include "connectivity/dbconversion.hxx" @@ -371,11 +371,9 @@ void OEvoabFolderList::construct() { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); - LanguageType eLanguage = ConvertIsoStringToLanguage(comphelper::getString(aValue),'-'); + LanguageType eLanguage = MsLangId::convertIsoStringToLanguage(comphelper::getString(aValue),'-'); - String sLanguage, sCountry; - ConvertLanguageToIsoNames(eLanguage, sLanguage, sCountry); - ::com::sun::star::lang::Locale aAppLocale(sLanguage,sCountry,rtl::OUString()); + ::com::sun::star::lang::Locale aAppLocale(MsLangId::convertLanguageToLocale(eLanguage)); Sequence< ::com::sun::star::uno::Any > aArg(1); aArg[0] <<= aAppLocale; File [changed]: LTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LTable.cxx?r1=1.9.52.2&r2=1.9.52.3 Delta lines: +7 -9 ------------------- --- LTable.cxx 19 Jan 2006 14:58:09 -0000 1.9.52.2 +++ LTable.cxx 10 Feb 2006 19:23:25 -0000 1.9.52.3 @@ -4,9 +4,9 @@ * * $RCSfile: LTable.cxx,v $ * - * $Revision: 1.9.52.2 $ + * $Revision: 1.9.52.3 $ * - * last change: $Author: er $ $Date: 2006/01/19 14:58:09 $ + * last change: $Author: er $ $Date: 2006/02/10 19:23:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -93,8 +93,8 @@ #ifndef _UTL_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _DBHELPER_DBCONVERSION_HXX_ #include "connectivity/dbconversion.hxx" @@ -389,11 +389,9 @@ void OEvoabTable::construct() { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); - LanguageType eLanguage = ConvertIsoStringToLanguage(comphelper::getString(aValue),'-'); + LanguageType eLanguage = MsLangId::convertIsoStringToLanguage(comphelper::getString(aValue),'-'); - String sLanguage, sCountry; - ConvertLanguageToIsoNames(eLanguage, sLanguage, sCountry); - ::com::sun::star::lang::Locale aAppLocale(sLanguage,sCountry,rtl::OUString()); + ::com::sun::star::lang::Locale aAppLocale(MsLangId::convertLanguageToLocale(eLanguage)); Sequence< ::com::sun::star::uno::Any > aArg(1); aArg[0] <<= aAppLocale; File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/makefile.mk?r1=1.3&r2=1.3.64.1 Delta lines: +4 -3 ------------------- --- makefile.mk 8 Sep 2005 05:48:40 -0000 1.3 +++ makefile.mk 10 Feb 2006 19:23:27 -0000 1.3.64.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.64.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 05:48:40 $ +# last change: $Author: er $ $Date: 2006/02/10 19:23:27 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -86,6 +86,7 @@ $(SVLLIB) \ $(SVLIB) \ $(TOOLSLIB) \ + $(I18NISOLANGLIB) \ $(SVTOOLLIB) \ $(SVTLIB) \ $(UNOTOOLSLIB) \ Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: fcode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/fcode.cxx?r1=1.25.26.2&r2=1.25.26.3 Delta lines: +6 -6 ------------------- --- fcode.cxx 19 Jan 2006 15:18:53 -0000 1.25.26.2 +++ fcode.cxx 10 Feb 2006 19:23:33 -0000 1.25.26.3 @@ -4,9 +4,9 @@ * * $RCSfile: fcode.cxx,v $ * - * $Revision: 1.25.26.2 $ + * $Revision: 1.25.26.3 $ * - * last change: $Author: er $ $Date: 2006/01/19 15:18:53 $ + * last change: $Author: er $ $Date: 2006/02/10 19:23:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,8 +42,8 @@ #ifndef _CONNECTIVITY_SQLPARSE_HXX #include "connectivity/sqlparse.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> @@ -337,7 +337,7 @@ 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); Directory: /dba/connectivity/source/drivers/flat/ ================================================= File [changed]: ETable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/flat/ETable.cxx?r1=1.48.52.2&r2=1.48.52.3 Delta lines: +7 -9 ------------------- --- ETable.cxx 19 Jan 2006 15:24:32 -0000 1.48.52.2 +++ ETable.cxx 10 Feb 2006 19:23:40 -0000 1.48.52.3 @@ -4,9 +4,9 @@ * * $RCSfile: ETable.cxx,v $ * - * $Revision: 1.48.52.2 $ + * $Revision: 1.48.52.3 $ * - * last change: $Author: er $ $Date: 2006/01/19 15:24:32 $ + * last change: $Author: er $ $Date: 2006/02/10 19:23:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -93,8 +93,8 @@ #ifndef _UTL_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _DBHELPER_DBCONVERSION_HXX_ #include "connectivity/dbconversion.hxx" @@ -377,11 +377,9 @@ void OFlatTable::construct() { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); - LanguageType eLanguage = ConvertIsoStringToLanguage(comphelper::getString(aValue),'-'); + LanguageType eLanguage = MsLangId::convertIsoStringToLanguage(comphelper::getString(aValue),'-'); - String sLanguage, sCountry; - ConvertLanguageToIsoNames(eLanguage, sLanguage, sCountry); - ::com::sun::star::lang::Locale aAppLocale(sLanguage,sCountry,rtl::OUString()); + ::com::sun::star::lang::Locale aAppLocale(MsLangId::convertLanguageToLocale(eLanguage)); Sequence< ::com::sun::star::uno::Any > aArg(1); aArg[0] <<= aAppLocale; File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/flat/makefile.mk?r1=1.14&r2=1.14.64.1 Delta lines: +4 -3 ------------------- --- makefile.mk 8 Sep 2005 06:02:20 -0000 1.14 +++ makefile.mk 10 Feb 2006 19:23:43 -0000 1.14.64.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.14.64.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 06:02:20 $ +# last change: $Author: er $ $Date: 2006/02/10 19:23:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -94,6 +94,7 @@ $(SVLLIB) \ $(SVLIB) \ $(TOOLSLIB) \ + $(I18NISOLANGLIB) \ $(SVTOOLLIB) \ $(SVTLIB) \ $(UNOTOOLSLIB) \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
