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

Yogesh er.yogeshdesai at gmail.com
Mon Jan 25 06:30:43 PST 2016


 sc/source/core/tool/sharedformula.cxx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 10f3272bb1bf36cae5eb6e80f9f1e0f4753ebb5d
Author: Yogesh <er.yogeshdesai at gmail.com>
Date:   Thu Jan 21 16:24:40 2016 +0530

    tdf#96910 : Calc crashes while using "Insert Column Left" for large Documents
    
    Change-Id: I6e813b7525a3d9b1db131db9f08fc20f7320345f
    Reviewed-on: https://gerrit.libreoffice.org/21661
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 208883398dcf9af6b88611097d1f75d5fbc9afad)
    Reviewed-on: https://gerrit.libreoffice.org/21792
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/tool/sharedformula.cxx b/sc/source/core/tool/sharedformula.cxx
index 8e84ac0..fc9d778 100644
--- a/sc/source/core/tool/sharedformula.cxx
+++ b/sc/source/core/tool/sharedformula.cxx
@@ -119,11 +119,13 @@ void SharedFormulaUtil::splitFormulaCellGroups(CellStoreType& rCells, std::vecto
     for (++it; it != itEnd; ++it)
     {
         nRow = *it;
-        aPos = rCells.position(aPos.first, nRow);
-        if (aPos.first == rCells.end())
-            return;
-
-        splitFormulaCellGroup(aPos, nullptr);
+        if (ValidRow(nRow))
+        {
+            aPos = rCells.position(aPos.first, nRow);
+            if (aPos.first == rCells.end())
+                return;
+            splitFormulaCellGroup(aPos, nullptr);
+        }
     }
 }
 


More information about the Libreoffice-commits mailing list