[Libreoffice-commits] core.git: vcl/source

[Chris Sherlock]

 vcl/source/window/window.cxx  |   10 ++++++++--
 vcl/source/window/window2.cxx |    4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit d892e5d4da5b4fe4664c22a6bde21619b62eeae5
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Feb 3 15:02:11 2014 +1100

    fdo#74424 Use Window::GetOutDev() to access ImplGetGraphics()
    
    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/window2.cxx
    
    Change-Id: I964596bb6457ccb24e69bad15c497dbf97e5880f
    Reviewed-on: https://gerrit.libreoffice.org/7789
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a5ebc0c..6c3dca2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -937,7 +937,8 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
         }
         else
         {
-            if ( ImplGetGraphics() )
+            OutputDevice *pOutDev = GetOutDev();
+            if ( pOutDev->ImplGetGraphics() )
             {
                 mpGraphics->GetResolution( mpWindowImpl->mpFrameData->mnDPIX, mpWindowImpl->mpFrameData->mnDPIY );
             }
@@ -1396,9 +1397,14 @@ ImplWinData* Window::ImplGetWinData() const
 SalGraphics* Window::ImplGetFrameGraphics() const
 {
     if ( mpWindowImpl->mpFrameWindow->mpGraphics )
+    {
         mpWindowImpl->mpFrameWindow->mbInitClipRegion = true;
+    }
     else
-        mpWindowImpl->mpFrameWindow->ImplGetGraphics();
+    {
+        OutputDevice *pFrameWinOutDev = mpWindowImpl->mpFrameWindow;
+        pFrameWinOutDev->ImplGetGraphics();
+    }
     mpWindowImpl->mpFrameWindow->mpGraphics->ResetClipRegion();
     return mpWindowImpl->mpFrameWindow->mpGraphics;
 }
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 0af2550..ba9976b 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -424,7 +424,7 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
     // we need a graphics
     if ( !mpGraphics )
     {
-        if ( !ImplGetGraphics() )
+        if ( !pOutDev->ImplGetGraphics() )
             return;
     }
 
@@ -505,7 +505,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
         // we need a graphics
         if ( !mpGraphics )
         {
-            if ( !ImplGetGraphics() )
+            if ( !pOutDev->ImplGetGraphics() )
                 return;
         }