diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 10:09:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 10:09:19 +0000 |
| commit | 10db5e83da2ad077e5ca4f3a1f32bc4e2bb735b4 (patch) | |
| tree | ad7bb660b2a1ba8e2d24665c657caf87871559bb /xmloff | |
| parent | 0e8306c371090c9475f6d9f403104e634a1a6888 (diff) | |
INTEGRATION: CWS oasisbf4 (1.39.16); FILE MERGED
2004/12/08 07:27:49 mib 1.39.16.2: RESYNC: (1.39-1.42); FILE MERGED
2004/11/23 13:00:37 mib 1.39.16.1: #i36961#: change order of <office:annotation>'s children
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 65e7321a87e2..4007d3e99ab0 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport2.cxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: rt $ $Date: 2004-11-26 19:33:25 $ + * last change: $Author: rt $ $Date: 2005-01-27 11:09:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1739,17 +1739,18 @@ void XMLShapeExport::ImpExportCaptionShape( // write Caption shape. Add export later. sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - 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); + sal_Bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION ); + SvXMLElementExport aObj( rExport, + (bAnnotation ? XML_NAMESPACE_OFFICE + : XML_NAMESPACE_DRAW), + (bAnnotation ? XML_ANNOTATION : XML_CAPTION), + bCreateNewline, sal_True ); ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); + if( bAnnotation ) + rExport.exportAnnotationMeta( xShape ); ImpExportText( xShape ); - rExport.exportAnnotationMeta( xShape ); - delete pObj; } } |