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

[Korrawit Pruegsanusak]

 vcl/inc/unx/salgdi.h |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ea04b2a7dc878cdfccef0110a9a40ff1b728965d
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date:   Sun Mar 20 15:15:15 2016 +0700

    These functions are defined only when ENABLE_CAIRO_CANVAS
    
    Class X11SalGraphics are derived from class SalGraphics, which is
    defined in vcl/inc/salgdi.hxx. So these override functions should be
    defined in the same condition as the base class.
    
    Change-Id: I5af0ee9c89c74e66b8f2dbd44890606fc5e41b14
    Reviewed-on: https://gerrit.libreoffice.org/23373
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 9b77c70..b7aac7a 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -259,12 +259,15 @@ public:
                                         long nHeight, sal_uInt8 nTransparency ) override;
 
     virtual SystemGraphicsData      GetGraphicsData() const override;
+
+#if ENABLE_CAIRO_CANVAS
     virtual bool                    SupportsCairo() const override;
     virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override;
     virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
     virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override;
     virtual css::uno::Any           GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override;
     virtual SystemFontData          GetSysFontData( int nFallbackLevel ) const override;
+#endif
 
     bool TryRenderCachedNativeControl(ControlCacheKey& aControlCacheKey,
                                       int nX, int nY);