diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 17:19:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 17:19:35 +0000 |
| commit | e80bb313951d2b276e3c94d71b4fc29d2c37e5e7 (patch) | |
| tree | fb53e5e29179f8cf7420659a8f5f1c900a6e8faa | |
| parent | 189c655f7628e1866e827d4af7e347bf0c6b2f14 (diff) | |
INTEGRATION: CWS impress123 (1.16.118); FILE MERGED
2007/07/12 11:30:56 cl 1.16.118.2: RESYNC: (1.16-1.17); FILE MERGED
2007/07/02 15:44:23 sj 1.16.118.1: #I68288# no longer exporting a handle element without handle position
| -rw-r--r-- | xmloff/source/draw/shapeexport4.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index 03ed4320fc68..07076e303914 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shapeexport4.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:06:49 $ + * last change: $Author: hr $ $Date: 2007-08-02 18:19:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -259,6 +259,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert for ( i = 0; i < nElements; i++ ) { + sal_Bool bPosition = sal_False; const uno::Sequence< beans::PropertyValue >& rPropSeq = rHandles[ i ]; for ( j = 0; j < (sal_uInt32)rPropSeq.getLength(); j++ ) { @@ -274,6 +275,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert ExportParameter( aStrBuffer, aPosition.Second ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_POSITION, aStr ); + bPosition = sal_True; } } break; @@ -383,13 +385,12 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; } } - SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_HANDLE, sal_True, sal_True ); + if ( bPosition ) + SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_HANDLE, sal_True, sal_True ); + else + rExport.ClearAttrList(); } } - else - { - SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_HANDLE, sal_True, sal_True ); - } } void ImpExportEnhancedPath( SvXMLExport& rExport, |