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

2 files changed, 18 insertions, 18 deletions

diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index d09b63002c7f..ab3f2f4fe665 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -432,7 +432,7 @@ void ScXMLExportDataPilot::WriteSubTotals(const ScDPSaveDimension* pDim)
 {
     sal_Int32 nSubTotalCount = pDim->GetSubTotalsCount();
     std::optional<OUString> pLayoutName;
-    if (rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+    if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
         // Export display names only for 1.2 extended or later.
         pLayoutName = pDim->GetSubtotalName();
 
@@ -464,7 +464,7 @@ void ScXMLExportDataPilot::WriteMembers(const ScDPSaveDimension* pDim)
         {
             rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rpMember->GetName());
 
-            if (rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+            if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
             {
                 // Export display names only for ODF 1.2 extended or later.
                 const std::optional<OUString> & pLayoutName = rpMember->GetLayoutName();
@@ -492,7 +492,7 @@ void ScXMLExportDataPilot::WriteLevels(const ScDPSaveDimension* pDim)
         ::sax::Converter::convertBool(sBuffer, pDim->GetShowEmpty());
         rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, sBuffer.makeStringAndClear());
     }
-    if (rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+    if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
     {
         OUStringBuffer sBuffer;
         ::sax::Converter::convertBool(sBuffer, pDim->GetRepeatItemLabels());
@@ -675,7 +675,7 @@ void ScXMLExportDataPilot::WriteDimension(const ScDPSaveDimension* pDim, const S
 {
     OUString aSrcDimName = ScDPUtil::getSourceDimensionName(pDim->GetName());
     rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, aSrcDimName);
-    if (rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+    if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
     {
         // Export display names only for ODF 1.2 extended or later.
         const std::optional<OUString> & pLayoutName = pDim->GetLayoutName();
@@ -700,7 +700,7 @@ void ScXMLExportDataPilot::WriteDimension(const ScDPSaveDimension* pDim, const S
 
     if (eOrientation == sheet::DataPilotFieldOrientation_PAGE)
     {
-        if (rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+        if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
         {
             rExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_IGNORE_SELECTED_PAGE, "true");
         }
@@ -813,7 +813,7 @@ void ScXMLExportDataPilot::WriteDataPilots()
         // grand total elements.
 
         const std::optional<OUString> & pGrandTotalName = pDPSave->GetGrandTotalName();
-        if (pGrandTotalName && rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+        if (pGrandTotalName && rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
         {
             // Use the new data-pilot-grand-total element.
             if (bRowGrand && bColumnGrand)
@@ -832,7 +832,7 @@ void ScXMLExportDataPilot::WriteDataPilots()
         {
             const ScSheetSourceDesc* pSheetSource = (*pDPs)[i].GetSheetDesc();
 
-            if (rExport.getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+            if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
             {
                 if (pSheetSource->HasRangeName())
                 {
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index b60c4959ce7c..93e4743276c8 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1707,7 +1707,7 @@ void ScXMLExport::SetBodyAttributes()
                 {
                     AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
                                  ScPassHashHelper::getHashURI(PASSHASH_XL));
-                    if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+                    if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
                         AddAttribute(XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
                                 ScPassHashHelper::getHashURI(PASSHASH_SHA1));
                 }
@@ -2830,7 +2830,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const uno::Reference<sheet::XSpre
                         {
                             AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
                                          ScPassHashHelper::getHashURI(PASSHASH_XL));
-                            if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+                            if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
                                 AddAttribute(XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
                                         ScPassHashHelper::getHashURI(PASSHASH_SHA1));
                         }
@@ -2859,7 +2859,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const uno::Reference<sheet::XSpre
         AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT, XML_FALSE);
     SvXMLElementExport aElemT(*this, sElemTab, true, true);
 
-    if (pProtect && pProtect->isProtected() && getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+    if (pProtect && pProtect->isProtected() && getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
     {
         if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS))
             AddAttribute(XML_NAMESPACE_LO_EXT, XML_SELECT_PROTECTED_CELLS, XML_TRUE);
@@ -2981,7 +2981,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const uno::Reference<sheet::XSpre
             WriteNamedRange(pRangeName);
         }
 
-        if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+        if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
         {
             //export new conditional format information
             ExportConditionalFormat(nTable);
@@ -3138,7 +3138,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
             {
                 GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                     aCell.nNumberFormat, aCell.maBaseCell.mfValue);
-                if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+                if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
                     GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                             aCell.nNumberFormat, aCell.maBaseCell.mfValue, false, XML_NAMESPACE_CALC_EXT, false);
             }
@@ -3149,7 +3149,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
                 OUString sCellString = aCell.maBaseCell.getString(pDoc);
                 GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                         sCellString, sFormattedString);
-                if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+                if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
                     GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                             sCellString, sFormattedString, false, XML_NAMESPACE_CALC_EXT);
             }
@@ -3185,7 +3185,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
                     {
                         AddAttribute(sAttrValueType, XML_STRING);
                         AddAttribute(sAttrStringValue, aCell.maBaseCell.getString(pDoc));
-                        if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+                        if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
                         {
                             //export calcext:value-type="error"
                             AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, OUString("error"));
@@ -3200,7 +3200,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
                         {
                             GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                                     aCell.nNumberFormat, pDoc->GetValue(aCell.maCellAddress));
-                            if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+                            if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
                             {
                                 GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
                                         aCell.nNumberFormat, pDoc->GetValue(aCell.maCellAddress), false, XML_NAMESPACE_CALC_EXT, false );
@@ -3213,7 +3213,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
                         {
                             AddAttribute(sAttrValueType, XML_STRING);
                             AddAttribute(sAttrStringValue, aCell.maBaseCell.getString(pDoc));
-                            if (getSaneDefaultVersion() > SvtSaveOptions::ODFSVER_012)
+                            if (getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED)
                             {
                                 AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, XML_STRING);
                             }
@@ -3998,7 +3998,7 @@ void ScXMLExport::WriteExternalDataMapping()
     if (!pDoc)
         return;
 
-    if (getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012)
+    if ((getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) == 0)
         // Export this only for 1.2 extended and above.
         return;
 
@@ -4331,7 +4331,7 @@ void ScXMLExport::WriteDataStream()
         // Export this only in experimental mode.
         return;
 
-    if (getSaneDefaultVersion() <= SvtSaveOptions::ODFSVER_012)
+    if ((getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) == 0)
         // Export this only for 1.2 extended and above.
         return;