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

[Eike Rathke]

 sc/source/core/data/formulacell.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit fecbcf523ee1e8a13b18ba1cfde36a2368da6949
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Mar 23 14:26:55 2016 +0100

    add a recursion guard to lcl_FindRangeNamesInUse()
    
    Change-Id: Ifbc02304f5a2e080db2d6645e2c7f825a2c56cb5
    Reviewed-on: https://gerrit.libreoffice.org/23473
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index f9c92e6..ceb7f68 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3555,7 +3555,8 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
         StartListeningTo( pDocument ); // Listener as previous
 }
 
-static void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames)
+static void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames,
+        int nRecursion)
 {
     for (FormulaToken* p = pCode->First(); p; p = pCode->Next())
     {
@@ -3564,16 +3565,19 @@ static void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray
             sal_uInt16 nTokenIndex = p->GetIndex();
             rIndexes.insert( nTokenIndex );
 
-            ScRangeData* pSubName = pNames->findByIndex(p->GetIndex());
-            if (pSubName)
-                lcl_FindRangeNamesInUse(rIndexes, pSubName->GetCode(), pNames);
+            if (nRecursion < 126)   // whatever.. 42*3
+            {
+                ScRangeData* pSubName = pNames->findByIndex(p->GetIndex());
+                if (pSubName)
+                    lcl_FindRangeNamesInUse(rIndexes, pSubName->GetCode(), pNames, nRecursion+1);
+            }
         }
     }
 }
 
 void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const
 {
-    lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() );
+    lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName(), 0);
 }
 
 void ScFormulaCell::SetChanged(bool b)