diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:44:31 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 12:44:31 +0000 |
commit | 9e8d0de6b02bc54dcfef0f0353915de82b136f74 (patch) | |
tree | d115e6ab6f908c745aa183f8d61fb804aa68e36a /psprint | |
parent | 351794ac486a0a66c6d7535e68fd9de562cdc0ce (diff) |
INTEGRATION: CWS internatiodel (1.58.12); FILE MERGED
2006/02/10 21:47:08 er 1.58.12.4: RESYNC: (1.63-1.64); FILE MERGED
2006/02/10 19:27:08 er 1.58.12.3: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006/01/21 14:59:22 er 1.58.12.2: RESYNC: (1.58-1.63); FILE MERGED
2005/06/24 13:08:49 er 1.58.12.1: #i50205# get rid of class International
Diffstat (limited to 'psprint')
-rw-r--r-- | psprint/source/fontmanager/fontmanager.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/psprint/source/fontmanager/fontmanager.cxx b/psprint/source/fontmanager/fontmanager.cxx index 93eb7088ba33..40f5d941d3a8 100644 --- a/psprint/source/fontmanager/fontmanager.cxx +++ b/psprint/source/fontmanager/fontmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fontmanager.cxx,v $ * - * $Revision: 1.66 $ + * $Revision: 1.67 $ * - * last change: $Author: obo $ $Date: 2006-03-29 11:22:03 $ + * last change: $Author: vg $ $Date: 2006-04-07 13:44:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,15 +85,15 @@ #ifndef _CONFIG_HXX #include <tools/config.hxx> #endif +#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX +#include <i18npool/mslangid.hxx> +#endif #ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> #endif #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> #endif -#ifndef _TOOLS_INTN_HXX -#include <tools/intn.hxx> -#endif #include <parseAFM.hxx> @@ -1786,7 +1786,7 @@ void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OU int nNameRecords = GetTTNameRecords( (TrueTypeFont*)pTTFont, &pNameRecords ); if( nNameRecords && pNameRecords ) { - LanguageType aLang = GetSystemLanguage(); + LanguageType aLang = MsLangId::getSystemLanguage(); int nLastMatch = -1; for( int i = 0; i < nNameRecords; i++ ) { |