summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-10-02 16:13:34 +0200
committerEike Rathke <erack@redhat.com>2017-10-04 12:18:13 +0200
commit8d9b236dcb3fd0f7028e4d19ede04589cf85d760 (patch)
tree04ca9476e394a844b3e19cd5f56a609d93912a84
parent8580472270972733cda7fa6ecf23db73359d30bb (diff)
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.mohrhard@googlemail.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx7
1 files changed, 6 insertions, 1 deletions
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();
}
}
}