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

[Kelemen Gábor (via logerrit)]

 vcl/inc/win/saldata.hxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 2c9170def5e862d57ce46ffb77041e76ee3606c5
Author:     Kelemen Gábor <kelemeng at ubuntu.com>
AuthorDate: Tue Feb 25 14:22:34 2020 +0100
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Thu Feb 27 09:39:32 2020 +0100

    Fix compilation on Windows with --disable-skia
    
    Trying to compile with option --disable-skia failed with:
    error C2027: use of undefined type 'SkiaControlsCache'
    
    Change-Id: I44b40cf7c2a8f356f8a49312a413c924c141c7df
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89458
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 5eb5a0fc2c4d..eadc7ade8957 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_VCL_INC_WIN_SALDATA_HXX
 #define INCLUDED_VCL_INC_WIN_SALDATA_HXX
 
+#include <config_features.h>
+
 #include <memory>
 #include <osl/module.h>
 
@@ -43,7 +45,9 @@ struct HDCCache;
 struct TempFontItem;
 class TextOutRenderer;
 class OpenGLControlsCache;
+#if HAVE_FEATURE_SKIA
 class SkiaControlsCache;
+#endif
 
 #define MAX_STOCKPEN            4
 #define MAX_STOCKBRUSH          4
@@ -125,7 +129,9 @@ public:
     std::unique_ptr<TextOutRenderer> m_pExTextOutRenderer;
     std::unique_ptr<GlobalWinGlyphCache> m_pGlobalWinGlyphCache;
     std::unique_ptr<OpenGLControlsCache> m_pOpenGLControlsCache;
+#if HAVE_FEATURE_SKIA
     std::unique_ptr<SkiaControlsCache> m_pSkiaControlsCache;
+#endif
 };
 
 inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }