[Libreoffice-commits] core.git: oox/source

Andras Timar andras.timar at collabora.com
Wed May 27 07:05:16 PDT 2015


 oox/source/export/shapes.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1a4eeac14b618714bb8be9755f508ee63ac4a422
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed May 27 12:47:29 2015 +0200

    tdf#90338 related: ignore empty shape handles struct
    
    Change-Id: I486564a124cfb0d13a8b20e89cf13e752ccb7237
    Reviewed-on: https://gerrit.libreoffice.org/15923
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index fedeefb..2beec40 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -400,8 +400,12 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
                     rProp.Value >>= bFlipV;
                 if ( rProp.Name == "AdjustmentValues" )
                     nAdjustmentValuesIndex = i;
-                else if ( rProp.Name == "Handles" ) {
-                    bHasHandles = true;
+                else if ( rProp.Name == "Handles" )
+                {
+                    uno::Sequence<beans::PropertyValue> aHandles;
+                    rProp.Value >>= aHandles;
+                    if ( aHandles.getLength() )
+                        bHasHandles = true;
                     if( !bIsDefaultObject )
                         bPredefinedHandlesUsed = false;
                     // TODO: update nAdjustmentsWhichNeedsToBeConverted here


More information about the Libreoffice-commits mailing list