sc/source/filter/xml/xmlexprt.cxx | 2 --
xmloff/source/draw/shapeexport.cxx | 7 ++++---
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit c9c0d4acfdf5443b7faf28354f9a0697ff11b7df
Author: Laurent Godard <lgodard.li...@laposte.net>
Date: Fri Nov 22 19:15:35 2013 +0100
revert the modification writing note TextEdit content
no visible gain at the moment
Change-Id: I7d48c5f9a42e5d7dacab32eee0768d1706b7bfe7
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 708d243..9a83e0f 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 b5b29b1..e1d29b3 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 );
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
