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

Kohei Yoshida kohei.yoshida at collabora.com
Tue Dec 2 13:33:11 PST 2014


 sc/source/core/data/document.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 624d5485a99d049541a630482eef6e67fb9d0180
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Dec 2 16:30:10 2014 -0500

    Put this inside the bulk broadcast scope.
    
    Because setting formula cell dirty may indirectly trigger area broadcast.
    
    Change-Id: Id8b500c659119df3637ca9a27481267c140e49d3
    (cherry picked from commit 672484e615434f7133cc838442962f5abf1ad225)

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 820870b..7485831 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2848,10 +2848,10 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
 
     // Set all formula cells dirty, and collect non-empty non-formula cell
     // positions so that we can broadcast on them below.
-    SetDirtyFromClip(nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, nInsFlag, aBroadcastSpans);
 
     {
         ScBulkBroadcast aBulkBroadcast( GetBASM());
+        SetDirtyFromClip(nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, nInsFlag, aBroadcastSpans);
         BroadcastAction aAction(*this);
         aBroadcastSpans.executeColumnAction(*this, aAction);
     }


More information about the Libreoffice-commits mailing list