diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 14:58:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 14:58:33 +0000 |
| commit | 0c5d58b4b00798948a4bd7b4e48ce25648b8cce9 (patch) | |
| tree | 677dbc916f6cff642001c62583d9870ae1834070 | |
| parent | f93d87325e90797b61211dd6ee91bd34cf74af05 (diff) | |
INTEGRATION: CWS internatiodel (1.11.222); FILE MERGED
2006/02/10 19:32:07 er 1.11.222.3: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006/01/19 17:31:06 er 1.11.222.2: RESYNC: (1.11-1.12); FILE MERGED
2005/06/24 13:12:43 er 1.11.222.1: #i50205# get rid of class International
| -rw-r--r-- | svtools/source/control/ctrltool.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 1893415c49a5..d8491be4f5a6 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ctrltool.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:00:34 $ + * last change: $Author: vg $ $Date: 2006-04-07 15:58:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,12 +37,12 @@ #include <string.h> -#ifndef TOOLS_INTN_HXX -#include <tools/intn.hxx> -#endif #ifndef TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> +#endif #ifndef _VCL_WINDOW_HXX #include <vcl/window.hxx> #endif @@ -933,7 +933,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage ) if ( eLanguage == LANGUAGE_DONTKNOW ) eLanguage = Application::GetSettings().GetUILanguage(); if ( eLanguage == LANGUAGE_SYSTEM ) - eLanguage = ::GetSystemUILanguage(); + eLanguage = MsLangId::getSystemUILanguage(); switch( eLanguage ) { |