diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-22 23:11:06 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-23 16:59:27 +0200 |
| commit | c4d842787a4385e23ffb2e63e24f7004beed2ba1 (patch) | |
| tree | 7de853851d709ea112084e14db6e53b7d0d3b9f3 /sc | |
| parent | d2ec94f0576af3f0675b171c74528cae735adef4 (diff) | |
only export these attributes into ODF1.2 extended
Change-Id: I6a7fcb55287e61af3a3cd041d187d5d4c693bc6c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index bc7bd4ae2b4a..a4cbb407b68f 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2874,7 +2874,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) } GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( aCell.nNumberFormat, aCell.fValue); - if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( aCell.nNumberFormat, aCell.fValue, false, XML_NAMESPACE_CALC_EXT, false); } @@ -2885,7 +2885,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( sFormula, aCell.sStringValue, true, true); - if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( sFormula, aCell.sStringValue, false, true, XML_NAMESPACE_CALC_EXT); } @@ -2918,7 +2918,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) GetCellText(aCell, aCellPos); AddAttribute(sAttrValueType, XML_STRING); AddAttribute(sAttrStringValue, aCell.sStringValue); - if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) { //export calcext:value-type="error" AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, OUString("error")); @@ -2936,7 +2936,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0), pDoc->GetValue( aCellPos )); - if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) { GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0), @@ -2950,7 +2950,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( aCell.nNumberFormat, pDoc->GetValue( aCellPos )); - if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) { GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( aCell.nNumberFormat, pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT, false ); @@ -2966,7 +2966,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) { AddAttribute(sAttrValueType, XML_STRING); AddAttribute(sAttrStringValue, aCell.sStringValue); - if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) + if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) { AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, XML_STRING); } |