summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-12-22 09:08:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-12-23 16:14:43 +0000
commit2b8d5a2d5182ee90568173e702f531a2b9279ef9 (patch)
tree715cc712c9fa08c961645e2548aa14c76d7633cf
parente616ff7e29ee10d0c3ea2dc6a8fc135b87b572b7 (diff)
tdf#93009 SwViewShell: fix printing of comments on the margin
Clipping was set not only in case of VCL-level double buffering, but also during printing, which means comments were excluded from the output. (cherry picked from commit d6913850585eae90ea9179129fe7b60a2a4305ad) Change-Id: Iffb7d91ca78c09e2b43133f5049d52bd7dc4e730 Reviewed-on: https://gerrit.libreoffice.org/20870 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/view/viewsh.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 1b01d6e6d02c..28ece342bb72 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -208,8 +208,8 @@ void SwViewShell::DLPrePaint2(const vcl::Region& rRegion)
mpBufferedOut = mpOut;
mpOut = &(mpTargetPaintWindow->GetTargetOutputDevice());
}
- else
- // In case mpOut is used without buffering, need to set clipping.
+ else if (isOutputToWindow())
+ // In case mpOut is used without buffering and we're not printing, need to set clipping.
mpOut->SetClipRegion(rRegion);
// remember original paint MapMode for wrapped FlyFrame paints