[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/data/formulacell.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit fcb1445ace3cbb344e340c4b7be4e6933c1d54d3
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Nov 12 20:28:43 2016 +0100

    ScFormulaCell::Notify: bail out early in doc dtor
    
    Closing a document we don't even need to check a hint ID here.
    
    Change-Id: I8cbfe50d46d6fd204a4b9ba2230e873eb5a8065e

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 8b2e62a..4006718 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2200,6 +2200,9 @@ void ScFormulaCell::SetInChangeTrack( bool bVal )
 
 void ScFormulaCell::Notify( const SfxHint& rHint )
 {
+    if (pDocument->IsInDtorClear())
+        return;
+
     const sal_uInt32 nHint = rHint.GetId();
     if (nHint == SC_HINT_REFERENCE)
     {
@@ -2266,7 +2269,7 @@ void ScFormulaCell::Notify( const SfxHint& rHint )
         return;
     }
 
-    if ( !pDocument->IsInDtorClear() && pDocument->GetHardRecalcState() == ScDocument::HARDRECALCSTATE_OFF )
+    if ( pDocument->GetHardRecalcState() == ScDocument::HARDRECALCSTATE_OFF )
     {
         if (nHint & (SC_HINT_DATACHANGED | SC_HINT_TABLEOPDIRTY))
         {