[Libreoffice-commits] core.git: formula/source

[Caolán McNamara (via logerrit)]

 formula/source/core/api/FormulaCompiler.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7dfb69f53472cdeb21270e850892f82112ad332c
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 11 09:49:18 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 11 12:18:36 2021 +0100

    merge the two identical nRecursionMax expressions
    
    Change-Id: Ie8fdb999e9d7420f0e8bb27e9fd716148f7fc9f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110755
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 73669e84ff04..8e986de15dca 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1240,10 +1240,10 @@ void FormulaCompiler::AppendErrorConstant( 
OUStringBuffer& rBuffer, FormulaError
     rBuffer.append( mxSymbols->getSymbol( eOp));
 }
 
+constexpr short nRecursionMax = 42;
 
 bool FormulaCompiler::GetToken()
 {
-    static const short nRecursionMax = 42;
     FormulaCompilerRecursionGuard aRecursionGuard( nRecursion );
     if ( nRecursion > nRecursionMax )
     {
@@ -2042,7 +2042,6 @@ void FormulaCompiler::CompareLine()
 
 OpCode FormulaCompiler::Expression()
 {
-    static const short nRecursionMax = 42;
     FormulaCompilerRecursionGuard aRecursionGuard( nRecursion );
     if ( nRecursion > nRecursionMax )
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits