do all the headless using platforms have cairo ?

Reviewed-on: https://gerrit.libreoffice.org/19953
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 81860b908b0c6104d47886a172b65d8d31f59ec3)

Change-Id: I4c0250254480790f49ad45f3d42151aee4a441e8

6 files changed, 96 insertions, 99 deletions

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 78372e8a3c88..309de905d4ea 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -194,7 +194,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
         return false;
     }
 
-    cairo_t* cr = createCairoContext(m_aDevice);
+    cairo_t* cr = getCairoContext();
     if (!cr)
         return bRet;
 
@@ -1072,8 +1072,6 @@ bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
     return false;
 }
 
-#if ENABLE_CAIRO_CANVAS
-
 cairo_t* SvpSalGraphics::createCairoContext(const basebmp::BitmapDeviceSharedPtr &rBuffer)
 {
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
@@ -1097,8 +1095,13 @@ cairo_t* SvpSalGraphics::createCairoContext(const basebmp::BitmapDeviceSharedPtr
 #endif
 }
 
-#endif
 
+cairo_t* SvpSalGraphics::getCairoContext() const
+{
+    return SvpSalGraphics::createCairoContext(m_aOrigDevice);
+}
+
+#if ENABLE_CAIRO_CANVAS
 bool SvpSalGraphics::SupportsCairo() const
 {
     return false;
@@ -1124,6 +1127,7 @@ css::uno::Any SvpSalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& /*
     return css::uno::Any();
 }
 
+#endif // ENABLE_CAIRO_CANVAS
 #ifndef IOS
 
 SystemGraphicsData SvpSalGraphics::GetGraphicsData() const
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 38b8d1e997f8..2416c597166e 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -77,50 +77,50 @@ protected:
     std::unique_ptr<TextRenderImpl>     m_xTextRenderImpl;
 
 protected:
-    virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) SAL_OVERRIDE;
+    virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) override;
     virtual bool blendAlphaBitmap( const SalTwoRect&,
                                    const SalBitmap& rSrcBitmap,
                                    const SalBitmap& rMaskBitmap,
-                                   const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
-    virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                   const SalBitmap& rAlphaBitmap ) override;
+    virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) override;
     virtual bool drawTransformedBitmap(
         const basegfx::B2DPoint& rNull,
         const basegfx::B2DPoint& rX,
         const basegfx::B2DPoint& rY,
         const SalBitmap& rSourceBitmap,
-        const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
-    virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
+        const SalBitmap* pAlphaBitmap) override;
+    virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) override;
 
 public:
     SvpSalGraphics();
     virtual ~SvpSalGraphics();
 
-    virtual SalGraphicsImpl* GetImpl() const SAL_OVERRIDE { return NULL; };
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
-    virtual sal_uInt16      GetBitCount() const SAL_OVERRIDE;
-    virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
+    virtual SalGraphicsImpl* GetImpl() const override { return NULL; };
+    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
+    virtual sal_uInt16      GetBitCount() const override;
+    virtual long            GetGraphicsWidth() const override;
 
-    virtual void            ResetClipRegion() SAL_OVERRIDE;
-    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
+    virtual void            ResetClipRegion() override;
+    virtual bool            setClipRegion( const vcl::Region& ) override;
 
-    virtual void            SetLineColor() SAL_OVERRIDE;
-    virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            SetFillColor() SAL_OVERRIDE;
-    virtual void            SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetLineColor() override;
+    virtual void            SetLineColor( SalColor nSalColor ) override;
+    virtual void            SetFillColor() override;
+    virtual void            SetFillColor( SalColor nSalColor ) override;
 
-    virtual void            SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
+    virtual void            SetXORMode( bool bSet, bool ) override;
 
-    virtual void            SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
-    virtual void            SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void            SetROPLineColor( SalROPColor nROPColor ) override;
+    virtual void            SetROPFillColor( SalROPColor nROPColor ) override;
 
-    virtual void            SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
-    virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
-    virtual void            GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
-    virtual void ClearDevFontCache() SAL_OVERRIDE;
-    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+    virtual void            SetTextColor( SalColor nSalColor ) override;
+    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) override;
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
+    virtual const FontCharMapPtr GetFontCharMap() const override;
+    virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override;
+    virtual void            GetDevFontList( PhysicalFontCollection* ) override;
+    virtual void ClearDevFontCache() override;
+    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
     virtual bool        CreateFontSubset( const OUString& rToFile,
                                               const PhysicalFontFace*,
                                               const sal_GlyphId* pGlyphIds,
@@ -128,50 +128,50 @@ public:
                                               sal_Int32* pWidths,
                                               int nGlyphs,
                                               FontSubsetInfo& rInfo
-                                              ) SAL_OVERRIDE;
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) SAL_OVERRIDE;
+                                              ) override;
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) override;
     virtual const void*     GetEmbedFontData( const PhysicalFontFace*,
                                               const sal_Ucs* pUnicodes,
                                               sal_Int32* pWidths,
                                               size_t nLen,
                                               FontSubsetInfo& rInfo,
-                                              long* pDataLen ) SAL_OVERRIDE;
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+                                              long* pDataLen ) override;
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
-    virtual bool            GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE;
-    virtual bool            GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
-    virtual bool            supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
-    virtual void            drawPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
+                                            Ucs2UIntMap& rUnicodeEnc ) override;
+    virtual bool            GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
+    virtual bool            GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) override;
+    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void            DrawServerFontLayout( const ServerFontLayout& ) override;
+    virtual bool            supportsOperation( OutDevSupportType ) const override;
+    virtual void            drawPixel( long nX, long nY ) override;
+    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) override;
+    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
+    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override;
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&,
                                           double fTransparency,
                                           const ::basegfx::B2DVector& rLineWidths,
                                           basegfx::B2DLineJoin,
-                                          com::sun::star::drawing::LineCap) SAL_OVERRIDE;
-    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+                                          com::sun::star::drawing::LineCap) override;
+    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
-                                             PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
+                                             PCONSTSALPOINT* pPtAry ) override;
     virtual bool        drawPolyLineBezier( sal_uInt32 nPoints,
                                                 const SalPoint* pPtAry,
-                                                const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                                const sal_uInt8* pFlgAry ) override;
     virtual bool        drawPolygonBezier( sal_uInt32 nPoints,
                                                const SalPoint* pPtAry,
-                                               const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                               const sal_uInt8* pFlgAry ) override;
     virtual bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
-    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; };
+                                                   const sal_uInt8* const* pFlgAry ) override;
+    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; };
 
     virtual void            copyArea( long nDestX,
                                       long nDestY,
@@ -179,41 +179,39 @@ public:
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      sal_uInt16 nFlags ) SAL_OVERRIDE;
+                                      sal_uInt16 nFlags ) override;
     virtual void            copyBits( const SalTwoRect& rPosAry,
-                                      SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+                                      SalGraphics* pSrcGraphics ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
-                                        const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rSalBitmap ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rTransparentBitmap ) override;
     virtual void            drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
-                                      SalColor nMaskColor ) SAL_OVERRIDE;
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual SalColor        getPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) SAL_OVERRIDE;
-    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+                                      SalColor nMaskColor ) override;
+    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual SalColor        getPixel( long nX, long nY ) override;
+    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override;
+    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
 
-    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) override;
 
-    virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
+    virtual SystemGraphicsData GetGraphicsData() const override;
 
 #if ENABLE_CAIRO_CANVAS
-    virtual bool            SupportsCairo() const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const SAL_OVERRIDE;
-    virtual css::uno::Any   GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const SAL_OVERRIDE;
-
-    virtual SystemFontData  GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE;
-
+    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 // ENABLE_CAIRO_CANVAS
 
+    cairo_t*                getCairoContext() const;
 
     static cairo_t*         createCairoContext(const basebmp::BitmapDeviceSharedPtr& rBuffer);
     void                    clipRegion(cairo_t* cr);
-
-#endif // ENABLE_CAIRO_CANVAS
 };
 
 #endif
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index b533cb44ed03..01d021800ae4 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -59,8 +59,6 @@ public:
     static void refreshFontconfig( GtkSettings *pSettings );
     static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
 
-    cairo_t* getCairoContext() const;
-
     virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) SAL_OVERRIDE;
 private:
     GtkWidget       *mpWindow;
@@ -151,30 +149,30 @@ public:
     static  bool        bNeedTwoPasses;
 
     // native widget methods
-    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
+    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
     virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
+                                              const Point& aPos, bool& rIsInside ) override;
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
-                                           const OUString& rCaption ) SAL_OVERRIDE;
+                                           const OUString& rCaption ) override;
     virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& rCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
 
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
     static void refreshFontconfig( GtkSettings *pSettings );
     static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
 
-    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
-    virtual void            ResetClipRegion() SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) override;
+    virtual void            ResetClipRegion() override;
 
     // some themes set the background pixmap of our window EVERY time
     // a control is painted; but presentation effects need
     // the background set to None; workaround: set the background
     // before copyBits
     virtual void            copyBits( const SalTwoRect& rPosAry,
-                                      SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+                                      SalGraphics* pSrcGraphics ) override;
 
 protected:
     typedef std::list< Rectangle > clipList;
diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx b/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx
index 226201265d0e..0171ef12b022 100644
--- a/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx
@@ -8,34 +8,35 @@
  */
 
 #include "gtk3cairotextrender.hxx"
+#include "headless/svpgdi.hxx"
 
-GtkCairoTextRender::GtkCairoTextRender(GtkSalGraphics& rParent)
+SvpCairoTextRender::SvpCairoTextRender(SvpSalGraphics& rParent)
     : mrParent(rParent)
 {
 }
 
-GlyphCache& GtkCairoTextRender::getPlatformGlyphCache()
+GlyphCache& SvpCairoTextRender::getPlatformGlyphCache()
 {
     return SvpSalGraphics::getPlatformGlyphCache();
 }
 
-cairo_t* GtkCairoTextRender::getCairoContext()
+cairo_t* SvpCairoTextRender::getCairoContext()
 {
     return mrParent.getCairoContext();
 }
 
-void GtkCairoTextRender::getSurfaceOffset(double& nDX, double& nDY)
+void SvpCairoTextRender::getSurfaceOffset(double& nDX, double& nDY)
 {
     nDX = 0;
     nDY = 0;
 }
 
-void GtkCairoTextRender::clipRegion(cairo_t* cr)
+void SvpCairoTextRender::clipRegion(cairo_t* cr)
 {
     mrParent.clipRegion(cr);
 }
 
-void GtkCairoTextRender::drawSurface(cairo_t* /*cr*/)
+void SvpCairoTextRender::drawSurface(cairo_t* /*cr*/)
 {
 }
 
diff --git a/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx b/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
index fdf01bdd60ee..b17140461d2e 100644
--- a/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
+++ b/vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx
@@ -11,15 +11,16 @@
 #define INCLUDED_VCL_UNX_GTK3_GDI_GTK3CAIROTEXTRENDER_HXX
 
 #include "cairotextrender.hxx"
-#include <unx/gtk/gtkgdi.hxx>
 
-class GtkCairoTextRender : public CairoTextRender
+class SvpSalGraphics;
+
+class SvpCairoTextRender : public CairoTextRender
 {
 protected:
-    GtkSalGraphics& mrParent;
+    SvpSalGraphics& mrParent;
 
 public:
-    explicit GtkCairoTextRender(GtkSalGraphics& rParent);
+    explicit SvpCairoTextRender(SvpSalGraphics& rParent);
 
     virtual GlyphCache& getPlatformGlyphCache() SAL_OVERRIDE;
     virtual cairo_t* getCairoContext() SAL_OVERRIDE;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index bfe4cbd92686..4caab5a9de1f 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -2002,7 +2002,7 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
       mpFrame( pFrame ),
       mpWindow( pWindow )
 {
-    m_xTextRenderImpl.reset(new GtkCairoTextRender(*this));
+    m_xTextRenderImpl.reset(new SvpCairoTextRender(*this));
 
     if(style_loaded)
         return;
@@ -2127,11 +2127,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
     gtk_widget_show_all(gDumbContainer);
 }
 
-cairo_t* GtkSalGraphics::getCairoContext() const
-{
-    return mpFrame->getCairoContext();
-}
-
 void GtkSalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
 {
     GdkScreen* pScreen = gtk_widget_get_screen(mpWindow);