diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-05-18 09:45:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-05-18 09:45:03 +0000 |
| commit | a55f3dd81682516b033c11ba2a4ffbf5fb011b63 (patch) | |
| tree | d53bbf5e654b2f1d4fbc3da97d31116ddf1b7b75 /psprint | |
| parent | ee43bb21c4dbcf861db004a688a039254ef8218c (diff) | |
INTEGRATION: CWS vcl21 (1.15.72); FILE MERGED
2004/03/25 17:54:43 pl 1.15.72.3: #i23601# merge from CWS vclpp3bugs
2004/03/23 10:48:09 pl 1.15.72.2: RESYNC: (1.15-1.16); FILE MERGED
2004/03/18 13:44:00 pl 1.15.72.1: #i23601# #i24286# #i26147# join from CWS vclpp3bugs
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/inc/psprint/fontmanager.hxx | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/psprint/inc/psprint/fontmanager.hxx b/psprint/inc/psprint/fontmanager.hxx index 204b0f74222f..c914e821702b 100644 --- a/psprint/inc/psprint/fontmanager.hxx +++ b/psprint/inc/psprint/fontmanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fontmanager.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2004-03-15 12:03:07 $ + * last change: $Author: kz $ $Date: 2004-05-18 10:45:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -333,6 +333,34 @@ class PrintFontManager virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ); }; + struct XLFDEntry + { + static const int MaskFoundry = 1; + static const int MaskFamily = 2; + static const int MaskAddStyle = 4; + static const int MaskItalic = 8; + static const int MaskWeight = 16; + static const int MaskWidth = 32; + static const int MaskPitch = 64; + static const int MaskEncoding = 128; + + int nMask; // contains a bit set for every valid member + + rtl::OString aFoundry; + rtl::OString aFamily; + rtl::OString aAddStyle; + italic::type eItalic; + weight::type eWeight; + width::type eWidth; + pitch::type ePitch; + rtl_TextEncoding aEncoding; + + XLFDEntry() { nMask = 0; } + + bool operator<(const XLFDEntry& rRight) const; + bool operator==(const XLFDEntry& rRight) const; + }; + static rtl::OString s_aEmptyOString; fontID m_nNextFontID; @@ -341,6 +369,8 @@ class PrintFontManager std::list< rtl::OUString > m_aPrinterDrivers; std::list< rtl::OString > m_aFontDirectories; std::list< int > m_aPrivateFontDirectories; + std::map< struct XLFDEntry, std::list< struct XLFDEntry > > + m_aXLFD_Aliases; utl::MultiAtomProvider* m_pAtoms; // for speeding up findFontFileID std::hash_map< rtl::OString, std::set< fontID >, rtl::OStringHash > @@ -363,7 +393,7 @@ class PrintFontManager rtl::OString getAfmFile( PrintFont* pFont ) const; rtl::OString getFontFile( PrintFont* pFont ) const; - void getFontAttributesFromXLFD( PrintFont* pFont, const ByteString& rXLFD ) const; + void getFontAttributesFromXLFD( PrintFont* pFont, const std::list< rtl::OString >& rXLFDs ) const; bool analyzeFontFile( int nDirID, const rtl::OString& rFileName, bool bReadFile, const std::list< rtl::OString >& rXLFDs, std::list< PrintFont* >& rNewFonts ) const; rtl::OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code @@ -397,6 +427,10 @@ class PrintFontManager // called from initialize() bool initFontconfig(); + static bool parseXLFD( const rtl::OString& rXLFD, XLFDEntry& rEntry ); + void parseXLFD_appendAliases( const std::list< rtl::OString >& rXLFDs, std::list< XLFDEntry >& rEntries ) const; + void initFontsAlias(); + PrintFontManager(); ~PrintFontManager(); public: |