diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-03 20:39:35 +1100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-05 14:30:41 +0000 |
| commit | d56804f00c927100d78ee847416e3ae6c131ecd0 (patch) | |
| tree | 3857bc13207221b3d1e6f3f767729af248908bef | |
| parent | e17cf910320848edbc3d11ec62acbf1c8f531ae5 (diff) | |
fdo#74424 Use Window::GetOutDev() to access ImplSelectClipRegion()
Part of the decoupling of Window from OutputDevice. We now get
the Window's OutputDevice instance and manipulate this. Do not rely
on the inherited function.
Conflicts:
vcl/source/window/window.cxx
Change-Id: Idae6dcaa1c774a437887a7cfdbfc882aa4b35325
Reviewed-on: https://gerrit.libreoffice.org/7797
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/window.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1760a2e002d0..bc7acff9bf6a 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3054,14 +3054,16 @@ void Window::ImplScroll( const Rectangle& rRect, SalGraphics* pGraphics = ImplGetFrameGraphics(); if ( pGraphics ) { + + OutputDevice *pOutDev = GetOutDev(); + if( bReMirror ) { // --- RTL --- frame coordinates require re-mirroring - const OutputDevice *pOutDev = GetOutDev(); pOutDev->ImplReMirror( aRegion ); } - ImplSelectClipRegion( aRegion, pGraphics ); + pOutDev->ImplSelectClipRegion( aRegion, pGraphics ); pGraphics->CopyArea( rRect.Left()+nHorzScroll, rRect.Top()+nVertScroll, rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight(), @@ -3499,7 +3501,9 @@ void Window::ImplPosSizeWindow( long nX, long nY, SalGraphics* pGraphics = ImplGetFrameGraphics(); if ( pGraphics ) { - const bool bSelectClipRegion = ImplSelectClipRegion( aRegion, pGraphics ); + + OutputDevice *pOutDev = GetOutDev(); + const bool bSelectClipRegion = pOutDev->ImplSelectClipRegion( aRegion, pGraphics ); if ( bSelectClipRegion ) { pGraphics->CopyArea( mnOutOffX, mnOutOffY, diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index ecbd0d630cdd..2689957b0b49 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -523,8 +523,9 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) Point aPoint( mnOutOffX, mnOutOffY ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); + OutputDevice *pOutDev = GetOutDev(); ImplClipBoundaries( aRegion, sal_False, sal_False ); - ImplSelectClipRegion( aRegion, pGraphics ); + pOutDev->ImplSelectClipRegion( aRegion, pGraphics ); } } @@ -587,8 +588,9 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) Point aPoint( mnOutOffX, mnOutOffY ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); + OutputDevice *pOutDev = GetOutDev(); ImplClipBoundaries( aRegion, sal_False, sal_False ); - ImplSelectClipRegion( aRegion, pGraphics ); + pOutDev->ImplSelectClipRegion( aRegion, pGraphics ); } } |