diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-15 15:48:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-15 15:50:46 +0100 |
| commit | af2053c318564ef56235482f058d30ae26ecf77d (patch) | |
| tree | fd62d3ca2cc2546eca4dab8cffbb82d9e86348d6 /filter/source/msfilter | |
| parent | c7876a2c4f2aeb4e5d50716f4519a5b236690a7c (diff) | |
Related: #i119520# rework this to not crash
Change-Id: I479101c5421b03932e69cbf63188f89ee92a1d2f
Diffstat (limited to 'filter/source/msfilter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index ad285b650fe3..51ab62a1593e 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2642,7 +2642,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT const OUString sAdjustmentValues ( "AdjustmentValues" ); const beans::PropertyValue* pAdjustmentValuesProp = NULL; - const beans::PropertyValue* pPathCoordinatesProp = NULL; + bool bPathCoordinatesProp = false; + uno::Any aPathCoordinatesProp; + sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0; uno::Sequence< beans::PropertyValues > aHandlesPropSeq; sal_Bool bPredefinedHandlesUsed = sal_True; @@ -3090,7 +3092,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT else if ( rrProp.Name.equals( sPathCoordinates ) ) { if ( !bIsDefaultObject ) - pPathCoordinatesProp = &rrProp; + { + aPathCoordinatesProp = rrProp.Value; + bPathCoordinatesProp = true; + } } else if ( rrProp.Name.equals( sPathGluePoints ) ) { @@ -3717,10 +3722,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT AddOpt( (sal_uInt16)( DFF_Prop_adjustValue + k ), (sal_uInt32)nValue ); } } - if( pPathCoordinatesProp ) + if( bPathCoordinatesProp ) { com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; - if ( pPathCoordinatesProp->Value >>= aCoordinates ) + if ( aPathCoordinatesProp >>= aCoordinates ) { // creating the vertices if ( (sal_uInt16)aCoordinates.getLength() ) |