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

[Chris Sherlock]

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

New commits:
commit d662116bb978190693432c8725757d36dd6e7232
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Feb 3 14:48:47 2014 +1100

    fdo#74424 Use Window::GetOutDev() to access ImplGetDPI(X|Y)()
    
    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:
    	include/vcl/window.hxx
    
    Change-Id: I93c83578eb92cdf10c7009f98e91ab177879c141
    Reviewed-on: https://gerrit.libreoffice.org/7788
    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 7654e2e..a836fc5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9471,8 +9471,9 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
     sal_Bool bDevOutput = mbDevOutput;
     mbDevOutput = true;
 
-    long nOldDPIX = ImplGetDPIX();
-    long nOldDPIY = ImplGetDPIY();
+    const OutputDevice *pOutDev = GetOutDev();
+    long nOldDPIX = pOutDev->ImplGetDPIX();
+    long nOldDPIY = pOutDev->ImplGetDPIY();
     mnDPIX = i_pTargetOutDev->ImplGetDPIX();
     mnDPIY = i_pTargetOutDev->ImplGetDPIY();
     sal_Bool bOutput = IsOutputEnabled();