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

[Stephan Bergmann]

 sc/source/core/data/table3.cxx |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 4469ac71fe0aadf498db542b4e5da6212316d809
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 5 17:28:33 2014 +0100

    loplugin:unusedvariablecheck
    
    Change-Id: I48c2421598152b64d40237eb0e917a680a27b643
    (cherry picked from commit 71bed3b736957d09a5379725ce5c97f5166ea30d)

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1e4a9c2..d4c0aa0 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1119,9 +1119,6 @@ void ScTable::SortReorderByRowRefUpdate(
     SCROW nRow1 = pArray->GetStart();
     SCROW nRow2 = pArray->GetLast();
 
-    // Collect all listeners of cell broadcasters of sorted range.
-    std::vector<SvtListener*> aCellListeners;
-
     // Split formula groups at the sort range boundaries (if applicable).
     std::vector<SCROW> aRowBounds;
     aRowBounds.reserve(2);
commit c1a7fbdcb8c5895c279392ce408b0dccc242e135
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 5 17:26:51 2014 +0100

    -Werror,-Wshadow
    
    Change-Id: Ia03dc71a3d4e4380258e7f8d2ebc3c9f32d83493
    (cherry picked from commit f05c37d3fdc8ef6839c6ebe43ae1a375f3073def)

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 588464f..1e4a9c2 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1152,14 +1152,16 @@ void ScTable::SortReorderByRowRefUpdate(
             rSrc.transfer(nRow1, nRow2, rDest, nRow1);
         }
 
-        sc::BroadcasterStoreType& rSrc = aSortedCols[i].maBroadcasters;
-        sc::BroadcasterStoreType& rDest = aCol[nThisCol].maBroadcasters;
+        {
+            sc::BroadcasterStoreType& rSrc = aSortedCols[i].maBroadcasters;
+            sc::BroadcasterStoreType& rDest = aCol[nThisCol].maBroadcasters;
 
-        // Release current broadcasters first, to prevent them from getting deleted.
-        rDest.release_range(nRow1, nRow2);
+            // Release current broadcasters first, to prevent them from getting deleted.
+            rDest.release_range(nRow1, nRow2);
 
-        // Transfer sorted broadcaster segment to the document.
-        rSrc.transfer(nRow1, nRow2, rDest, nRow1);
+            // Transfer sorted broadcaster segment to the document.
+            rSrc.transfer(nRow1, nRow2, rDest, nRow1);
+        }
 
         {
             sc::CellNoteStoreType& rSrc = aSortedCols[i].maCellNotes;