diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 08:33:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 08:33:38 +0000 |
| commit | 5daebe6319a273999739c7c6d4b523bb671cf5ec (patch) | |
| tree | f6f013692c1cef9e67d73f10852774fa9b796ff0 /vcl/unx/inc | |
| parent | e4ee909339331b04c42ba5ac714e63531004f703 (diff) | |
INTEGRATION: CWS fontlists02 (1.2.48); FILE MERGED
2004/05/19 15:56:11 hdu 1.2.48.3: #i26679# create font technology specific cache entries
2004/05/12 14:04:10 hdu 1.2.48.2: #i26679# renamed FontStruct to FontAttributes
2004/03/26 09:38:07 hdu 1.2.48.1: #i26679# resolve remaining conflicts caused by new pspgraphics.cxx
Diffstat (limited to 'vcl/unx/inc')
| -rw-r--r-- | vcl/unx/inc/pspgraphics.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index 3eaacd6a0b44..92e16a8f7c54 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -2,9 +2,9 @@ * * $RCSfile: pspgraphics.h,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-06-17 12:25:37 $ + * last change: $Author: rt $ $Date: 2004-07-13 09:33:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,7 @@ namespace psp { struct JobData; class PrinterGfx; } #endif class ServerFont; +class ImplDevFontAttributes; class PspGraphics : public SalGraphics { @@ -111,7 +112,8 @@ public: static const void* DoGetEmbedFontData( psp::fontID aFont, const sal_Unicode* 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 void SetImplFontData( const psp::FastPrintFontInfo& aInfo, ImplFontData& rData ); + static ImplDevFontAttributes Info2DevFontAttributes( const psp::FastPrintFontInfo& ); + static void AnnounceFonts( ImplDevFontList*, const psp::FastPrintFontInfo& ); static FontWidth ToFontWidth (psp::width::type eWidth); static FontWeight ToFontWeight (psp::weight::type eWeight); static FontPitch ToFontPitch (psp::pitch::type ePitch); @@ -132,22 +134,19 @@ public: virtual void SetLineColor(); virtual void SetLineColor( SalColor nSalColor ); virtual void SetFillColor(); - virtual void SetFillColor( SalColor nSalColor ); - virtual void SetXORMode( BOOL bSet ); - virtual void SetROPLineColor( SalROPColor nROPColor ); virtual void SetROPFillColor( SalROPColor nROPColor ); virtual void SetTextColor( SalColor nSalColor ); - virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); + virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData* ); virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); - virtual ULONG GetFontCodeRanges( sal_uInt32* pCodePairs ) const; + virtual ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); - virtual ImplFontData* AddTempDevFont( const String& rFileURL, const String& rFontName ); + virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ); virtual BOOL CreateFontSubset( const rtl::OUString& rToFile, ImplFontData* pFont, sal_Int32* pGlyphIDs, |