diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2014-11-17 04:35:29 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2014-11-17 22:38:58 +0000 |
commit | dfeaee01a30109883e41f45faf28fc247dadb3b2 (patch) | |
tree | 26e1bf401c7f4bdba70081991d2b6f030183020f /vcl/inc | |
parent | 5b14cd7d8d293365ebc03ee1442610180c07ab8d (diff) |
vcl: copyBits should operate on mrParent if no context supplied.
eg. OutputDevice::DrawOutDev:
mpGraphics->CopyBits( aPosAry, NULL, this, NULL );
Change-Id: I0b041bb5aa6aba573b9f589842084722481cb438
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/opengl/win/gdiimpl.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/opengl/x11/gdiimpl.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/openglgdiimpl.hxx | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx index 085be79bcef2..557e58a09af3 100644 --- a/vcl/inc/opengl/win/gdiimpl.hxx +++ b/vcl/inc/opengl/win/gdiimpl.hxx @@ -29,6 +29,7 @@ protected: virtual GLfloat GetHeight() const SAL_OVERRIDE; public: + virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE; }; diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx index 00eaf8cdf9c2..a2b863e3631d 100644 --- a/vcl/inc/opengl/x11/gdiimpl.hxx +++ b/vcl/inc/opengl/x11/gdiimpl.hxx @@ -32,6 +32,7 @@ protected: public: // implementation of X11GraphicsImpl + virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE; void Init() SAL_OVERRIDE; bool FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) SAL_OVERRIDE; bool RenderPixmapToScreen( X11Pixmap* pPixmap, int nX, int nY ) SAL_OVERRIDE; diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index dd0b1e38712d..80d760a69796 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -216,7 +216,7 @@ public: // CopyBits and DrawBitmap --> RasterOp and ClipRegion // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics - virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE; + void DoCopyBits( const SalTwoRect& rPosAry, OpenGLSalGraphicsImpl *pSrcImpl ); virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE; |