summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-05-27 12:47:29 +0200
committerAndras Timar <andras.timar@collabora.com>2015-05-28 09:05:38 +0200
commit9ad8490e1154d5667249d56a63c9c00111cafa4d (patch)
tree0f5332d8d4e21d4cfbfc7208e8d7bc9ee0e6e90e
parent0fa10fa7ea7026de7d998776201747afda0ca6b2 (diff)
tdf#90338 related: ignore empty shape handles struct
Change-Id: I486564a124cfb0d13a8b20e89cf13e752ccb7237 Reviewed-on: https://gerrit.libreoffice.org/15923 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1a4eeac14b618714bb8be9755f508ee63ac4a422)
-rw-r--r--oox/source/export/shapes.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index e2a5e75eb42a..735c569d5a15 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