Kaydet (Commit) d56804f0 authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Caolán McNamara

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/7797Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e17cf910
......@@ -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,
......
......@@ -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 );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment