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/unx | |
| parent | clang-analyzer-deadcode.DeadStores (diff) | |
| download | core-64d0de92ab06e6550be7dd59ae887750166d15a9.tar.gz core-64d0de92ab06e6550be7dd59ae887750166d15a9.zip | |
loplugin:mergeclasses
Change-Id: If8fabc79f4cbef6fc0d164bbe2f6136f1d1f00af
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 0f9fafc93df4..10f4f57043ff 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -100,7 +100,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev return false; } -ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize); +FontConfigFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize); void ImplServerFontEntry::HandleFontOptions() { @@ -257,8 +257,8 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout ) cairo_font_face_t* font_face = static_cast<cairo_font_face_t*>(CairoFontsCache::FindCachedFont(aId)); if (!font_face) { - const ImplFontOptions *pOptions = rFont.GetFontOptions().get(); - void *pPattern = pOptions ? pOptions->GetPattern(aFace, aId.mbEmbolden, aId.mbVerticalMetrics) : NULL; + const FontConfigFontOptions *pOptions = rFont.GetFontOptions().get(); + void *pPattern = pOptions ? pOptions->GetPattern(aFace, aId.mbEmbolden) : NULL; if (pPattern) font_face = cairo_ft_font_face_create_for_pattern(static_cast<FcPattern*>(pPattern)); if (!font_face) @@ -439,7 +439,7 @@ void cairosubcallback(void* pPattern) static_cast<FcPattern*>(pPattern)); } -ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize) +FontConfigFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize) { psp::FastPrintFontInfo aInfo; |