diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 14:03:48 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 11:57:13 +0000 |
commit | afab984f974d95c57b1a580387dcea2127bc3ca6 (patch) | |
tree | 68db769caabc86e28b0f7732e2ccef68f5cdc6eb /vcl/generic/glyphs | |
parent | vcl: Rename ImplServerFontEntry to ServerFontInstance (diff) | |
download | core-afab984f974d95c57b1a580387dcea2127bc3ca6.tar.gz core-afab984f974d95c57b1a580387dcea2127bc3ca6.zip |
vcl: Rename class ImplFTSFontData to FreetypeFontFace
ImplFTSFontData derives from PhysicalFontFace, and implements the
mechanisms specified therein. It's not actually a "data" class, but
also implements a factory function that creates a
LogicalFontInstance object via Freetype. I believe the "S" in "FTS"
stands for "Server", which is a misnomer as Freetype is a font
renderer, not a font server.
Change-Id: Ibacc4bf3f850ddfb37016ea2e3e088279b1b1ba1
Reviewed-on: https://gerrit.libreoffice.org/21285
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/generic/glyphs')
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 6 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 777cdea623ea..88793e20867e 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -331,7 +331,7 @@ const unsigned char* FreetypeFontInfo::GetTable( const char* pTag, sal_uLong* pL void FreetypeFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection ) { - ImplFTSFontData* pFD = new ImplFTSFontData( this, maDevFontAttributes ); + FreetypeFontFace* pFD = new FreetypeFontFace( this, maDevFontAttributes ); pFontCollection->Add( pFD ); } @@ -424,7 +424,7 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) return pNew; } -ImplFTSFontData::ImplFTSFontData( FreetypeFontInfo* pFI, const ImplFontAttributes& rDFA ) +FreetypeFontFace::FreetypeFontFace( FreetypeFontInfo* pFI, const ImplFontAttributes& rDFA ) : PhysicalFontFace( rDFA ), mpFreetypeFontInfo( pFI ) { @@ -432,7 +432,7 @@ ImplFTSFontData::ImplFTSFontData( FreetypeFontInfo* pFI, const ImplFontAttribute SetOrientationFlag( true ); } -LogicalFontInstance* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const +LogicalFontInstance* FreetypeFontFace::CreateFontInstance( FontSelectPattern& rFSD ) const { ServerFontInstance* pEntry = new ServerFontInstance( rFSD ); return pEntry; diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index 530b2d39defd..084ea03a01ab 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -146,16 +146,16 @@ private: sal_IntPtr mnMaxFontId; }; -class ImplFTSFontData : public PhysicalFontFace +class FreetypeFontFace : public PhysicalFontFace { private: FreetypeFontInfo* mpFreetypeFontInfo; public: - ImplFTSFontData( FreetypeFontInfo*, const ImplFontAttributes& ); + FreetypeFontFace( FreetypeFontInfo*, const ImplFontAttributes& ); - virtual LogicalFontInstance* CreateFontInstance( FontSelectPattern& ) const override; - virtual PhysicalFontFace* Clone() const override { return new ImplFTSFontData( *this ); } + virtual LogicalFontInstance* CreateFontInstance( FontSelectPattern& ) const override; + virtual PhysicalFontFace* Clone() const override { return new FreetypeFontFace( *this ); } virtual sal_IntPtr GetFontId() const override { return mpFreetypeFontInfo->GetFontId(); } }; |