diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-07 09:50:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-07 12:32:23 +0200 |
| commit | 64d0de92ab06e6550be7dd59ae887750166d15a9 (patch) | |
| tree | 0ac4130293e2a9a244791038d472160321bd979e /vcl/generic/glyphs | |
| parent | clang-analyzer-deadcode.DeadStores (diff) | |
| download | core-64d0de92ab06e6550be7dd59ae887750166d15a9.tar.gz core-64d0de92ab06e6550be7dd59ae887750166d15a9.zip | |
loplugin:mergeclasses
Change-Id: If8fabc79f4cbef6fc0d164bbe2f6136f1d1f00af
Diffstat (limited to 'vcl/generic/glyphs')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 27ca57689e5c..c44a7cd9ada9 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -555,7 +555,7 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) mnLoadFlags |= FT_LOAD_NO_BITMAP; } -void ServerFont::SetFontOptions(std::shared_ptr<ImplFontOptions> xFontOptions) +void ServerFont::SetFontOptions(std::shared_ptr<FontConfigFontOptions> xFontOptions) { mxFontOptions = xFontOptions; @@ -608,7 +608,7 @@ void ServerFont::SetFontOptions(std::shared_ptr<ImplFontOptions> xFontOptions) mnLoadFlags |= FT_LOAD_NO_BITMAP; } -std::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const +std::shared_ptr<FontConfigFontOptions> ServerFont::GetFontOptions() const { return mxFontOptions; } |