[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Eike Rathke]

 sc/source/filter/xml/xmlcelli.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 714ef78b8dd60020a70d2ffc364d737503c49992
Author: Eike Rathke <erack at 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/43047
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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();
         }
     }
 }