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

[Eike Rathke]

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

New commits:
commit 56b76f27b1f9e8c9af005be0121f39ba4a073d8d
Author: Eike Rathke <er...@redhat.com>
Date:   Tue Jan 24 21:23:22 2017 +0100

    ScFormulaListener: do not start listening to clipboard or Undo docs
    
    Change-Id: Ic00e30eccc64cc85ee877572ef8df042899f45f5
    (cherry picked from commit 81845445de26111eb0b7e30f45b3708389fd76cf)
    Reviewed-on: https://gerrit.libreoffice.org/33527
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 5f87b32..cb7599e 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -36,7 +36,7 @@ ScFormulaListener::ScFormulaListener(ScDocument* pDoc):
 
 void ScFormulaListener::startListening(ScTokenArray* pArr, const ScRange& 
rRange)
 {
-    if (!pArr)
+    if (!pArr || mpDoc->IsClipOrUndo())
         return;
 
     pArr->Reset();
@@ -123,6 +123,9 @@ private:
 
 void ScFormulaListener::stopListening()
 {
+    if (mpDoc->IsClipOrUndo())
+        return;
+
     std::for_each(maCells.begin(), maCells.end(), StopListeningCell(mpDoc, 
this));
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits