[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-3' - 2 commits - solenv/gcc-wrappers vcl/source

[Michael Stahl]

 solenv/gcc-wrappers/wrapper.cxx   |    5 +++++
 vcl/source/outdev/transparent.cxx |    1 +
 2 files changed, 6 insertions(+)

New commits:
commit eccbf9df2e08d78b96b01b891e801fc8ef9b1f88
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Apr 18 22:02:23 2015 +0200

    tdf#82430: gcc-wrappers: command line *must* start with a space
    
    Yes, you read that right, if there's no space in front of the first
    argument, cl.exe will *ignore* it.
    
    Change-Id: I73d9bf026705538e53b5d91091a4c96eb15739b2
    (cherry picked from commit c4a267215c10647ff281e9e629faa0a8a201f4b4)
    Reviewed-on: https://gerrit.libreoffice.org/15381
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 0dac335acbcd382fff422e50058d8aa21646a364)
    Reviewed-on: https://gerrit.libreoffice.org/15435
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 918a9b5..704f33c 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -188,6 +188,11 @@ int startprocess(string command, string args) {
         command=command.substr(0,pos+strlen("ccache"))+".exe";
     }
 
+    if (args[0] != ' ')
+    {
+        args.insert(0, " "); // lpCommandLine *must* start with space!
+    }
+
     //cerr << "CMD= " << command << " " << args << endl;
 
     // Commandline may be modified by CreateProcess
commit c8dbae617b4e165c2047a7808240735f413f3360
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/15342
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit 9b05c08079cc5c7bc611ce9c9c44eb5de83391cd)
    Reviewed-on: https://gerrit.libreoffice.org/15424
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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