diff options
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 708d243ad0b1..9a83e0f3609d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3685,8 +3685,6 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > false ); Characters(OUString(aDate)); } - // Write the TextEditObject part of the caption - WriteEditCell(pNote->GetEditTextObject()); } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index b5b29b1435fe..e1d29b3c2846 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2955,10 +2955,11 @@ void XMLShapeExport::ImpExportCaptionShape( ImpExportDescription( xShape ); // #i68101# ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); + if( bAnnotation ) - mrExport.exportAnnotationMeta( xShape ); // The text is processed at annotation level - else - ImpExportText( xShape ); + mrExport.exportAnnotationMeta( xShape ); + + ImpExportText( xShape ); } } |