diff options
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev2.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 10 |
4 files changed, 8 insertions, 11 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index cbdf725bcd2f..eb4d0ba3f78e 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -736,7 +736,7 @@ public: SAL_DLLPRIVATE void ImplDrawAlpha ( const Bitmap& rBmp, const AlphaMask& rAlpha, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); - virtual Rectangle& GetPaintArea ( Rectangle& rDstRect ); + virtual void ClipToPaintRegion ( Rectangle& rDstRect ); SAL_DLLPRIVATE Bitmap ImplBlend ( Bitmap aBmp, BitmapReadAccess* pP, BitmapReadAccess* pA, diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d41f0f52c608..5bf0e8d642c0 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -579,7 +579,7 @@ protected: virtual OUString getDefaultAccessibleName() const; virtual void CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags); - virtual Rectangle& GetPaintArea ( Rectangle& rDstRect ); + virtual void ClipToPaintRegion( Rectangle& rDstRect ); public: bool HasMirroredGraphics() const; diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index c5d18c9feb62..29f170231d7e 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -1990,9 +1990,8 @@ Bitmap OutputDevice::ImplBlend( Bitmap aBmp, return res; } -Rectangle& OutputDevice::GetPaintArea( Rectangle& rDstRect ) +void OutputDevice::ClipToPaintRegion(Rectangle& /*rDstRect*/) { - return rDstRect; } void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, @@ -2006,7 +2005,7 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, const bool bHMirr = aOutSz.Width() < 0; const bool bVMirr = aOutSz.Height() < 0; - aDstRect = GetPaintArea(aDstRect); + ClipToPaintRegion(aDstRect); if( bHMirr ) { diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 49716ed8fa37..abe769a3af65 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -446,14 +446,12 @@ void Window::CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags ) OutputDevice::CopyAreaFinal(aPosAry, nFlags); } -Rectangle& Window::GetPaintArea( Rectangle& rDstRect ) +void Window::ClipToPaintRegion(Rectangle& rDstRect) { - const Region aPaintRgn( GetPaintRegion() ); + const Region aPaintRgn(GetPaintRegion()); - if( !aPaintRgn.IsNull() ) - rDstRect.Intersection( LogicToPixel( aPaintRgn.GetBoundRect() ) ); - - return rDstRect; + if (!aPaintRgn.IsNull()) + rDstRect.Intersection(LogicToPixel(aPaintRgn.GetBoundRect())); } void Window::ImplReleaseGraphics( bool bRelease ) |