From 509a189bf70370fbd09f3bb962f8b4e9eacbc6d1 Mon Sep 17 00:00:00 2001
From: Yogesh <er.yogeshdesai@gmail.com>
Date: Thu, 21 Jan 2016 16:24:40 +0530
Subject: 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@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 208883398dcf9af6b88611097d1f75d5fbc9afad)
Reviewed-on: https://gerrit.libreoffice.org/21791
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
 sc/source/core/tool/sharedformula.cxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'sc')

diff --git a/sc/source/core/tool/sharedformula.cxx b/sc/source/core/tool/sharedformula.cxx
index 43b98725da68..62e031cca01c 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);
+        }
     }
 }
 
-- 
cgit