Tag: cws_src680_internatiodel User: er Date: 06/02/10 11:28:16 Modified: /dba/dbaccess/source/core/api/ SingleSelectQueryComposer.cxx, querycomposer.cxx /dba/dbaccess/source/core/misc/ userinformation.cxx /dba/dbaccess/source/ui/app/ AppView.cxx /dba/dbaccess/source/ui/dlg/ paramdialog.cxx /dba/dbaccess/source/ui/misc/ DExport.cxx /dba/dbaccess/source/ui/querydesign/ QueryDesignView.cxx /dba/dbaccess/source/ui/tabledesign/ TableDesignView.cxx /dba/dbaccess/util/ makefile.mk
Log: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.12&r2=1.12.22.1 Delta lines: +3 -6 ------------------- --- SingleSelectQueryComposer.cxx 21 Dec 2005 13:34:19 -0000 1.12 +++ SingleSelectQueryComposer.cxx 10 Feb 2006 19:28:11 -0000 1.12.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: SingleSelectQueryComposer.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.22.1 $ * - * last change: $Author: obo $ $Date: 2005/12/21 13:34:19 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,9 +85,6 @@ #endif #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> #endif #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> File [changed]: querycomposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/querycomposer.cxx?r1=1.62&r2=1.62.78.1 Delta lines: +3 -6 ------------------- --- querycomposer.cxx 8 Sep 2005 10:08:04 -0000 1.62 +++ querycomposer.cxx 10 Feb 2006 19:28:11 -0000 1.62.78.1 @@ -4,9 +4,9 @@ * * $RCSfile: querycomposer.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.62.78.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 10:08:04 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,9 +77,6 @@ #endif #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> #endif #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: userinformation.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/userinformation.cxx?r1=1.6&r2=1.6.80.1 Delta lines: +7 -9 ------------------- --- userinformation.cxx 8 Sep 2005 13:57:35 -0000 1.6 +++ userinformation.cxx 10 Feb 2006 19:28:12 -0000 1.6.80.1 @@ -4,9 +4,9 @@ * * $RCSfile: userinformation.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.80.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 13:57:35 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,8 +40,8 @@ #ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _UTL_CONFIGMGR_HXX_ #include <unotools/configmgr.hxx> @@ -58,9 +58,7 @@ UserInformation::UserInformation() { Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); - LanguageType eLanguage = ConvertIsoStringToLanguage(comphelper::getString(aValue),'-'); - UniString sLanguage, sCountry; - ConvertLanguageToIsoNames(eLanguage, sLanguage, sCountry); - m_aUserLocale = Locale(sLanguage,sCountry,::rtl::OUString()); + LanguageType eLanguage = MsLangId::convertIsoStringToLanguage(comphelper::getString(aValue),'-'); + m_aUserLocale = MsLangId::convertLanguageToLocale(eLanguage); } Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.12&r2=1.12.18.1 Delta lines: +3 -6 ------------------- --- AppView.cxx 3 Jan 2006 16:16:56 -0000 1.12 +++ AppView.cxx 10 Feb 2006 19:28:12 -0000 1.12.18.1 @@ -4,9 +4,9 @@ * * $RCSfile: AppView.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.18.1 $ * - * last change: $Author: kz $ $Date: 2006/01/03 16:16:56 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,9 +73,6 @@ #endif #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #include <com/sun/star/sdb/XQueriesSupplier.hpp> -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX #include <svtools/syslocale.hxx> Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: paramdialog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/paramdialog.cxx?r1=1.11&r2=1.11.72.1 Delta lines: +3 -6 ------------------- --- paramdialog.cxx 23 Sep 2005 12:31:50 -0000 1.11 +++ paramdialog.cxx 10 Feb 2006 19:28:12 -0000 1.11.72.1 @@ -4,9 +4,9 @@ * * $RCSfile: paramdialog.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.72.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:31:50 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,9 +68,6 @@ #endif #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> #endif #ifndef _DBAUI_LOCALRESACCESS_HXX_ #include "localresaccess.hxx" Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: DExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/DExport.cxx?r1=1.26&r2=1.26.70.1 Delta lines: +7 -11 -------------------- --- DExport.cxx 23 Sep 2005 12:36:23 -0000 1.26 +++ DExport.cxx 10 Feb 2006 19:28:13 -0000 1.26.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: DExport.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.26.70.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:36:23 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,8 +105,8 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> #endif #ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include <com/sun/star/awt/FontDescriptor.hpp> @@ -207,9 +207,7 @@ m_nLocale = aSysLocale.GetLocaleData().getLocale(); // Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); // m_nLocale.Language = ::comphelper::getString(aValue); -// String sLanguage, sCountry; -// ConvertLanguageToIsoNames(Window::GetSettings().GetLanguage(), sLanguage, sCountry); -// m_nLocale = Locale(sLanguage, sCountry, ::rtl::OUString()); +// m_nLocale = MsLangId::convertLanguageToLocale(Window::GetSettings().GetLanguage()); } catch(Exception&) { @@ -246,9 +244,7 @@ m_nLocale = aSysLocale.GetLocaleData().getLocale(); // Any aValue = ConfigManager::GetDirectConfigProperty(ConfigManager::LOCALE); // m_nLocale.Language = ::comphelper::getString(aValue); -// String sLanguage, sCountry; -// ConvertLanguageToIsoNames(Window::GetSettings().GetLanguage(), sLanguage, sCountry); -// m_nLocale = Locale(sLanguage, sCountry, ::rtl::OUString()); +// m_nLocale = MsLangId::convertLanguageToLocale(Window::GetSettings().GetLanguage()); } catch(Exception&) { Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.76&r2=1.76.70.1 Delta lines: +3 -6 ------------------- --- QueryDesignView.cxx 23 Sep 2005 12:43:07 -0000 1.76 +++ QueryDesignView.cxx 10 Feb 2006 19:28:13 -0000 1.76.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.76 $ + * $Revision: 1.76.70.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:43:07 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -124,9 +124,6 @@ #endif #ifndef DBAUI_QUERYCONTAINERWINDOW_HXX #include "querycontainerwindow.hxx" -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> #endif #ifndef DBAUI_QUERYTABLEVIEW_HXX #include "QueryTableView.hxx" Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableDesignView.cxx?r1=1.25&r2=1.25.72.1 Delta lines: +3 -6 ------------------- --- TableDesignView.cxx 23 Sep 2005 12:46:52 -0000 1.25 +++ TableDesignView.cxx 10 Feb 2006 19:28:14 -0000 1.25.72.1 @@ -4,9 +4,9 @@ * * $RCSfile: TableDesignView.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.72.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:46:52 $ + * last change: $Author: er $ $Date: 2006/02/10 19:28:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,9 +67,6 @@ #endif #ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XCLIPBOARD_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> -#endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX #include <svtools/syslocale.hxx> Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.25&r2=1.25.80.1 Delta lines: +4 -3 ------------------- --- makefile.mk 8 Sep 2005 16:54:13 -0000 1.25 +++ makefile.mk 10 Feb 2006 19:28:14 -0000 1.25.80.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.25 $ +# $Revision: 1.25.80.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 16:54:13 $ +# last change: $Author: er $ $Date: 2006/02/10 19:28:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,6 +66,7 @@ $(VCLLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ + $(I18NISOLANGLIB) \ $(DBTOOLSLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
