summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vcl/headless/svpcairotextrender.cxx2
-rw-r--r--vcl/inc/headless/svpcairotextrender.hxx2
-rw-r--r--vcl/inc/unx/cairotextrender.hxx2
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx2
-rw-r--r--vcl/unx/generic/gdi/openglx11cairotextrender.cxx2
-rw-r--r--vcl/unx/generic/gdi/openglx11cairotextrender.hxx2
-rw-r--r--vcl/unx/generic/gdi/x11cairotextrender.cxx2
-rw-r--r--vcl/unx/generic/gdi/x11cairotextrender.hxx2
8 files changed, 8 insertions, 8 deletions
diff --git a/vcl/headless/svpcairotextrender.cxx b/vcl/headless/svpcairotextrender.cxx
index 035a9cd11e88..3109a75295a1 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 9e3c837b03fa..dbd69b399732 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 2402050a1e77..2de9b1102e2b 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 5ea9d3ea397b..3c958492cf52 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 885145c7366b..d5350e9cd5eb 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 9c6bd4dd9d36..46a11cba5a0e 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 17cb4622b6cf..dc1797fa239d 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 0c66738c46fc..f614a4d743c1 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