diff options
Diffstat (limited to 'xmloff/source/draw/shapeexport.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 370bfcf3e44f..f75e334a246c 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -728,7 +728,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } // export draw:display (do not export in ODF 1.2 or older) - if( xSet.is() && ( mrExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) ) + if (xSet.is() && (mrExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)) { if( aShapeInfo.meShapeType != XmlShapeTypeDrawPageShape && aShapeInfo.meShapeType != XmlShapeTypePresPageShape && aShapeInfo.meShapeType != XmlShapeTypeHandoutShape && aShapeInfo.meShapeType != XmlShapeTypeDrawChartShape ) @@ -1563,7 +1563,7 @@ void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xSh { if (eExtensionNS == TextPNS::EXTENSION) { - if (mrExport.getDefaultVersion() <= SvtSaveOptions::ODFVER_012) + if (mrExport.getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012) { return; // do not export to ODF 1.1/1.2 } @@ -2408,7 +2408,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( } { - if (GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012) + if (GetExport().getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012) { if (sOutMimeType.isEmpty()) { @@ -2456,7 +2456,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); } - if (!aMimeType.isEmpty() && GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012) + if (!aMimeType.isEmpty() && GetExport().getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012) mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", aMimeType); SvXMLElementExport aElement(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true); @@ -2475,7 +2475,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( ImpExportDescription( xShape ); // #i68101# // Signature Line, QR Code - needs to be after the images! - if (GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012) + if (GetExport().getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012) { ImpExportSignatureLine(xShape); ImpExportQRCode(xShape); @@ -4116,7 +4116,7 @@ static void ImpExportEnhancedPath( SvXMLExport& rExport, } aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( bExtended ? XML_NAMESPACE_DRAW_EXT : XML_NAMESPACE_DRAW, XML_ENHANCED_PATH, aStr ); - if ( !bExtended && bNeedExtended && (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) ) + if (!bExtended && bNeedExtended && (rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)) ImpExportEnhancedPath( rExport, rCoordinates, rSegments, true ); } @@ -4579,7 +4579,7 @@ static void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Referenc case EAS_SubViewSize: { // export draw:sub-view-size (do not export in ODF 1.2 or older) - if (rExport.getDefaultVersion() <= SvtSaveOptions::ODFVER_012) + if (rExport.getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012) { continue; } @@ -4835,7 +4835,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true ); // do not export in ODF 1.1 or older - if( mrExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if (mrExport.getSaneDefaultVersion() >= SvtSaveOptions::ODFSVER_012) { if( !bIsEmptyPresObj ) { |