diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-25 15:12:24 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-06-02 03:25:50 +0200 |
| commit | e18f5306714e6ca4103dd236bcf3187d492cbb91 (patch) | |
| tree | d963ab08b93666b0c0a8a7d6a42db317c409b3cf /sc/source/filter | |
| parent | 81e4e89b28f28a4780948769a86e2c486d797e59 (diff) | |
all formula cells have now an explicit number format
Remove ScFormulaCell::GetStandardFormat
Change-Id: I0b19f572cfcf5c08c81009b0f10e7cc44a1aa2f4
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index a4cbb407b68f..2b72e894df0e 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2929,33 +2929,14 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) bool bIsStandard; OUString sCurrency; GetNumberFormatAttributesExportHelper()->GetCellType(aCell.nNumberFormat, sCurrency, bIsStandard); - if (bIsStandard) + if (pDoc) { - if (pDoc) + GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( + aCell.nNumberFormat, pDoc->GetValue( aCellPos )); + if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 ) { GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0), - pDoc->GetValue( aCellPos )); - if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) - { - GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - pFormulaCell->GetStandardFormat(*pDoc->GetFormatTable(), 0), - pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT, false); - } - } - } - else - { - if (pDoc) - { - GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - aCell.nNumberFormat, pDoc->GetValue( aCellPos )); - if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) - { - GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - aCell.nNumberFormat, pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT, false ); - - } + aCell.nNumberFormat, pDoc->GetValue( aCellPos ), false, XML_NAMESPACE_CALC_EXT, false ); } } } |