diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-31 12:27:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-31 12:27:28 +0000 |
| commit | de5002527605d2e8a98ad70084c3e5939860651a (patch) | |
| tree | 51860d646a0b1228a947e600d4e1c53b1d4a077f /vcl/unx | |
| parent | 66eaf1da57106fe842607ea3b2308dc574a285f6 (diff) | |
INTEGRATION: CWS pdffix02 (1.15.126); FILE MERGED
2008/03/04 10:37:53 hdu 1.15.126.2: RESYNC: (1.15-1.16); FILE MERGED
2008/01/24 16:24:18 hdu 1.15.126.1: "#i85554# minor cleanups for PDF export
- avoid hardcoded use of 16bit sal_Unicode, especially in interfaces
- improve const correctness for subsetting/embedding font candidates
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/inc/pspgraphics.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index 1823762d8893..d9a5b0703106 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -4,9 +4,9 @@ * * $RCSfile: pspgraphics.h,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2008-02-19 15:54:32 $ + * last change: $Author: kz $ $Date: 2008-03-31 13:27:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -91,13 +91,13 @@ public: sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ); - static const void* DoGetEmbedFontData( psp::fontID aFont, const sal_Unicode* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen ); + static const void* DoGetEmbedFontData( psp::fontID aFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen ); static void DoFreeEmbedFontData( const void* pData, long nLen ); - static const std::map< sal_Unicode, sal_Int32 >* DoGetFontEncodingVector( psp::fontID aFont, const std::map< sal_Unicode, rtl::OString >** pNonEncoded ); + static const Ucs2SIntMap* DoGetFontEncodingVector( psp::fontID aFont, const Ucs2OStrMap** pNonEncoded ); static void DoGetGlyphWidths( psp::fontID aFont, bool bVertical, - std::vector< sal_Int32 >& rWidths, - std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc ); + Int32Vector& rWidths, + Ucs2UIntMap& rUnicodeEnc ); static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& ); static void AnnounceFonts( ImplDevFontList*, const psp::FastPrintFontInfo& ); @@ -135,24 +135,24 @@ public: virtual void GetDevFontSubstList( OutputDevice* ); virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ); virtual BOOL CreateFontSubset( const rtl::OUString& rToFile, - ImplFontData* pFont, + const ImplFontData*, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ); - virtual const std::map< sal_Unicode, sal_Int32 >* GetFontEncodingVector( ImplFontData* pFont, const std::map< sal_Unicode, rtl::OString >** ppNonEncoded ); - virtual const void* GetEmbedFontData( ImplFontData* pFont, - const sal_Unicode* pUnicodes, + virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded ); + virtual const void* GetEmbedFontData( const ImplFontData*, + const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen ); virtual void FreeEmbedFontData( const void* pData, long nDataLen ); - virtual void GetGlyphWidths( ImplFontData* pFont, + virtual void GetGlyphWidths( const ImplFontData*, bool bVertical, - std::vector< sal_Int32 >& rWidths, - std::map< sal_Unicode, sal_uInt32 >& rUnicodeEnc ); + Int32Vector& rWidths, + Ucs2UIntMap& rUnicodeEnc ); virtual BOOL GetGlyphBoundRect( long nIndex, Rectangle& ); virtual BOOL GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); |