summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-12-22 09:08:18 +0100
committerAndras Timar <andras.timar@collabora.com>2016-01-04 12:20:36 +0100
commitdc399464d62687bf0a0aed1a4c6f1413b8b06197 (patch)
treec9d8ab04e09ce2a04a5177a985018b00cfa42154 /sw
parentc2fb34b741ddc41e7adfb4a02087940d69fd5ec4 (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/20872 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit be005a7a4ec5934372d4b13b96b22d2c8659ed95)
Diffstat (limited to 'sw')
-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 9112bfbda73f..a660c96a6345 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -211,8 +211,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