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

[Michael Stahl]

 vcl/source/outdev/transparent.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 64e72e62eb8b6c80e9763ea0b4d4ca28dfe3a43b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Apr 16 15:14:48 2015 +0200

    tdf#84294: vcl: fix PDF export of transparent Writer frames in LO 4.3
    
    The transparent frame background is painted opaque because
    OutputDevice::DrawTransparent() records a MetaTransparentAction
    instead of returning early.
    
    Note that master and 4.4 use drawinglayer to paint backgrounds
    so the problem is only visible in 4.3.
    
    (regression from 36b59f2efc2bfb2c9256c39eb5687808deb)
    
    Change-Id: Ide7a076b72123097a9fe099b96d36cda7f7bb082
    (cherry picked from commit 581314958f0ddd6c3a0536ce2d7e7e6f0c53a8ec)
    Reviewed-on: https://gerrit.libreoffice.org/15343
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit 9ef6eea9c60ee82d7d56cd7dc99515ab3fbe2b17)
    Reviewed-on: https://gerrit.libreoffice.org/15349
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 2b94fb6..a535624 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -611,6 +611,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
     if( !mbFillColor || (nTransparencePercent >= 100) )
     {
         DrawInvisiblePolygon( rPolyPoly );
+        return; // tdf#84294: do not record it in metafile
     }
 
     // handle metafile recording