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

[Caolán McNamara]

 sc/source/core/data/colorscale.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ac51fb6a8642c5904db7e4de8dc89dabf284488c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 9 16:30:23 2016 +0100

    Resolves: tdf#101347 conditional formatting super slow on exit
    
    since...
    
    commit 88a0c7d01b7dfd085a0569030f97cc7de0f0d106
    Date:   Sat Mar 26 13:11:53 2016 +0100
    
        switch to a listener based cond format update, tdf#95437
    
    I'm obviously assuming here that the notify doesn't matter
    when the broadcasted is shutting down.
    
    Change-Id: I0fef0ac1c1d8757199dcffb3c8ec1b05a73c1f17
    Reviewed-on: https://gerrit.libreoffice.org/28006
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit cbab44f5eb27c8a45905167d2443f56b816b4a7b)
    Reviewed-on: https://gerrit.libreoffice.org/28205
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 5c1812103a6c0cd29dd18e546d29ee683f675f6d)
    Reviewed-on: https://gerrit.libreoffice.org/28238
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 1a08885..6df2b18 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -131,9 +131,14 @@ ScFormulaListener::~ScFormulaListener()
     stopListening();
 }
 
-void ScFormulaListener::Notify( const SfxHint& )
+void ScFormulaListener::Notify(const SfxHint& rHint)
 {
     mbDirty = true;
+
+    const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
+    if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING)
+        return;
+
     if (maCallbackFunction)
         maCallbackFunction();
 }