diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 13:55:21 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 10:20:35 +0000 |
| commit | 67925c3b5cf713cfb85a92baebd13708b8649974 (patch) | |
| tree | 341917e26525ce48ed9e51dd3dbe676089714a88 /vcl/generic/glyphs | |
| parent | c71de1458cebcd45b65cef3a182bf1092dc8ad80 (diff) | |
vcl: Rename ImplServerFontEntry to ServerFontInstance
I want to keep this class in line with the naming of the base class.
ImplServerFontEntry derives from LogicalFontInstance, so the name
ServerFontInstance is a better fit.
Change-Id: I2d2e3919634c2aaa8e5d6d63b0bf718dec18c336
Reviewed-on: https://gerrit.libreoffice.org/21284
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 | 4 | ||||
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 0af7cd91e829..777cdea623ea 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -434,7 +434,7 @@ ImplFTSFontData::ImplFTSFontData( FreetypeFontInfo* pFI, const ImplFontAttribute LogicalFontInstance* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { - ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD ); + ServerFontInstance* pEntry = new ServerFontInstance( rFSD ); return pEntry; } @@ -464,7 +464,7 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI ) { // TODO: move update of mpFontInstance into FontEntry class when // it becomes responsible for the ServerFont instantiation - static_cast<ImplServerFontEntry*>(rFSD.mpFontInstance)->SetServerFont( this ); + static_cast<ServerFontInstance*>(rFSD.mpFontInstance)->SetServerFont( this ); maFaceFT = pFI->GetFaceFT(); diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index eab5277ec5c5..bfac3283af2f 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -353,13 +353,13 @@ void ServerFont::GarbageCollect( long nMinLruIndex ) } } -ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD ) +ServerFontInstance::ServerFontInstance( FontSelectPattern& rFSD ) : LogicalFontInstance( rFSD ) , mpServerFont( nullptr ) , mbGotFontOptions( false ) {} -void ImplServerFontEntry::SetServerFont(ServerFont* p) +void ServerFontInstance::SetServerFont(ServerFont* p) { if (p == mpServerFont) return; @@ -370,7 +370,7 @@ void ImplServerFontEntry::SetServerFont(ServerFont* p) mpServerFont->AddRef(); } -ImplServerFontEntry::~ImplServerFontEntry() +ServerFontInstance::~ServerFontInstance() { // TODO: remove the ServerFont here instead of in the GlyphCache if (mpServerFont) |