diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 14:18:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 14:18:15 +0000 |
| commit | 5eed5e7fcb19e1a2975876157039f7b5b68715bd (patch) | |
| tree | af1587ed9f5440a62b31d7d999597a11089b0100 /vcl/source | |
| parent | cba5c7cb7f6d6f903ab574f7c6b006107b2184c1 (diff) | |
INTEGRATION: CWS vcl08 (1.21.6.2.50); FILE MERGED
2003/04/15 14:46:42 pl 1.21.6.2.50.2: #i12870# merge from vcl07
2003/04/09 16:31:18 pl 1.21.6.2.50.1: #i12870# support non iso8859-1 type1 fonts in pdf
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index e7f12320da3a..63230a34d2da 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pdfwriter_impl.hxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: vg $ $Date: 2003-04-11 17:29:22 $ + * last change: $Author: rt $ $Date: 2003-04-17 15:18:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -291,7 +291,23 @@ public: }; typedef std::map< ImplFontData*, FontSubset > FontSubsetData; - typedef std::map< ImplFontData*, sal_Int32 > FontEmbedData; + struct EmbedCode + { + sal_Unicode m_aUnicode; + rtl::OString m_aName; + }; + struct EmbedEncoding + { + sal_Int32 m_nFontID; + std::vector< EmbedCode > m_aEncVector; + std::map< sal_Unicode, sal_Int8 > m_aCMap; + }; + struct EmbedFont + { + sal_Int32 m_nNormalFontID; + std::list< EmbedEncoding > m_aExtendedEncodings; + }; + typedef std::map< ImplFontData*, EmbedFont > FontEmbedData; private: static const BuiltinFont m_aBuiltinFonts[14]; @@ -436,8 +452,8 @@ private: bool emitHatches(); /* writes a builtin font object and returns its objectid (or 0 in case of failure ) */ sal_Int32 emitBuiltinFont( ImplFontData* pFont ); - /* writes a type1 embedded font object and returns its objectid (or 0 in case of failure ) */ - sal_Int32 emitEmbeddedFont( ImplFontData* pFont ); + /* writes a type1 embedded font object and returns its mapping from font ids to object ids (or 0 in case of failure ) */ + std::map< sal_Int32, sal_Int32 > emitEmbeddedFont( ImplFontData* pFont, EmbedFont& rEmbed ); /* writes a font descriptor and returns its object id (or 0) */ sal_Int32 emitFontDescriptor( ImplFontData* pFont, FontSubsetInfo& rInfo, sal_Int32 nSubsetID, sal_Int32 nStream ); /* writes a ToUnicode cmap, returns the corresponding stream object */ |