Skip to content

C
core
Kaydet (Commit) e2e45e25 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

Related: fdo#58819 VML import: shape types not starting with a hashmark are OK 

Change-Id: I2a04aeedd6899eb2717b070fa61a21991bc7be8a
üst 10777b37
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
oox/source/vml/vmlshape.cxx
Dosyayı görüntüle @ e2e45e25
...@@ -263,10 +263,14 @@ ShapeBase::ShapeBase( Drawing& rDrawing ) : ...@@ -263,10 +263,14 @@ ShapeBase::ShapeBase( Drawing& rDrawing ) :
void ShapeBase::finalizeFragmentImport() void ShapeBase::finalizeFragmentImport()
{ {
// resolve shape template reference if( maShapeModel.maType.getLength() > 1 )
if( (maShapeModel.maType.getLength() > 1) && (maShapeModel.maType[ 0 ] == '#') ) {
if( const ShapeType* pShapeType = mrDrawing.getShapes().getShapeTypeById( maShapeModel.maType.copy( 1 ), true ) ) OUString aType = maShapeModel.maType;
if (aType[ 0 ] == '#')
aType = aType.copy(1);
if( const ShapeType* pShapeType = mrDrawing.getShapes().getShapeTypeById( aType, true ) )
maTypeModel.assignUsed( pShapeType->getTypeModel() ); maTypeModel.assignUsed( pShapeType->getTypeModel() );
}
} }
OUString ShapeBase::getShapeName() const OUString ShapeBase::getShapeName() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment