commit 086055b0d7e44d1d07b3f23af55503e6a3924d87
author Eike Rathke <erack@redhat.com> Tue Jun 21 23:06:45 2022 +0200
committer Eike Rathke <erack@redhat.com> Wed Jun 22 00:23:51 2022 +0200
tree c82e29ed18241419594ce8711d229440a981383f
parent 6b15decd0acc2c7c0622baba65b9d4c019a4183a

Related: tdf#142293 Consider bAsciiUpper for matching CharClass to lowercase

... as also that may had lead to the locale's uppercase.

Change-Id: I5c75b4e52260539f5b66c0d2195b2137c9b1b8ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136265
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

sc/source/core/tool/compiler.cxx

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 301d90e..2945062 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4464,6 +4464,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
    // ParseReference().

    OUString aUpper;
    bool bAsciiUpper = false;

Label_Rewind:

@@ -4483,7 +4484,7 @@ Label_Rewind:

        mbRewind = false;
        aUpper.clear();
        bool bAsciiUpper = false;
        bAsciiUpper = false;

        if (bAsciiNonAlnum)
        {
@@ -4554,6 +4555,8 @@ Label_Rewind:
            // more likely in that localized language than in the formula
            // language. This in corner cases needs to continue to work for
            // existing documents and environments.
            // Do not change bAsciiUpper from here on for the lowercase() call
            // below in the ocBad case to use the correct CharClass.
            aUpper = ScGlobal::getCharClass().uppercase( aOrg );
        }

@@ -4618,7 +4621,7 @@ Label_Rewind:
    // would prematurely end compilation. Simple unknown names are handled by
    // the interpreter.
    // Use the same CharClass that was used for uppercase.
    aUpper = (mbCharClassesDiffer ? ScGlobal::getCharClass() : *pCharClass).lowercase( aUpper );
    aUpper = ((bAsciiUpper || mbCharClassesDiffer) ? ScGlobal::getCharClass() : *pCharClass).lowercase( aUpper );
    svl::SharedString aSS = rDoc.GetSharedStringPool().intern(aUpper);
    maRawToken.SetString(aSS.getData(), aSS.getDataIgnoreCase());
    maRawToken.NewOpCode( ocBad );