diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-10 11:55:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-12 07:13:45 +0000 |
| commit | 899e8cedd7679dcd3cf26a6268a37dedcf66433d (patch) | |
| tree | 5e26e6f27a3e7be276612901575faa1d3902cbf4 /vcl/win | |
| parent | b415494bf0468b74318b61f114e2ff4ae68c00ee (diff) | |
simplify SalGraphics::copyArea flags argument
Change-Id: Iaaef4d90d7fe817a32cd51652d41c2e49c8909a4
Reviewed-on: https://gerrit.libreoffice.org/24832
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/gdiimpl.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/gdi/gdiimpl.hxx | 3 | ||||
| -rw-r--r-- | vcl/win/gdi/salgdi2.cxx | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index 87ff4e1b4b21..817b062b34a7 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -380,7 +380,7 @@ void ImplCalcOutSideRgn( const RECT& rSrcRect, void WinSalGraphicsImpl::copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, - sal_uInt16 nFlags ) + bool bWindowInvalidate ) { bool bRestoreClipRgn = false; HRGN hOldClipRgn = 0; @@ -388,7 +388,7 @@ void WinSalGraphicsImpl::copyArea( long nDestX, long nDestY, HRGN hInvalidateRgn = 0; // do we have to invalidate also the overlapping regions? - if ( (nFlags & SAL_COPYAREA_WINDOWINVALIDATE) && mrParent.isWindow() ) + if ( bWindowInvalidate && mrParent.isWindow() ) { // compute and invalidate those parts that were either off-screen or covered by other windows // while performing the above BitBlt diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx index 8f4181c5a2db..9ba7dd8bf7fe 100644 --- a/vcl/win/gdi/gdiimpl.hxx +++ b/vcl/win/gdi/gdiimpl.hxx @@ -134,8 +134,7 @@ public: virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, - long nSrcWidth, long nSrcHeight, - sal_uInt16 nFlags ) override; + long nSrcWidth, long nSrcHeight, bool bWindowInvalidate ) override; // CopyBits and DrawBitmap --> RasterOp and ClipRegion // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx index f8b8fe75f92b..ae7373160b6a 100644 --- a/vcl/win/gdi/salgdi2.cxx +++ b/vcl/win/gdi/salgdi2.cxx @@ -63,10 +63,10 @@ void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraph void WinSalGraphics::copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, - sal_uInt16 nFlags ) + bool bWindowInvalidate ) { mpImpl->copyArea( nDestX, nDestY, nSrcX, nSrcY, - nSrcWidth, nSrcHeight, nFlags ); + nSrcWidth, nSrcHeight, bWindowInvalidate ); } namespace |