summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/aqua/salgdi.h12
-rw-r--r--vcl/inc/generic/genpspgraphics.h8
-rw-r--r--vcl/inc/headless/svpgdi.hxx8
-rw-r--r--vcl/inc/ios/salcoretextfontutils.hxx4
-rw-r--r--vcl/inc/ios/salgdi.h10
-rw-r--r--vcl/inc/outdev.h14
-rw-r--r--vcl/inc/outfont.hxx40
-rw-r--r--vcl/inc/salgdi.hxx10
-rw-r--r--vcl/inc/sallayout.hxx12
-rw-r--r--vcl/inc/unx/salgdi.h8
-rw-r--r--vcl/inc/win/salgdi.h12
11 files changed, 69 insertions, 69 deletions
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 271b63efe632..0788095f798c 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -50,14 +50,14 @@ class ImplDevFontAttributes;
struct CGRect;
// mac specific physically available font face
-class ImplMacFontData : public ImplFontData
+class ImplMacFontData : public PhysicalFontFace
{
public:
ImplMacFontData( const ImplDevFontAttributes&, ATSUFontID );
virtual ~ImplMacFontData();
- virtual ImplFontData* Clone() const;
+ virtual PhysicalFontFace* Clone() const;
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const;
virtual sal_IntPtr GetFontId() const;
@@ -298,7 +298,7 @@ public:
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData* pFont,
+ const PhysicalFontFace* pFont,
long* pGlyphIDs,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
@@ -313,7 +313,7 @@ public:
// glyphs with only a name) exist it is set to the corresponding
// map for non encoded glyphs; the encoding vector contains -1
// as encoding for these cases
- virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
// GetEmbedFontData: gets the font data for a font marked
// embeddable by GetDevFontList or NULL in case of error
@@ -322,7 +322,7 @@ public:
// pWidths MUST support at least 256 members;
// rInfo: additional outgoing information
// pDataLen: out parameter, contains the byte length of the returned buffer
- virtual const void* GetEmbedFontData( const ImplFontData*,
+ virtual const void* GetEmbedFontData( const PhysicalFontFace*,
const sal_Ucs* pUnicodes,
sal_Int32* pWidths,
FontSubsetInfo& rInfo,
@@ -330,7 +330,7 @@ public:
// frees the font data again
virtual void FreeEmbedFontData( const void* pData, long nDataLen );
- virtual void GetGlyphWidths( const ImplFontData*,
+ virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index c09849679968..177f09a20b46 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -107,21 +107,21 @@ public:
virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData*,
+ const PhysicalFontFace*,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphs,
FontSubsetInfo& rInfo
);
- virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
- virtual const void* GetEmbedFontData( const ImplFontData*,
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
+ virtual const void* GetEmbedFontData( const PhysicalFontFace*,
const sal_Ucs* pUnicodes,
sal_Int32* pWidths,
FontSubsetInfo& rInfo,
long* pDataLen );
virtual void FreeEmbedFontData( const void* pData, long nDataLen );
- virtual void GetGlyphWidths( const ImplFontData*,
+ virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 906a76eca59e..9f2f9131025b 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -108,21 +108,21 @@ public:
virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData*,
+ const PhysicalFontFace*,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphs,
FontSubsetInfo& rInfo
);
- virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
- virtual const void* GetEmbedFontData( const ImplFontData*,
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
+ virtual const void* GetEmbedFontData( const PhysicalFontFace*,
const sal_Ucs* pUnicodes,
sal_Int32* pWidths,
FontSubsetInfo& rInfo,
long* pDataLen );
virtual void FreeEmbedFontData( const void* pData, long nDataLen );
- virtual void GetGlyphWidths( const ImplFontData*,
+ virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
diff --git a/vcl/inc/ios/salcoretextfontutils.hxx b/vcl/inc/ios/salcoretextfontutils.hxx
index bcc399c5c1f6..1490e08c51fe 100644
--- a/vcl/inc/ios/salcoretextfontutils.hxx
+++ b/vcl/inc/ios/salcoretextfontutils.hxx
@@ -39,12 +39,12 @@ class ImplDevFontList;
#include "outfont.hxx"
#include "impfont.hxx"
-class ImplCoreTextFontData : public ImplFontData
+class ImplCoreTextFontData : public PhysicalFontFace
{
public:
ImplCoreTextFontData(const ImplDevFontAttributes&, CTFontRef font);
virtual ~ImplCoreTextFontData();
- virtual ImplFontData* Clone() const;
+ virtual PhysicalFontFace* Clone() const;
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const;
virtual sal_IntPtr GetFontId() const { return (sal_IntPtr)m_CTFontRef;};
CTFontRef GetCTFont() const { return m_CTFontRef; };
diff --git a/vcl/inc/ios/salgdi.h b/vcl/inc/ios/salgdi.h
index 2828b4e0f1b5..1d9ef632dd79 100644
--- a/vcl/inc/ios/salgdi.h
+++ b/vcl/inc/ios/salgdi.h
@@ -239,7 +239,7 @@ public:
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData* pFont,
+ const PhysicalFontFace* pFont,
long* pGlyphIDs,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
@@ -253,7 +253,7 @@ public:
// glyphs with only a name) exist it is set to the corresponding
// map for non encoded glyphs; the encoding vector contains -1
// as encoding for these cases
- virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
// GetEmbedFontData: gets the font data for a font marked
// embeddable by GetDevFontList or NULL in case of error
@@ -262,7 +262,7 @@ public:
// pWidths MUST support at least 256 members;
// rInfo: additional outgoing information
// pDataLen: out parameter, contains the byte length of the returned buffer
- virtual const void* GetEmbedFontData( const ImplFontData*,
+ virtual const void* GetEmbedFontData( const PhysicalFontFace*,
const sal_Ucs* pUnicodes,
sal_Int32* pWidths,
FontSubsetInfo& rInfo,
@@ -270,7 +270,7 @@ public:
// frees the font data again
virtual void FreeEmbedFontData( const void* pData, long nDataLen );
- virtual void GetGlyphWidths( const ImplFontData*,
+ virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
@@ -297,7 +297,7 @@ private:
void Pattern50Fill();
UInt32 getState( ControlState nState );
UInt32 getTrackState( ControlState nState );
- bool GetRawFontData( const ImplFontData* pFontData,
+ bool GetRawFontData( const PhysicalFontFace* pFontData,
std::vector<unsigned char>& rBuffer,
bool* pJustCFF );
};
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 090fd887d502..614bfd7eba63 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -70,19 +70,19 @@ public:
bool IsScalable() const { return mpFirst->IsScalable(); }
int GetMinQuality() const { return mnMinQuality; }
- bool AddFontFace( ImplFontData* );
+ bool AddFontFace( PhysicalFontFace* );
void InitMatchData( const utl::FontSubstConfiguration&,
const String& rSearchName );
- ImplFontData* FindBestFontFace( const FontSelectPattern& rFSD ) const;
+ PhysicalFontFace* FindBestFontFace( const FontSelectPattern& rFSD ) const;
void GetFontHeights( std::set<int>& rHeights ) const;
void UpdateDevFontList( ImplGetDevFontList& ) const;
void UpdateCloneFontList( ImplDevFontList&,
- bool bScalable, bool bEmbeddable ) const;
+ bool bScalable, bool bEmbeddable ) const;
private:
friend class ImplDevFontList; // TODO: remove soon
- ImplFontData* mpFirst; // linked list of physical font faces
+ PhysicalFontFace* mpFirst; // linked list of physical font faces
String maName; // Fontname (original font family name)
String maSearchName; // normalized font family name
String maMapNames; // fontname aliases
@@ -106,12 +106,12 @@ friend class ImplDevFontList; // TODO: remove soon
class ImplGetDevFontList
{
private:
- std::vector<ImplFontData*> maDevFontVector;
+ std::vector<PhysicalFontFace*> maDevFontVector;
public:
ImplGetDevFontList() { maDevFontVector.reserve(1024); }
- void Add( ImplFontData* pFace ) { maDevFontVector.push_back( pFace ); }
- ImplFontData* Get( int nIndex ) const { return maDevFontVector[ nIndex ]; }
+ void Add( PhysicalFontFace* pFace ) { maDevFontVector.push_back( pFace ); }
+ PhysicalFontFace* Get( int nIndex ) const { return maDevFontVector[ nIndex ]; }
int Count() const { return maDevFontVector.size(); }
};
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 19c2c3a855a3..70398d637737 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -107,19 +107,19 @@ public: // TODO: hide members behind accessor methods
};
// ----------------
-// - ImplFontData -
+// - PhysicalFontFace -
// ----------------
-// TODO: rename ImplFontData to PhysicalFontFace
+// DONE: rename ImplFontData to PhysicalFontFace
// TODO: no more direct access to members
// TODO: add reference counting
// TODO: get rid of height/width for scalable fonts
// TODO: make cloning cheaper
// abstract base class for physical font faces
-class VCL_PLUGIN_PUBLIC ImplFontData : public ImplDevFontAttributes
+class VCL_PLUGIN_PUBLIC PhysicalFontFace : public ImplDevFontAttributes
{
public:
- // by using an ImplFontData object as a factory for its corresponding
+ // by using an PhysicalFontFace object as a factory for its corresponding
// ImplFontEntry an ImplFontEntry can be extended to cache device and
// font instance specific data
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const = 0;
@@ -130,17 +130,17 @@ public:
int GetFontMagic() const { return mnMagic; }
bool IsScalable() const { return (mnHeight == 0); }
bool CheckMagic( int n ) const { return (n == mnMagic); }
- ImplFontData* GetNextFace() const { return mpNext; }
- ImplFontData* CreateAlias() const { return Clone(); }
+ PhysicalFontFace* GetNextFace() const { return mpNext; }
+ PhysicalFontFace* CreateAlias() const { return Clone(); }
bool IsBetterMatch( const FontSelectPattern&, FontMatchStatus& ) const;
- StringCompare CompareWithSize( const ImplFontData& ) const;
- StringCompare CompareIgnoreSize( const ImplFontData& ) const;
- virtual ~ImplFontData() {}
- virtual ImplFontData* Clone() const = 0;
+ StringCompare CompareWithSize( const PhysicalFontFace& ) const;
+ StringCompare CompareIgnoreSize( const PhysicalFontFace& ) const;
+ virtual ~PhysicalFontFace() {}
+ virtual PhysicalFontFace* Clone() const = 0;
protected:
- explicit ImplFontData( const ImplDevFontAttributes&, int nMagic );
+ explicit PhysicalFontFace( const ImplDevFontAttributes&, int nMagic );
void SetBitmapSize( int nW, int nH ) { mnWidth=nW; mnHeight=nH; }
long mnWidth; // Width (in pixels)
@@ -149,7 +149,7 @@ protected:
private:
friend class ImplDevFontListData;
const int mnMagic; // poor man's RTTI
- ImplFontData* mpNext;
+ PhysicalFontFace* mpNext;
};
// ----------------------
@@ -160,9 +160,9 @@ class FontSelectPattern : public ImplFontAttributes
{
public:
FontSelectPattern( const Font&, const String& rSearchName,
- const Size&, float fExactHeight );
- FontSelectPattern( const ImplFontData&, const Size&,
- float fExactHeight, int nOrientation, bool bVertical );
+ const Size&, float fExactHeight );
+ FontSelectPattern( const PhysicalFontFace&, const Size&,
+ float fExactHeight, int nOrientation, bool bVertical );
public: // TODO: change to private
String maTargetName; // name of the font name token that is chosen
@@ -178,7 +178,7 @@ public: // TODO: change to private
bool mbEmbolden; // Force emboldening
ItalicMatrix maItalicMatrix; // Force matrix for slant
- const ImplFontData* mpFontData; // a matching ImplFontData object
+ const PhysicalFontFace* mpFontData; // a matching PhysicalFontFace object
ImplFontEntry* mpFontEntry; // pointer to the resulting FontCache entry
};
@@ -206,7 +206,7 @@ public:
virtual ~ImplDevFontList();
// fill the list with device fonts
- void Add( ImplFontData* );
+ void Add( PhysicalFontFace* );
void Clear();
int Count() const { return maDevFontList.size(); }
@@ -238,7 +238,7 @@ protected:
const rtl::OUString& rShortName) const;
ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
ImplDevFontListData* ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth,
- FontItalic, const rtl::OUString& rSearchFamily) const;
+ FontItalic, const rtl::OUString& rSearchFamily) const;
ImplDevFontListData* FindDefaultFont() const;
private:
@@ -256,8 +256,8 @@ private:
struct ImplKernPairData
{
- sal_uInt16 mnChar1;
- sal_uInt16 mnChar2;
+ sal_uInt16 mnChar1;
+ sal_uInt16 mnChar2;
long mnKern;
};
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 0a68c2037b1c..00e37e544279 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -49,7 +49,7 @@ class SalBitmap;
class FontSelectPattern;
class ImplFontMetricData;
struct ImplKernPairData;
-class ImplFontData;
+class PhysicalFontFace;
class ImplFontCharMap;
class SalLayout;
class ImplLayoutArgs;
@@ -256,7 +256,7 @@ public:
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData* pFont,
+ const PhysicalFontFace* pFont,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
@@ -271,7 +271,7 @@ public:
// glyphs with only a name) exist it is set to the corresponding
// map for non encoded glyphs; the encoding vector contains -1
// as encoding for these cases
- virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded ) = 0;
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded ) = 0;
// GetEmbedFontData: gets the font data for a font marked
// embeddable by GetDevFontList or NULL in case of error
@@ -282,7 +282,7 @@ public:
// pWidths MUST support at least 256 members;
// rInfo: additional outgoing information
// pDataLen: out parameter, contains the byte length of the returned buffer
- virtual const void* GetEmbedFontData( const ImplFontData* pFont,
+ virtual const void* GetEmbedFontData( const PhysicalFontFace* pFont,
const sal_Ucs* pUnicodes,
sal_Int32* pWidths,
FontSubsetInfo& rInfo,
@@ -294,7 +294,7 @@ public:
// in case of an embeddable font also fill the mapping
// between unicode and glyph id
// leave widths vector and mapping untouched in case of failure
- virtual void GetGlyphWidths( const ImplFontData* pFont,
+ virtual void GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc ) = 0;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 85c04f0f2fd0..7ed0c935abf8 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -49,7 +49,7 @@ typedef unsigned short LanguageType;
#include <vcl/vclenum.hxx>
class SalGraphics;
-class ImplFontData;
+class PhysicalFontFace;
#define MAX_FALLBACK 16
@@ -197,7 +197,7 @@ public:
int GetUnitsPerPixel() const { return mnUnitsPerPixel; }
int GetOrientation() const { return mnOrientation; }
- virtual const ImplFontData* GetFallbackFontData( sal_GlyphId ) const;
+ virtual const PhysicalFontFace* GetFallbackFontData( sal_GlyphId ) const;
// methods using string indexing
virtual int GetTextBreak( long nMaxWidth, long nCharExtra=0, int nFactor=1 ) const = 0;
@@ -271,14 +271,14 @@ public:
// used only by OutputDevice::ImplLayout, TODO: make friend
explicit MultiSalLayout( SalLayout& rBaseLayout,
- const ImplFontData* pBaseFont = NULL );
+ const PhysicalFontFace* pBaseFont = NULL );
virtual bool AddFallback( SalLayout& rFallbackLayout,
- ImplLayoutRuns&, const ImplFontData* pFallbackFont );
+ ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont );
virtual bool LayoutText( ImplLayoutArgs& );
virtual void AdjustLayout( ImplLayoutArgs& );
virtual void InitFont() const;
- virtual const ImplFontData* GetFallbackFontData( sal_GlyphId ) const;
+ virtual const PhysicalFontFace* GetFallbackFontData( sal_GlyphId ) const;
void SetInComplete(bool bInComplete = true);
@@ -297,7 +297,7 @@ private:
private:
SalLayout* mpLayouts[ MAX_FALLBACK ];
- const ImplFontData* mpFallbackFonts[ MAX_FALLBACK ];
+ const PhysicalFontFace* mpFallbackFonts[ MAX_FALLBACK ];
ImplLayoutRuns maFallbackRuns[ MAX_FALLBACK ];
int mnLevel;
bool mbInComplete;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index fd0ffbec337f..f52605ae7bd1 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -269,21 +269,21 @@ public:
virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const rtl::OUString& rFileURL, const rtl::OUString& rFontName );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData*,
+ const PhysicalFontFace*,
sal_Int32* pGlyphIDs,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphs,
FontSubsetInfo& rInfo
);
- virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
- virtual const void* GetEmbedFontData( const ImplFontData*,
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
+ virtual const void* GetEmbedFontData( const PhysicalFontFace*,
const sal_Ucs* pUnicodes,
sal_Int32* pWidths,
FontSubsetInfo& rInfo,
long* pDataLen );
virtual void FreeEmbedFontData( const void* pData, long nDataLen );
- virtual void GetGlyphWidths( const ImplFontData*,
+ virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 50d101585a3a..f92849c898aa 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -74,7 +74,7 @@ private:
#endif
// win32 specific physically available font face
-class ImplWinFontData : public ImplFontData
+class ImplWinFontData : public PhysicalFontFace
{
public:
explicit ImplWinFontData( const ImplDevFontAttributes&,
@@ -82,7 +82,7 @@ public:
BYTE nPitchAndFamily );
virtual ~ImplWinFontData();
- virtual ImplFontData* Clone() const;
+ virtual PhysicalFontFace* Clone() const;
virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const;
virtual sal_IntPtr GetFontId() const;
void SetFontId( sal_IntPtr nId ) { mnId = nId; }
@@ -322,7 +322,7 @@ public:
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData*,
+ const PhysicalFontFace*,
long* pGlyphIDs,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
@@ -337,7 +337,7 @@ public:
// glyphs with only a name) exist it is set to the corresponding
// map for non encoded glyphs; the encoding vector contains -1
// as encoding for these cases
- virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
+ virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded );
// GetEmbedFontData: gets the font data for a font marked
// embeddable by GetDevFontList or NULL in case of error
@@ -346,14 +346,14 @@ public:
// pWidths MUST support at least 256 members;
// rInfo: additional outgoing information
// pDataLen: out parameter, contains the byte length of the returned buffer
- virtual const void* GetEmbedFontData( const ImplFontData*,
+ virtual const void* GetEmbedFontData( const PhysicalFontFace*,
const sal_Ucs* pUnicodes,
sal_Int32* pWidths,
FontSubsetInfo& rInfo,
long* pDataLen );
// frees the font data again
virtual void FreeEmbedFontData( const void* pData, long nDataLen );
- virtual void GetGlyphWidths( const ImplFontData*,
+ virtual void GetGlyphWidths( const PhysicalFontFace*,
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );