Kaydet (Commit) e80bb313 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

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
üst 189c655f
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: shapeexport4.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -259,6 +259,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert ...@@ -259,6 +259,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert
for ( i = 0; i < nElements; i++ ) for ( i = 0; i < nElements; i++ )
{ {
sal_Bool bPosition = sal_False;
const uno::Sequence< beans::PropertyValue >& rPropSeq = rHandles[ i ]; const uno::Sequence< beans::PropertyValue >& rPropSeq = rHandles[ i ];
for ( j = 0; j < (sal_uInt32)rPropSeq.getLength(); j++ ) for ( j = 0; j < (sal_uInt32)rPropSeq.getLength(); j++ )
{ {
...@@ -274,6 +275,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert ...@@ -274,6 +275,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert
ExportParameter( aStrBuffer, aPosition.Second ); ExportParameter( aStrBuffer, aPosition.Second );
aStr = aStrBuffer.makeStringAndClear(); aStr = aStrBuffer.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_POSITION, aStr ); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_POSITION, aStr );
bPosition = sal_True;
} }
} }
break; break;
...@@ -383,13 +385,12 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert ...@@ -383,13 +385,12 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert
break; 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, void ImpExportEnhancedPath( SvXMLExport& rExport,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment