summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-11-12 20:28:43 +0100
committerEike Rathke <erack@redhat.com>2016-11-14 10:15:39 +0100
commitfcb1445ace3cbb344e340c4b7be4e6933c1d54d3 (patch)
tree7ab692530e9b5158f1ce144fa7841faaa37a393d
parent97eaf7bbb6ac66a2d71fe9a8cf962a673ee25b10 (diff)
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
-rw-r--r--sc/source/core/data/formulacell.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 8b2e62a71303..400671830c8f 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))
{