[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Luboš Luňák (via logerrit)]

 vcl/inc/unx/freetypetextrender.hxx         |    2 ++
 vcl/unx/generic/gdi/freetypetextrender.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 8ce20d3e062819fdab52d2ce47762ccc02b34ab2
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Mar 18 13:12:43 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed Mar 18 13:13:53 2020 +0100

    fix --disable-cairo-canvas build
    
    I dropped this in 9b231fb18a731774a1579206ef635b8b709304d2.
    
    Change-Id: I9bdd266af70041a8c27766efb7f15352ea8fa4e0

diff --git a/vcl/inc/unx/freetypetextrender.hxx b/vcl/inc/unx/freetypetextrender.hxx
index c4abba43dfdc..4c15fb9bfec5 100644
--- a/vcl/inc/unx/freetypetextrender.hxx
+++ b/vcl/inc/unx/freetypetextrender.hxx
@@ -64,7 +64,9 @@ public:
 
     virtual std::unique_ptr<GenericSalLayout>
                                 GetTextLayout(int nFallbackLevel) override;
+#if ENABLE_CAIRO_CANVAS
     virtual SystemFontData      GetSysFontData( int nFallbackLevel ) const override;
+#endif
 };
 
 #endif
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx
index d7591444f5a1..7693eff8c0d8 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -169,6 +169,7 @@ std::unique_ptr<GenericSalLayout> FreeTypeTextRenderImpl::GetTextLayout(int nFal
     return std::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]->GetFontInstance());
 }
 
+#if ENABLE_CAIRO_CANVAS
 SystemFontData FreeTypeTextRenderImpl::GetSysFontData( int nFallbackLevel ) const
 {
     SystemFontData aSysFontData;
@@ -189,6 +190,7 @@ SystemFontData FreeTypeTextRenderImpl::GetSysFontData( int nFallbackLevel ) cons
 
     return aSysFontData;
 }
+#endif
 
 bool FreeTypeTextRenderImpl::CreateFontSubset(
                                    const OUString& rToFile,