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

Eike Rathke erack at redhat.com
Tue Jun 16 07:04:21 PDT 2015


 sc/source/core/data/document.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit b121efd08e9cc396af25b79c2a4ee55507ff6ee0
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jun 15 23:45:28 2015 +0200

    Resolves: tdf#91411 end listening only on selected sheets
    
    ... not in cell areas of all sheets.
    
    (cherry picked from commit 80ec99db4325a439a8a3f1d420d0a80f8bf9c439)
    
    Conflicts:
    	sc/source/core/data/document.cxx
    
    Change-Id: I8d19c15c6d8d89652ac5695214bc4dd930783087
    Reviewed-on: https://gerrit.libreoffice.org/16303
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5889916..4a4f0004 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1779,12 +1779,15 @@ void ScDocument::DeleteArea(
     std::vector<ScAddress> aGroupPos;
     sc::EndListeningContext aCxt(*this);
     ScRange aRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
-    for (size_t i = 0; i < maTabs.size(); ++i)
+    for (SCTAB i = 0; i < static_cast<SCTAB>(maTabs.size()); i++)
     {
-        aRange.aStart.SetTab(i);
-        aRange.aEnd.SetTab(i);
+        if (rMark.GetTableSelect(i))
+        {
+            aRange.aStart.SetTab(i);
+            aRange.aEnd.SetTab(i);
 
-        EndListeningIntersectedGroups(aCxt, aRange, &aGroupPos);
+            EndListeningIntersectedGroups(aCxt, aRange, &aGroupPos);
+        }
     }
     aCxt.purgeEmptyBroadcasters();
 


More information about the Libreoffice-commits mailing list