diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-24 18:32:11 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-09 09:17:36 +0200 |
| commit | 7c20c3c2a9fc85c66dad9d09908b257beeedd78d (patch) | |
| tree | 84d07d36ea2c72df61afa031657db2535da363a0 /xmloff/source/draw/shapeexport.cxx | |
| parent | 21ac2dae6a84b2c686abdbefb5d9bd10fed42680 (diff) | |
xmloff: ODF export: adapt all checks of ODFSVER_012 etc.
Most of these actually want to check ODFSVER_EXTENDED because the
extension didn't get into ODF 1.3.
Change-Id: I1b625a329f7a3d146c616c62c15b56e2c314c2c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92872
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
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 f75e334a246c..d1d46bf32dab 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -727,8 +727,8 @@ 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.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)) + // export draw:display (do not export in ODF 1.3 or older) + if (xSet.is() && (mrExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)) { if( aShapeInfo.meShapeType != XmlShapeTypeDrawPageShape && aShapeInfo.meShapeType != XmlShapeTypePresPageShape && aShapeInfo.meShapeType != XmlShapeTypeHandoutShape && aShapeInfo.meShapeType != XmlShapeTypeDrawChartShape ) @@ -1563,9 +1563,9 @@ void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xSh { if (eExtensionNS == TextPNS::EXTENSION) { - if (mrExport.getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012) + if ((mrExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) == 0) { - return; // do not export to ODF 1.1/1.2 + return; // do not export to ODF 1.1/1.2/1.3 } } uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY ); @@ -2475,7 +2475,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( ImpExportDescription( xShape ); // #i68101# // Signature Line, QR Code - needs to be after the images! - if (GetExport().getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012) + if (GetExport().getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) { 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.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)) + if (!bExtended && bNeedExtended && (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)) ImpExportEnhancedPath( rExport, rCoordinates, rSegments, true ); } @@ -4578,8 +4578,8 @@ 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.getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012) + // export draw:sub-view-size (do not export in ODF 1.3 or older) + if ((rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) == 0) { continue; } |