summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-02-03 14:48:47 +1100
committerCaolán McNamara <caolanm@redhat.com>2014-02-05 14:16:04 +0000
commitd662116bb978190693432c8725757d36dd6e7232 (patch)
tree2ed505b3d89782bbfb814880766e46b254c178dc
parent625971b104bd39c0168816f822d1a0c491e25f45 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/window/window.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7654e2ef9af6..a836fc5ee789 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();