summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/outdev.hxx7
-rw-r--r--include/vcl/print.hxx2
-rw-r--r--include/vcl/window.hxx2
-rw-r--r--vcl/source/gdi/print.cxx2
-rw-r--r--vcl/source/outdev/outdev.cxx8
-rw-r--r--vcl/source/window/window.cxx6
-rw-r--r--vcl/workben/outdevgrind.cxx2
7 files changed, 13 insertions, 16 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 728ce4278ee5..ee1752d06979 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -186,9 +186,6 @@ namespace o3tl
template<> struct typed_flags<DrawTextFlags> : is_typed_flags<DrawTextFlags, 0xffff> {};
}
-// Flags for CopyArea()
-#define COPYAREA_WINDOWINVALIDATE ((sal_uInt16)0x0001)
-
// Flags for DrawImage()
#define IMAGE_DRAW_DISABLE ((sal_uInt16)0x0001)
#define IMAGE_DRAW_HIGHLIGHT ((sal_uInt16)0x0002)
@@ -555,7 +552,7 @@ public:
virtual void CopyArea(
const Point& rDestPt,
const Point& rSrcPt, const Size& rSrcSize,
- sal_uInt16 nFlags = 0 );
+ bool bWindowInvalidate = false );
// Call before and after a paint operation to reduce flushing
void BeginPaint();
@@ -563,7 +560,7 @@ public:
protected:
- virtual void CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags);
+ virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate = false);
SAL_DLLPRIVATE void drawOutDevDirect ( const OutputDevice* pSrcDev, SalTwoRect& rPosAry );
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 7fe9e7926d71..70dcb9ccf278 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -399,7 +399,7 @@ public:
const OutputDevice& rOutDev ) SAL_OVERRIDE;
virtual void CopyArea( const Point& rDestPt,
const Point& rSrcPt, const Size& rSrcSize,
- sal_uInt16 nFlags = 0 ) SAL_OVERRIDE;
+ bool bWindowInvalidate = false ) SAL_OVERRIDE;
virtual void DrawImage( const Point&, const Image&, sal_uInt16 ) SAL_OVERRIDE;
virtual void DrawImage( const Point&, const Size&,
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d975ff872fad..9e760e3b5b43 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -699,7 +699,7 @@ protected:
// FIXME: this is a hack to workaround missing layout functionality
SAL_DLLPRIVATE void ImplAdjustNWFSizes();
- virtual void CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags) SAL_OVERRIDE;
+ virtual void CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate = false) SAL_OVERRIDE;
virtual void ClipToPaintRegion( Rectangle& rDstRect ) SAL_OVERRIDE;
virtual bool UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
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,
generated by cgit (git 2.34.1) at 2025-01-04 12:00:30 +0000