diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-01 11:44:05 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-05-16 14:56:59 +0200 |
| commit | b50059906955dde364669d42ee188c3c48479be3 (patch) | |
| tree | 1ce8c51c2d3c3c5cf010dd53943d7ffebb788b88 | |
| parent | b757369d4f8907ba4f53def7c5da54fd34fbd520 (diff) | |
rename drawSurface to releaseCairoContext
Change-Id: Ie5aac4a8b11daa2aba092923286fbbb2d76d4651
| -rw-r--r-- | vcl/unx/generic/gdi/openglx11cairotextrender.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/openglx11cairotextrender.hxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/x11cairotextrender.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/x11cairotextrender.hxx | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx index dbb6ecfbc065..c75d45ac7f7a 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 ed2b79ce747d..ce816c0c3af6 100644 --- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx +++ b/vcl/unx/generic/gdi/openglx11cairotextrender.hxx @@ -20,6 +20,7 @@ public: virtual cairo_t* getCairoContext() SAL_OVERRIDE; virtual void getSurfaceOffset(double& nDX, double& nDY) SAL_OVERRIDE; virtual void drawSurface(cairo_t* cr) SAL_OVERRIDE; + virtual void releaseCairoContext(cairo_t* cr) SAL_OVERRIDE; }; #endif diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx index b6187c88fa56..bf8d4c8d4701 100644 --- a/vcl/unx/generic/gdi/x11cairotextrender.cxx +++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx @@ -128,7 +128,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 b029702ff577..9358a5197112 100644 --- a/vcl/unx/generic/gdi/x11cairotextrender.hxx +++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx @@ -43,7 +43,7 @@ public: virtual cairo_t* getCairoContext() SAL_OVERRIDE; virtual void getSurfaceOffset(double& nDX, double& nDY) SAL_OVERRIDE; virtual void clipRegion(cairo_t* cr) SAL_OVERRIDE; - virtual void drawSurface(cairo_t* cr) SAL_OVERRIDE; + virtual void releaseCairoContext(cairo_t* cr) SAL_OVERRIDE; }; #endif |