summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-10-02 16:13:34 +0200
committerCaolán McNamara <caolanm@redhat.com>2017-10-16 22:15:04 +0200
commit714ef78b8dd60020a70d2ffc364d737503c49992 (patch)
treebf285c468c8dc357b74b7dca53d8ab387ec55838
parent91ec020991a0558ea4b927808f3b346254e52c3d (diff)
Resolves: tdf#112780 no ResetDirty() after SetHybridEmptyDisplayedAsString()
Change-Id: Idea5c1bd8e8577eaf90fc47d39f88c79963c422b (cherry picked from commit df778416981ab02d42182e5c2e46dc09ba2e2a3c) Reviewed-on: https://gerrit.libreoffice.org/43047 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@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 43e51e653886..90682874db1b 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1014,8 +1014,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();
}
}
}