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

[Chris Sherlock]

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

New commits:
commit d56804f00c927100d78ee847416e3ae6c131ecd0
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Feb 3 20:39:35 2014 +1100

    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 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 1760a2e..bc7acff 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 ecbd0d6..2689957 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 );
         }
     }