From 52c81384e054a7953e21866394f5e473ea089358 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Mon, 4 Feb 2019 11:54:27 +0100 Subject: Add PPTX import of shape description Which was skipped before. Change-Id: I7fcd5608a8cdbeea9ea15c9c9aa32c9020154750 --- oox/source/drawingml/shape.cxx | 5 +++++ oox/source/drawingml/shapecontext.cxx | 1 + 2 files changed, 6 insertions(+) (limited to 'oox') diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 09f828e8bfa8..b935bec0de96 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -832,6 +832,11 @@ Reference< XShape > const & Shape::createAndInsert( if( xNamed.is() ) xNamed->setName( msName ); } + if( !msDescription.isEmpty() ) + { + const OUString sDescription( "Description" ); + xSet->setPropertyValue( sDescription, Any( msDescription ) ); + } if (aServiceName != "com.sun.star.text.TextFrame") rxShapes->add( mxShape ); diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index eae01bfe5a6c..60feae99f656 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -74,6 +74,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const mpShapePtr->setHidden( rAttribs.getBool( XML_hidden, false ) ); mpShapePtr->setId( rAttribs.getString( XML_id ).get() ); mpShapePtr->setName( rAttribs.getString( XML_name ).get() ); + mpShapePtr->setDescription( rAttribs.getString( XML_descr ).get() ); break; } case XML_hlinkMouseOver: -- cgit