[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Vasily Melenchuk]

 vcl/source/gdi/pdfwriter_impl.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 581806182ac7da81115c9675b4e828688178aa04
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
Date:   Thu May 25 13:44:52 2017 +0300

    tdf#99680 modified clipping for PDF export
    
    If clipping is requested, but no clipping region is defined,
    clipping is ignored.
    
    This squashes the following 3 commits:
    
    Reviewed-on: https://gerrit.libreoffice.org/38021
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    
    Reviewed-on: https://gerrit.libreoffice.org/38403
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    
    Reviewed-on: https://gerrit.libreoffice.org/38694
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-on: https://gerrit.libreoffice.org/38825
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit f6726209329fefe9decca8fda8e136b8472a95a2)
    
    Conflicts:
            vcl/qa/cppunit/pdfexport/pdfexport.cxx
            no pdf unit tests on -5-3, so dropping those pieces
    
    Change-Id: I793c1de1f4f6b0203727c0ff6aa8adecc43ad413
    d4565858b0135b3177044558db87a68ef828955b
    102722140e216cb9ad29107aae3bdaa70472d471
    Reviewed-on: https://gerrit.libreoffice.org/38852
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 28fb58db826f..e0942f91a1ea 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -12378,12 +12378,13 @@ void PDFWriterImpl::updateGraphicsState(Mode const mode)
                 getReferenceDevice()->SetMapMode( rNewState.m_aMapMode );
                 m_aCurrentPDFState.m_aMapMode = rNewState.m_aMapMode;
 
-                aLine.append( "q " );
-                if( rNewState.m_aClipRegion.count() )
+                aLine.append("q ");
+                if ( rNewState.m_aClipRegion.count() )
+                {
                     m_aPages.back().appendPolyPolygon( rNewState.m_aClipRegion, aLine );
-                else
-                    aLine.append( "0 0 m h " ); // NULL clip, i.e. nothing visible
-                aLine.append( "W* n\n" );
+                    aLine.append( "W* n\n" );
+                }
+
                 rNewState.m_aMapMode = aNewMapMode;
                 getReferenceDevice()->SetMapMode( rNewState.m_aMapMode );
                 m_aCurrentPDFState.m_aMapMode = rNewState.m_aMapMode;