INTEGRATION: CWS oasisrng03 (1.59.62); FILE MERGED
2007/08/01 22:17:30 cl 1.59.62.3: RESYNC: (1.60-1.61); FILE MERGED
2007/07/10 08:53:07 ama 1.59.62.2: RESYNC: (1.59-1.60); FILE MERGED
2007/07/09 11:27:57 cl 1.59.62.1: #i75926# do not export empty object and image placeholder if flag for backward compatibility is off
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index b6c3c6f..f240131 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: shapeexport2.cxx,v $
*
* $Revision: 1.62 $
* $Revision: 1.63 $
*
* last change: $Author: hr $ $Date: 2007-08-02 17:23:07 $
* last change: $Author: hr $ $Date: 2007-08-03 12:54:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1240,7 +1240,9 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
XML_FRAME, bCreateNewline, sal_True );
if( !bIsEmptyPresObj || !mrExport.isExperimentalOdfExportEnabled() )
const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
{
if( !bIsEmptyPresObj )
{
@@ -1675,7 +1677,9 @@ void XMLShapeExport::ImpExportOLE2Shape(
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
XML_FRAME, bCreateNewline, sal_True );
if( !bIsEmptyPresObj || !mrExport.isExperimentalOdfExportEnabled() )
const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
{
if (pAttrList)
{
