diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-03 20:00:11 +1100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-05 14:51:39 +0000 |
| commit | 9cb1018c81dbceead9ee2f4da26989035c5a0bab (patch) | |
| tree | b5d9b532b3100ab95398dcb6f3a73fc79320cf38 | |
| parent | f1e96f263d3fddf028a8fd6e09c3a6781718aab7 (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/window/window.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6c3dca204be2..41f7ebeefbf5 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 ); |