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

[Caolán McNamara]

 vcl/headless/svpcairotextrender.cxx              |    2 +-
 vcl/inc/headless/svpcairotextrender.hxx          |    2 +-
 vcl/inc/unx/cairotextrender.hxx                  |    2 +-
 vcl/unx/generic/gdi/cairotextrender.cxx          |    2 +-
 vcl/unx/generic/gdi/openglx11cairotextrender.cxx |    2 +-
 vcl/unx/generic/gdi/openglx11cairotextrender.hxx |    2 +-
 vcl/unx/generic/gdi/x11cairotextrender.cxx       |    2 +-
 vcl/unx/generic/gdi/x11cairotextrender.hxx       |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 11389cff11723c9f69317228cd2d6b1fef34b9aa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 1 11:44:05 2016 +0000

    rename drawSurface to releaseCairoContext
    
    Change-Id: Ie5aac4a8b11daa2aba092923286fbbb2d76d4651

diff --git a/vcl/headless/svpcairotextrender.cxx b/vcl/headless/svpcairotextrender.cxx
index 035a9cd..3109a75 100644
--- a/vcl/headless/svpcairotextrender.cxx
+++ b/vcl/headless/svpcairotextrender.cxx
@@ -36,7 +36,7 @@ void SvpCairoTextRender::clipRegion(cairo_t* cr)
     mrParent.clipRegion(cr);
 }
 
-void SvpCairoTextRender::drawSurface(cairo_t*)
+void SvpCairoTextRender::releaseCairoContext(cairo_t*)
 {
 }
 
diff --git a/vcl/inc/headless/svpcairotextrender.hxx b/vcl/inc/headless/svpcairotextrender.hxx
index 9e3c837..dbd69b3 100644
--- a/vcl/inc/headless/svpcairotextrender.hxx
+++ b/vcl/inc/headless/svpcairotextrender.hxx
@@ -26,7 +26,7 @@ public:
     virtual cairo_t* getCairoContext() override;
     virtual void getSurfaceOffset(double& nDX, double& nDY) override;
     virtual void clipRegion(cairo_t* cr) override;
-    virtual void drawSurface(cairo_t* cr) override;
+    virtual void releaseCairoContext(cairo_t* cr) override;
 };
 
 #endif
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 2402050..2de9b11 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -74,7 +74,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 );
 
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 5ea9d3e..3c95849 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -345,7 +345,7 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout )
     }
 
     cairo_surface_flush(cairo_get_target(cr));
-    drawSurface(cr);
+    releaseCairoContext(cr);
     cairo_destroy(cr);
 }
 
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index 885145c..d5350e9 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -55,7 +55,7 @@ void OpenGLX11CairoTextRender::getSurfaceOffset( double& nDX, double& nDY )
     }
 }
 
-void OpenGLX11CairoTextRender::drawSurface(cairo_t* cr)
+void OpenGLX11CairoTextRender::releaseCairoContext(cairo_t* cr)
 {
     // XXX: lfrb: GLES 2.0 doesn't support GL_UNSIGNED_INT_8_8_8_8_REV
     OpenGLSalGraphicsImpl *pImpl = dynamic_cast< OpenGLSalGraphicsImpl* >(mrParent.GetImpl());
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
index 9c6bd4d..46a11cb 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
@@ -19,7 +19,7 @@ public:
 
     virtual cairo_t* getCairoContext() override;
     virtual void getSurfaceOffset(double& nDX, double& nDY) override;
-    virtual void drawSurface(cairo_t* cr) override;
+    virtual void releaseCairoContext(cairo_t* cr) override;
 };
 
 #endif
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 17cb462..dc1797f 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -146,7 +146,7 @@ size_t X11CairoTextRender::GetHeight() const
         return 1;
 }
 
-void X11CairoTextRender::drawSurface(cairo_t* /*cr*/)
+void X11CairoTextRender::releaseCairoContext(cairo_t* /*cr*/)
 {
 }
 
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/unx/generic/gdi/x11cairotextrender.hxx
index 0c66738..f614a4d 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx
@@ -43,7 +43,7 @@ public:
     virtual cairo_t* getCairoContext() override;
     virtual void getSurfaceOffset(double& nDX, double& nDY) override;
     virtual void clipRegion(cairo_t* cr) override;
-    virtual void drawSurface(cairo_t* cr) override;
+    virtual void releaseCairoContext(cairo_t* cr) override;
 };
 
 #endif