From 4ae1d0deef83804fa8cb97c89cd8a47f4a192a8c Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 13 Oct 2004 07:21:47 +0000 Subject: INTEGRATION: CWS vcl27 (1.19.8); FILE MERGED 2004/09/17 14:23:10 pl 1.19.8.3: RESYNC: (1.19-1.20); FILE MERGED 2004/09/07 13:28:07 pl 1.19.8.2: #i33658# fix a NULL pointer access 2004/08/31 14:10:06 pl 1.19.8.1: #i33623# use ui locale for font match --- psprint/inc/psprint/fontmanager.hxx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'psprint') diff --git a/psprint/inc/psprint/fontmanager.hxx b/psprint/inc/psprint/fontmanager.hxx index 65e302150f31..db863d255228 100644 --- a/psprint/inc/psprint/fontmanager.hxx +++ b/psprint/inc/psprint/fontmanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fontmanager.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2004-09-08 13:59:23 $ + * last change: $Author: hr $ $Date: 2004-10-13 08:21:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,10 @@ #include #endif +#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ +#include +#endif + #define ATOM_FAMILYNAME 2 #define ATOM_PSNAME 3 @@ -433,7 +437,7 @@ class PrintFontManager it = m_aFonts.find( nID ); return it == m_aFonts.end() ? NULL : it->second; } - ByteString getXLFD( PrintFont* pFont ) const; + rtl::OString getXLFD( PrintFont* pFont ) const; void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const; void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const; @@ -710,11 +714,16 @@ public:
  • pitch
    • + @param rLocale + if rLocal contains non empty strings the corresponding + locale will be used for font matching also; e.g. "Sans" can result + in different fonts in e.g. english and japanese + @returns true if a match was found false else */ - bool matchFont( FastPrintFontInfo& rInfo ); + bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale ); }; } // namespace -- cgit