diff options
| author | Eike Rathke <erack@redhat.com> | 2014-01-20 23:15:14 +0100 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2014-01-28 03:02:16 +0000 |
| commit | 68a753b6a36560eb83ba6ebe4fe9897a8759d265 (patch) | |
| tree | 46ebd7686bbb3958c373a80f02dd92be4ba3a66d | |
| parent | 04ad856f79de3f2987b8e23ce9d12c1cdaa73dd0 (diff) | |
resolved fdo#70275 write correct office:string-value if text format applied
Change-Id: I52e5135139fdf88abe380b6e5ae60e2afb582289
Reviewed-on: https://gerrit.libreoffice.org/7556
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 4f9726011473..fe0a33bc8dd5 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2882,13 +2882,15 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) break; case table::CellContentType_TEXT : { - GetCellText(aCell, aCellPos); OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); + if (aCell.maBaseCell.isEmpty()) + aCell.maBaseCell.assign( *pDoc, aCellPos); + OUString sCellString = aCell.maBaseCell.getString(pDoc); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - sFormula, aCell.sStringValue, true, true); + sCellString, sFormula, true, true); if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - sFormula, aCell.sStringValue, false, true, XML_NAMESPACE_CALC_EXT); + sCellString, sFormula, false, true, XML_NAMESPACE_CALC_EXT); } break; case table::CellContentType_FORMULA : |