Skip to content

C
core
Kaydet (Commit) cb928037 authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

only export these attributes into ODF1.2 extended 

Change-Id: I6a7fcb55287e61af3a3cd041d187d5d4c693bc6c
üst de63defe
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
sc/source/filter/xml/xmlexprt.cxx
Dosyayı görüntüle @ cb928037
...@@ -2874,7 +2874,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) ...@@ -2874,7 +2874,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
} }
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
aCell.nNumberFormat, aCell.fValue); aCell.nNumberFormat, aCell.fValue);
if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
aCell.nNumberFormat, aCell.fValue, false, XML_NAMESPACE_CALC_EXT); aCell.nNumberFormat, aCell.fValue, false, XML_NAMESPACE_CALC_EXT);
} }
...@@ -2885,7 +2885,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) ...@@ -2885,7 +2885,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); OUString sFormula(lcl_GetRawString(pDoc, aCellPos));
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
sFormula, aCell.sStringValue, true, true); sFormula, aCell.sStringValue, true, true);
if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
sFormula, aCell.sStringValue, false, true, XML_NAMESPACE_CALC_EXT); sFormula, aCell.sStringValue, false, true, XML_NAMESPACE_CALC_EXT);
} }
...@@ -2918,7 +2918,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) ...@@ -2918,7 +2918,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
GetCellText(aCell, aCellPos); GetCellText(aCell, aCellPos);
AddAttribute(sAttrValueType, XML_STRING); AddAttribute(sAttrValueType, XML_STRING);
AddAttribute(sAttrStringValue, aCell.sStringValue); AddAttribute(sAttrStringValue, aCell.sStringValue);
if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
{ {
//export calcext:value-type="error" //export calcext:value-type="error"
AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, OUString("error")); AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, OUString("error"));
...@@ -2936,7 +2936,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) ...@@ -2936,7 +2936,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0), pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0),
pDoc->GetValue( aCellPos )); pDoc->GetValue( aCellPos ));
if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
{ {
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0), pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0),
...@@ -2950,7 +2950,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) ...@@ -2950,7 +2950,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
{ {
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
aCell.nNumberFormat, pDoc->GetValue( aCellPos )); aCell.nNumberFormat, pDoc->GetValue( aCellPos ));
if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
{ {
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
aCell.nNumberFormat, pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT ); aCell.nNumberFormat, pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT );
...@@ -2966,7 +2966,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) ...@@ -2966,7 +2966,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
{ {
AddAttribute(sAttrValueType, XML_STRING); AddAttribute(sAttrValueType, XML_STRING);
AddAttribute(sAttrStringValue, aCell.sStringValue); AddAttribute(sAttrStringValue, aCell.sStringValue);
if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
{ {
AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, XML_STRING); AddAttribute(XML_NAMESPACE_CALC_EXT,XML_VALUE_TYPE, XML_STRING);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment