mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: #i119520# rework this to not crash

Browse Source 
Change-Id: I479101c5421b03932e69cbf63188f89ee92a1d2f
This commit is contained in:
Caolán McNamara
2013-06-15 15:48:45 +01:00
parent c7876a2c4f
commit af2053c318
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
filter/source/msfilter/escherex.cxx
View File

@@ -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() )