sc/source/filter/xml/xmlexprt.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 7309663f1c4dcc665e966c3a77cfa687bcc354c2
Author: Eike Rathke <er...@redhat.com>
Date: Tue Feb 4 13:17:31 2014 +0100
resolved fdo#74493 do not trust aCell.maBaseCell
Regression introduced with 70c61a549184cf8611f7890ac31b0ba4c460cdec on
4-1 and 68a753b6a36560eb83ba6ebe4fe9897a8759d265 on 4-1-5
Apparently aCell.maBaseCell does not always follow the current cell
position, so do not trust it. Always explicitly obtain the correct cell.
Change-Id: Ib88de44a326be75c13d37538b8ae56d265b60ee5
Reviewed-on: https://gerrit.libreoffice.org/7843
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index fe0a33b..09dc864 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2883,8 +2883,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32
nEqualCellCount)
case table::CellContentType_TEXT :
{
OUString sFormula(lcl_GetRawString(pDoc, aCellPos));
- if (aCell.maBaseCell.isEmpty())
- aCell.maBaseCell.assign( *pDoc, aCellPos);
+ aCell.maBaseCell.assign( *pDoc, aCellPos);
OUString sCellString = aCell.maBaseCell.getString(pDoc);
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
sCellString, sFormula, true, true);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
