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

[Deena Francis]

 sc/source/core/data/table3.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3a04813fbf9824ae6cf651bab0c3f55cf36ea8fa
Author: Deena Francis <deena.francis at gmail.com>
Date:   Mon Aug 25 01:38:47 2014 +0530

    Resolves fdo#81084 fdo#81696 fdo#80874 fdo#81010 : sort causes crash
    
    Change-Id: I8fb9ec26bc549c264bfbf30177d720b20677b319
    Reviewed-on: https://gerrit.libreoffice.org/11102
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit c25ac84688b596b9990d382d550f0514161b78c2)
    Reviewed-on: https://gerrit.libreoffice.org/11138
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index a719f85..c1a81e6 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -935,9 +935,13 @@ void ScTable::SortReorderByRow(
 
             std::vector<PatternSpan>::iterator it = aSpans.begin(), itEnd = aSpans.end();
             for (; it != itEnd; ++it)
+                pDocument->GetPool()->Put(*it->mpPattern);
+
+            for (it = aSpans.begin(); it != itEnd; ++it)
             {
                 assert(it->mpPattern); // should never be NULL.
                 aCol[nThisCol].SetPatternArea(it->mnRow1, it->mnRow2, *it->mpPattern, true);
+                pDocument->GetPool()->Remove(*it->mpPattern);
             }
         }