diff options
| author | Korrawit Pruegsanusak <detective.conan.1412@gmail.com> | 2016-03-20 15:15:15 +0700 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-22 14:02:30 +0000 |
| commit | ea04b2a7dc878cdfccef0110a9a40ff1b728965d (patch) | |
| tree | 3ac5be32fce5ce34639a5509c125473631127626 /vcl | |
| parent | e5d83653e78965a876b2ac1119736c4726bd783d (diff) | |
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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/salgdi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 9b77c7069fcc..b7aac7a9887f 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); |