diff options
Diffstat (limited to 'oox/source/drawingml/customshapegeometry.cxx')
| -rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 1627530d1acc..9d58367f2d47 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -1169,8 +1169,9 @@ Path2DListContext::Path2DListContext( ContextHandler& rParent, CustomShapeProper // --------------------------------------------------------------------- -OUString GetShapeType( sal_Int32 nType ) +OUString GetShapePresetType( sal_Int32 nType ) { + OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0); OUString sType; switch( nType ) { @@ -1799,6 +1800,7 @@ OUString GetShapeType( sal_Int32 nType ) static OUString GetTextShapeType( sal_Int32 nType ) { + OSL_ASSERT((nType & sal_Int32(0xFFFF0000))==0); OUString sType; switch( nType ) { @@ -2029,7 +2031,7 @@ PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler& rParent, OUString sShapeType; sal_Int32 nShapeType = xAttribs->getOptionalValueToken( XML_prst, FastToken::DONTKNOW ); if ( nShapeType != FastToken::DONTKNOW ) - sShapeType = GetShapeType( nShapeType ); + sShapeType = GetShapePresetType( nShapeType ); OSL_ENSURE( sShapeType.getLength(), "oox::drawingml::CustomShapeCustomGeometryContext::CustomShapeCustomGeometryContext(), unknown shape type" ); mrCustomShapeProperties.setShapePresetType( sShapeType ); } |