vcl/source/window/window.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit 9cb1018c81dbceead9ee2f4da26989035c5a0bab Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Feb 3 20:00:11 2014 +1100 fdo#74424 Use Window::GetOutDev() to access ImplInitOutDevData() 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: Ia68ba25a9d42ce653c093dbea7087ab8431c8509 Reviewed-on: https://gerrit.libreoffice.org/7795 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6c3dca2..41f7ebe 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -9032,7 +9032,10 @@ void Window::SetAccessibilityEventsSuppressed(sal_Bool bSuppressed) void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& rRect ) { if( ! mpOutDevData ) - ImplInitOutDevData(); + { + OutputDevice *pOutDev = GetOutDev(); + pOutDev->ImplInitOutDevData(); + } mpOutDevData->mpRecordLayout = pLayout; mpOutDevData->maRecordRect = rRect; Paint( rRect ); @@ -9601,7 +9604,8 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame && pChild->IsVisible() ) { long nDeltaX = pChild->mnOutOffX - mnOutOffX; - if( ImplHasMirroredGraphics() ) + + if( pOutDev->ImplHasMirroredGraphics() ) nDeltaX = mnOutWidth - nDeltaX - pChild->mnOutWidth; long nDeltaY = pChild->GetOutOffYPixel() - GetOutOffYPixel(); Point aPos( i_rPos );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits