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

[Chris Sherlock]

 vcl/source/window/window.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit a7395942aecd2523ab392b09018dcc1a05527077
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Feb 3 15:21:22 2014 +1100

    fdo#74424 Use Window::GetOutDev() to access ImplReleaseGraphics()
    
    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.
    
    Change-Id: Idde976aacd1bea2871cc72509a59c17af6f560f5
    Reviewed-on: https://gerrit.libreoffice.org/7790
    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 0833331..1760a2e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1130,7 +1130,8 @@ void Window::ImplRemoveWindow( sal_Bool bRemoveFrameData )
     if ( bRemoveFrameData )
     {
         // release the graphic
-        ImplReleaseGraphics();
+        OutputDevice *pOutDev = GetOutDev();
+        pOutDev->ImplReleaseGraphics();
     }
 }
 
@@ -3154,7 +3155,8 @@ void Window::ImplUpdateWindowPtr( Window* pWindow )
     if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow )
     {
         // release graphic
-        ImplReleaseGraphics();
+        OutputDevice *pOutDev = GetOutDev();
+        pOutDev->ImplReleaseGraphics();
     }
 
     mpWindowImpl->mpFrameData     = pWindow->mpWindowImpl->mpFrameData;
@@ -4656,7 +4658,8 @@ Window::~Window()
     }
 
     // release SalGraphics
-    ImplReleaseGraphics();
+    OutputDevice *pOutDev = GetOutDev();
+    pOutDev->ImplReleaseGraphics();
 
     // notify ImplDelData subscribers of this window about the window deletion
     ImplDelData* pDelData = mpWindowImpl->mpFirstDel;