cairo svp: Initial copy from master.

Change-Id: Ie5677ee777ee81e35cb22ba9f7bd9acfefe75444

1 files changed, 27 insertions, 28 deletions

diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx
index 26ab3c98bc28..922329dd541d 100644
--- a/vcl/inc/cairotextrender.hxx
+++ b/vcl/inc/cairotextrender.hxx
@@ -20,20 +20,18 @@
 #ifndef INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
 #define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
 
-#include "textrender.hxx"
+#include <config_cairo_canvas.h>
+
 #include <vcl/region.hxx>
+
+#include "textrender.hxx"
+
 #include <deque>
 
 typedef struct FT_FaceRec_* FT_Face;
 
-class PspSalPrinter;
-class PspSalInfoPrinter;
 class ServerFont;
 class GlyphCache;
-class ImplLayoutArgs;
-class ServerFontLayout;
-class PhysicalFontCollection;
-class PhysicalFontFace;
 typedef struct _cairo cairo_t;
 
 class VCL_DLLPUBLIC CairoFontsCache
@@ -71,7 +69,6 @@ class VCL_DLLPUBLIC CairoTextRender : public TextRenderImpl
     ServerFont*     mpServerFont[ MAX_FALLBACK ];
 
     SalColor        mnTextColor;
-    CairoFontsCache m_aCairoFontsCache;
 
     bool            bDisableGraphite_;
 
@@ -79,7 +76,7 @@ protected:
     virtual GlyphCache&         getPlatformGlyphCache() = 0;
     virtual cairo_t*            getCairoContext() = 0;
     virtual void                getSurfaceOffset(double& nDX, double& nDY) = 0;
-    virtual void                drawSurface(cairo_t* cr) = 0;
+    virtual void                releaseCairoContext(cairo_t* cr) = 0;
 
     bool                        setFont( const FontSelectPattern *pEntry, int nFallbackLevel );
 
@@ -89,14 +86,14 @@ public:
                                 CairoTextRender();
 
 
-    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*,
@@ -104,29 +101,31 @@ public:
                                     const sal_uInt8* pEncoding,
                                     sal_Int32* pWidths,
                                     int nGlyphs,
-                                    FontSubsetInfo& rInfo) SAL_OVERRIDE;
+                                    FontSubsetInfo& rInfo) override;
 
-    virtual const Ucs2SIntMap*  GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const**) SAL_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;
+                                    long* pDataLen ) override;
 
-    virtual void                FreeEmbedFontData( const void* pData, long nDataLen ) SAL_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 SystemFontData      GetSysFontData( int nFallbackLevel ) const 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;
+#if ENABLE_CAIRO_CANVAS
+    virtual SystemFontData      GetSysFontData( int nFallbackLevel ) const override;
+#endif
 };
 
 #endif