sc/source/filter/xml/xmlcelli.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 8d9b236dcb3fd0f7028e4d19ede04589cf85d760
Author: Eike Rathke <er...@redhat.com>
Date: Mon Oct 2 16:13:34 2017 +0200
Resolves: tdf#112780 no ResetDirty() after SetHybridEmptyDisplayedAsString()
Change-Id: Idea5c1bd8e8577eaf90fc47d39f88c79963c422b
(cherry picked from commit df778416981ab02d42182e5c2e46dc09ba2e2a3c)
Reviewed-on: https://gerrit.libreoffice.org/43048
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 8fd7edae9d15..7b5a35f838c0 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1012,8 +1012,13 @@ void
ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const
{
pFCell->SetHybridDouble(fValue);
if (mbPossibleEmptyDisplay && fValue == 0.0)
+ {
+ // Needs to be recalculated to propagate, otherwise would be
+ // propagated as empty string. So don't ResetDirty().
pFCell->SetHybridEmptyDisplayedAsString();
- pFCell->ResetDirty();
+ }
+ else
+ pFCell->ResetDirty();
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
