[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/interpr1.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 79523008fba5765d27e6a3d214362f68ca46b1db
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Dec 2 13:31:59 2020 +0000
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Thu Jul 8 12:25:35 2021 +0200

    cid#1468696 Logically dead code
    
    bool bTryXlA1 = (eConv == FormulaGrammar::CONV_A1_XL_A1);
    
    if (...)
        eConv = FormulaGrammar::CONV_XL_R1C1;
    
    if (bTryXlA1 || eConv == FormulaGrammar::CONV_OOO)
    {
        if (...)
        {
            bExternalName = true;
            eConv = FormulaGrammar::CONV_OOO;
        }
    }
    
    if (!bExternalName && (bTryXlA1 || eConv != FormulaGrammar::CONV_OOO))
    {
        if (...)
        {
            if (eConv == FormulaGrammar::CONV_OOO)
            {
                // this condition can only be reached if bTryXlA1 is true
                // but bTryXlA1 is only true if eConv was originally
                // CONV_A1_XL_A1. The only things eConv can be changed to
                // in this function are CONV_XL_R1C1 or CONV_OOO. If it
                // was changed to CONV_OOO then bExternalName was also
                // set to true and the block isn't entered if that is true
            }
        }
    }
    
    maybe an unconditional assignment of
    eConv = FormulaGrammar::CONV_XL_A1
    is a better solution
    
    Change-Id: I45f9947c21662369474048acf2d648733a9b9a6d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107076
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 22c7ad49679c2abcac4409c93d32b20746b16904)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118602

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 4204215d8d97..4f2789160a1c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8241,8 +8241,6 @@ void ScInterpreter::ScIndirect()
                     if (nIndex >= 3 && sRefStr[nIndex-1] == '\'')
                     {
                         bExternalName = true;
-                        if (eConv == FormulaGrammar::CONV_OOO)
-                            eConv = FormulaGrammar::CONV_XL_A1;
                     }
                 }
             }