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

[Grzegorz Araminowicz]

 oox/source/vml/vmlshape.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ddadcb4f4a2bc6538c219a0a577bdf5999015150
Author: Grzegorz Araminowicz <g.araminowicz at gmail.com>
Date:   Tue Jul 4 15:21:22 2017 +0200

    tdf#108945 Correctly import default value in VML shape adjustments
    
    Change-Id: Ia585572c911a268f68e611935a1d5264dd0790c5
    Reviewed-on: https://gerrit.libreoffice.org/39504
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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);