diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-19 06:24:37 -0500 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-06-20 11:00:22 +0200 |
| commit | 2bbebea59de3e2e22817ed4fbe0ce7b7df7c0342 (patch) | |
| tree | 9f8271e3b701c2161cee29d1418d26b7b235a6c6 /vcl/generic/glyphs | |
| parent | bb6fec1bd39be9f6d660623abd2b25400a34b9ac (diff) | |
Rename the class ImplFontData into PhysicalFontFace
Change-Id: I402481e7c6ea605c8ccfdf6cb08166859b37e8de
Diffstat (limited to 'vcl/generic/glyphs')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 6 | ||||
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 9cd88a47c3ab..9da899388ef3 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -640,7 +640,7 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) // ======================================================================= ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA ) -: ImplFontData( rDFA, IFTSFONT_MAGIC ), +: PhysicalFontFace( rDFA, IFTSFONT_MAGIC ), mpFtFontInfo( pFI ) { mbDevice = false; diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index 79926726be22..0bd38e63eed3 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -176,7 +176,7 @@ private: // ----------------------------------------------------------------------- -class ImplFTSFontData : public ImplFontData +class ImplFTSFontData : public PhysicalFontFace { private: FtFontInfo* mpFtFontInfo; @@ -188,10 +188,10 @@ public: FtFontInfo* GetFtFontInfo() const { return mpFtFontInfo; } virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const; - virtual ImplFontData* Clone() const { return new ImplFTSFontData( *this ); } + virtual PhysicalFontFace* Clone() const { return new ImplFTSFontData( *this ); } virtual sal_IntPtr GetFontId() const { return mpFtFontInfo->GetFontId(); } - static bool CheckFontData( const ImplFontData& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); } + static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); } }; // ----------------------------------------------------------------------- diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index b48b4158cf1e..66dc23760ed7 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -211,7 +211,7 @@ ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData ) // the FontList's key mpFontData member is reinterpreted as font id FontSelectPattern aFontSelData = rFontSelData; - aFontSelData.mpFontData = reinterpret_cast<ImplFontData*>( nFontId ); + aFontSelData.mpFontData = reinterpret_cast<PhysicalFontFace*>( nFontId ); FontList::iterator it = maFontList.find( aFontSelData ); if( it != maFontList.end() ) { |