diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-23 21:13:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-24 20:25:39 +0200 |
| commit | b55838c8ce067898f479569e62b7b11e137885ab (patch) | |
| tree | 32c755f2bc69d4e627f52419a34a036c02689327 /vcl/unx | |
| parent | dbe58407ecf6a74671e8703a57b27896409fd5af (diff) | |
GetSysFontData is newly unused
and thus SystemFontData
Change-Id: I563a6b7c251194cd73c6b0026d4ae8485a057b28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94740
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/gdi/font.cxx | 9 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/freetypetextrender.cxx | 23 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 5 |
3 files changed, 0 insertions, 37 deletions
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx index ede4d953c48e..5a6f04fd856f 100644 --- a/vcl/unx/generic/gdi/font.cxx +++ b/vcl/unx/generic/gdi/font.cxx @@ -80,15 +80,6 @@ std::unique_ptr<GenericSalLayout> X11SalGraphics::GetTextLayout(int nFallbackLev return mxTextRenderImpl->GetTextLayout(nFallbackLevel); } -#if ENABLE_CAIRO_CANVAS - -SystemFontData X11SalGraphics::GetSysFontData( int nFallbackLevel ) const -{ - return mxTextRenderImpl->GetSysFontData(nFallbackLevel); -} - -#endif - bool X11SalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx index 3d94da30440a..b364406f1e1d 100644 --- a/vcl/unx/generic/gdi/freetypetextrender.cxx +++ b/vcl/unx/generic/gdi/freetypetextrender.cxx @@ -153,29 +153,6 @@ std::unique_ptr<GenericSalLayout> FreeTypeTextRenderImpl::GetTextLayout(int nFal return std::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]); } -#if ENABLE_CAIRO_CANVAS -SystemFontData FreeTypeTextRenderImpl::GetSysFontData( int nFallbackLevel ) const -{ - SystemFontData aSysFontData; - - if (nFallbackLevel >= MAX_FALLBACK) nFallbackLevel = MAX_FALLBACK - 1; - if (nFallbackLevel < 0 ) nFallbackLevel = 0; - - if (mpFreetypeFont[nFallbackLevel]) - { - FreetypeFont& rFreetypeFont = mpFreetypeFont[nFallbackLevel]->GetFreetypeFont(); - aSysFontData.nFontId = rFreetypeFont.GetFtFace(); - aSysFontData.nFontFlags = rFreetypeFont.GetLoadFlags(); - aSysFontData.bFakeBold = rFreetypeFont.NeedsArtificialBold(); - aSysFontData.bFakeItalic = rFreetypeFont.NeedsArtificialItalic(); - aSysFontData.bAntialias = rFreetypeFont.GetAntialiasAdvice(); - aSysFontData.bVerticalCharacterType = mpFreetypeFont[nFallbackLevel]->GetFontSelectPattern().mbVertical; - } - - return aSysFontData; -} -#endif - bool FreeTypeTextRenderImpl::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 235f45eb83a4..03319d1acf53 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -944,11 +944,6 @@ css::uno::Any GenPspGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& /* return css::uno::Any(); } -SystemFontData GenPspGraphics::GetSysFontData( int /* nFallbacklevel */ ) const -{ - return SystemFontData(); -} - #endif // ENABLE_CAIRO_CANVAS bool GenPspGraphics::supportsOperation( OutDevSupportType ) const |