diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-06-05 03:57:55 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-06-05 05:10:57 +0200 |
| commit | 24c260a271ec5f086b7883a6ed258e02af799d61 (patch) | |
| tree | 17e8e6b78273bd5ea56a704c9def2f777882ee7d /sc | |
| parent | ecdd0501c809e8f283a09cc320a539b828bfec2f (diff) | |
Unify ODF extended vs. ODF1.2 handling
Make "export extended ODF" consistently mean "version > ODF1.2".
Future ODF versions need manual review anyway, of the various
changes/additions we ship.
Change-Id: I0f6c1646b306e18f0abcdd1a1802fece821b2e93
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/XMLExportDataPilot.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index ade9d7dbe780..5b5622c39451 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -444,7 +444,7 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim) sal_Int32 nSubTotalCount = pDim->GetSubTotalsCount(); const OUString* pLayoutName = NULL; - if (rExport.getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST) + if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) // Export display names only for 1.2 extended or later. pLayoutName = pDim->GetSubtotalName(); @@ -476,7 +476,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rtl::OUString((*i)->GetName())); - if (rExport.getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST) + if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { // Export display names only for ODF 1.2 extended or later. const OUString* pLayoutName = (*i)->GetLayoutName(); @@ -685,7 +685,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, rtl::OUString(pDim->GetName())); - if (rExport.getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST) + if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { // Export display names only for ODF 1.2 extended or later. const OUString* pLayoutName = pDim->GetLayoutName(); @@ -817,7 +817,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads // grand total elements. const OUString* pGrandTotalName = pDPSave->GetGrandTotalName(); - if (pGrandTotalName && rExport.getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST) + if (pGrandTotalName && rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { // Use the new data-pilot-grand-total element. if (bRowGrand && bColumnGrand) @@ -836,7 +836,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads { const ScSheetSourceDesc* pSheetSource = (*pDPs)[i]->GetSheetDesc(); - if (rExport.getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST) + if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012) { if (pSheetSource->HasRangeName()) rExport.AddAttribute( |