[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - oox/source

Caolán McNamara caolanm at redhat.com
Fri Dec 1 09:31:09 UTC 2017


 oox/source/drawingml/fillproperties.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d48ab02bd3bdb8f33ad9b5ca6b2a641614da6ae4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 30 20:29:36 2017 +0000

    ofz: handle empty Gradient Stops
    
    Change-Id: I7e719b21bd21085ffdd0226a4a25d406a4e69351
    Reviewed-on: https://gerrit.libreoffice.org/45619
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 314ff5822695..7786f26cda79 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -378,7 +378,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
                         ::std::swap( aGradient.StartColor, aGradient.EndColor );
                         ::std::swap( nStartTrans, nEndTrans );
                     }
-                    else
+                    else if (!maGradientProps.maGradientStops.empty())
                     {
                         // A copy of the gradient stops for local modification
                         GradientFillProperties::GradientStopMap aGradientStops(maGradientProps.maGradientStops);


More information about the Libreoffice-commits mailing list