strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS xmlfilter04 (1.46.148); FILE MERGED

Browse source 
2008/03/19 16:29:02 hbrinkm 1.46.148.2: RESYNC: (1.46-1.47); FILE MERGED
2008/02/28 20:02:49 sj 1.46.148.1: accepting number values for shape types, which is needed for the vml importer
This commit is contained in:
Rüdiger Timm 2008-04-18 12:26:12 +00:00
parent e57b3eefd9
commit a04db9e3ed
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
svx/source/svdraw/svdoashp.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: svdoashp.cxx,v $
* $Revision: 1.48 $
* $Revision: 1.49 $
*
* This file is part of OpenOffice.org.
*
@ -681,10 +681,15 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType )
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
if ( pType && pType->getLength() )
{
sal_Int32 nType = pType->toInt32();
if ( nType )
sShapeType = EnhancedCustomShapeTypeNames::Get( static_cast< MSO_SPT >( nType ) );
else
sShapeType = *pType;
aPropVal.Name = sType;
aPropVal.Value <<= *pType;
aPropVal.Value <<= sShapeType;
aGeometryItem.SetPropertyValue( aPropVal );
sShapeType = *pType;
}
else
{