summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Godard <lgodard.libre@laposte.net>2013-11-22 19:15:35 +0100
committerLaurent Godard <lgodard.libre@laposte.net>2013-11-22 19:15:35 +0100
commitc9c0d4acfdf5443b7faf28354f9a0697ff11b7df (patch)
tree092e069f0b7036b77ba87966c3c248af116fbd4c
parent007abe6639cbc104767fb35a1277941303a3c91c (diff)
revert the modification writing note TextEdit content feature/notes-refactoring
no visible gain at the moment Change-Id: I7d48c5f9a42e5d7dacab32eee0768d1706b7bfe7
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx7
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 );
}
}