diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-18 14:41:05 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-20 09:52:08 +0200 |
commit | 953f327818f565969b8de5d9b956bd6b9a7c64b2 (patch) | |
tree | caf761676202ca7bcba8a57a3e34e197ae0831ee /vcl | |
parent | 25a47c5cd54c73e754de988bde8ec8a202d27717 (diff) |
convert COPYAREA constant to bool flag
since there is only value in this flags thing
Change-Id: I86d7a3a358c467a9748b00e1ba8c09106f282947
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/gdi/print.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/outdev.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 6 | ||||
-rw-r--r-- | vcl/workben/outdevgrind.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index ebc5f2b34f53..3b0c145f617c 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -339,7 +339,7 @@ void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, void Printer::CopyArea( const Point& /*rDestPt*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/, - sal_uInt16 /*nFlags*/ ) + bool /*bWindowInvalidate*/ ) { DBG_ASSERT( false, "Don't use OutputDevice::CopyArea(...) with printer devices!" ); } diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 85ab4a2528f0..0fb1d342a560 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -611,7 +611,7 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize, void OutputDevice::CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, - sal_uInt16 nFlags ) + bool bWindowInvalidate ) { if ( ImplIsRecordLayout() ) return; @@ -646,18 +646,18 @@ void OutputDevice::CopyArea( const Point& rDestPt, AdjustTwoRect( aPosAry, aSrcOutRect ); - CopyDeviceArea ( aPosAry, nFlags ); + CopyDeviceArea( aPosAry, bWindowInvalidate ); } SetRasterOp( eOldRop ); if( mpAlphaVDev ) - mpAlphaVDev->CopyArea( rDestPt, rSrcPt, rSrcSize, nFlags ); + mpAlphaVDev->CopyArea( rDestPt, rSrcPt, rSrcSize, bWindowInvalidate ); } // Direct OutputDevice drawing protected function -void OutputDevice::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 /*nFlags*/) +void OutputDevice::CopyDeviceArea( SalTwoRect& aPosAry, bool /*bWindowInvalidate*/) { if (aPosAry.mnSrcWidth == 0 || aPosAry.mnSrcHeight == 0 || aPosAry.mnDestWidth == 0 || aPosAry.mnDestHeight == 0) return; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 34aa2856fdac..9893ee41285e 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1292,12 +1292,12 @@ ImplWinData* Window::ImplGetWinData() const } -void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags ) +void Window::CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate ) { if (aPosAry.mnSrcWidth == 0 || aPosAry.mnSrcHeight == 0 || aPosAry.mnDestWidth == 0 || aPosAry.mnDestHeight == 0) return; - if (nFlags & COPYAREA_WINDOWINVALIDATE) + if (bWindowInvalidate) { const Rectangle aSrcRect(Point(aPosAry.mnSrcX, aPosAry.mnSrcY), Size(aPosAry.mnSrcWidth, aPosAry.mnSrcHeight)); @@ -1315,7 +1315,7 @@ void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags ) return; } - OutputDevice::CopyDeviceArea(aPosAry, nFlags); + OutputDevice::CopyDeviceArea(aPosAry, bWindowInvalidate); } SalGraphics* Window::ImplGetFrameGraphics() const diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index b5b581ea2882..946e9e3893f4 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -341,7 +341,7 @@ void setupMethodStubs( functor_vector_type& res ) boost::bind( &OutputDevice::CopyArea, _1, - aPt1,aPt3,aRect2.GetSize(),(sal_uInt16)0 )); + aPt1, aPt3, aRect2.GetSize(), false )); #ifdef NEEDS_QUALIY_PARAMTER /* void DrawBitmap( const Point& rDestPt, |