diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 12:39:46 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 12:39:46 +0000 |
commit | 0f0b9ddcaea058cf8e41b142aaf99926b0f6ff1f (patch) | |
tree | 61e195fef0f40e0de2a6b916dc63245df5024c77 /xmloff/source/draw/shapeexport2.cxx | |
parent | bb129db991b9154444df2b1389b6d6e42a4efb5e (diff) |
INTEGRATION: CWS dr12 (1.31.8); FILE MERGED
2004/08/27 07:38:42 sab 1.31.8.3: RESYNC: (1.33-1.35); FILE MERGED
2004/07/26 11:29:20 sab 1.31.8.2: RESYNC: (1.31-1.33); FILE MERGED
2004/07/23 20:59:58 sab 1.31.8.1: #i21253#; add formatted notes
Diffstat (limited to 'xmloff/source/draw/shapeexport2.cxx')
-rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 27f95ec07880..3622c472da2c 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport2.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: rt $ $Date: 2004-08-23 07:58:31 $ + * last change: $Author: hr $ $Date: 2004-09-08 13:39:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1631,11 +1631,17 @@ void XMLShapeExport::ImpExportCaptionShape( // write Caption shape. Add export later. sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - SvXMLElementExport aOBJ(rExport, XML_NAMESPACE_DRAW, XML_CAPTION, bCreateNewline, sal_True); + SvXMLElementExport* pObj = NULL; + if ( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION ) + pObj = new SvXMLElementExport(rExport, XML_NAMESPACE_OFFICE, XML_ANNOTATION, bCreateNewline, sal_True); + else + pObj = new SvXMLElementExport(rExport, XML_NAMESPACE_DRAW, XML_CAPTION, bCreateNewline, sal_True); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); ImpExportText( xShape ); + rExport.exportAnnotationMeta( xShape ); + delete pObj; } } |