summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2019-02-04 11:54:27 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-02-06 16:46:09 +0100
commit52c81384e054a7953e21866394f5e473ea089358 (patch)
tree1b504bb0cce4ca7bff696217318280b51c8d635b /oox
parent9547c0edef9a48937e4d9651a840c49481a4fbd9 (diff)
Add PPTX import of shape description
Which was skipped before. Change-Id: I7fcd5608a8cdbeea9ea15c9c9aa32c9020154750
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx5
-rw-r--r--oox/source/drawingml/shapecontext.cxx1
2 files changed, 6 insertions, 0 deletions
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: