summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Araminowicz <g.araminowicz@gmail.com>2017-07-04 15:21:22 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-07-11 09:46:16 +0200
commitddadcb4f4a2bc6538c219a0a577bdf5999015150 (patch)
tree3f2777b561d735067909f99252fa85116bbc242f
parent287e5033f3dc317ae3adf4a4113ca729e7ab243c (diff)
tdf#108945 Correctly import default value in VML shape adjustments
Change-Id: Ia585572c911a268f68e611935a1d5264dd0790c5 Reviewed-on: https://gerrit.libreoffice.org/39504 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--oox/source/vml/vmlshape.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b90bddafb7ef..5153e517a214 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -815,7 +815,10 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes
{
OUString aToken = maTypeModel.maAdjustments.getToken(0, ',', nIndex);
drawing::EnhancedCustomShapeAdjustmentValue aAdjustmentValue;
- aAdjustmentValue.Value <<= aToken.toInt32();
+ if (aToken.isEmpty())
+ aAdjustmentValue.State = css::beans::PropertyState::PropertyState_DEFAULT_VALUE;
+ else
+ aAdjustmentValue.Value <<= aToken.toInt32();
aAdjustmentValues.push_back(aAdjustmentValue);
} while (nIndex >= 0);