[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Miklos Vajna]

 sw/source/core/view/viewsh.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b8d5a2d5182ee90568173e702f531a2b9279ef9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 22 09:08:18 2015 +0100

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 1b01d6e..28ece34 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