commit dd8775b051b40309d7d7e5730a3c5304d931f594
author Justin Luth <justin.luth@collabora.com> Tue Sep 27 07:41:16 2022 -0400
committer Eike Rathke <erack@redhat.com> Sat Oct 01 12:23:48 2022 +0200
tree f2c46bd3f7a023791cd5a7f974eaf49af9c9a1e1
parent 92c35f820d87ac50c19d60572275e49e2911e80b

related tdf#123990 sc condition: GetCollator -> GetTransliteration

In the content of Equals/notEquals, Eike said,
"This should not use collation (which should only be used
in sorting context) but ignore case transliteration instead."

"I'm undecided about replacing this (and the Between|NotBetween)
collator with transliteration. Locale sensitive collators have a
different comparison than transliteration
and order characters differently."

I also added a few code clean-ups.

Change-Id: I94f73d99b36f8995c4e80fd2f317f1b5bca4f165
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140676
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Eike Rathke <erack@redhat.com>

sc/source/core/data/conditio.cxx

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d126357..461a606 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1134,8 +1134,13 @@ bool ScConditionEntry::IsValidStr( const OUString& rArg, const ScAddress& rPos )
        }
    }

    if (eOp == ScConditionMode::Error)
        return IsError(rPos);
    if (eOp == ScConditionMode::NoError)
        return !IsError(rPos);

    // If number contains condition, always false, except for "not equal".
    if ( !bIsStr1 && (eOp != ScConditionMode::Error && eOp != ScConditionMode::NoError) )
    if (!bIsStr1)
        return ( eOp == ScConditionMode::NotEqual );
    if ( eOp == ScConditionMode::Between || eOp == ScConditionMode::NotBetween )
        if ( !bIsStr2 )
@@ -1154,12 +1159,10 @@ bool ScConditionEntry::IsValidStr( const OUString& rArg, const ScAddress& rPos )
    switch ( eOp )
    {
        case ScConditionMode::Equal:
            bValid = (ScGlobal::GetCollator().compareString(
                rArg, aUpVal1 ) == 0);
            bValid = ScGlobal::GetTransliteration().isEqual(aUpVal1, rArg);
        break;
        case ScConditionMode::NotEqual:
            bValid = (ScGlobal::GetCollator().compareString(
                rArg, aUpVal1 ) != 0);
            bValid = !ScGlobal::GetTransliteration().isEqual(aUpVal1, rArg);
        break;
        case ScConditionMode::TopPercent:
        case ScConditionMode::BottomPercent:
@@ -1168,12 +1171,6 @@ bool ScConditionEntry::IsValidStr( const OUString& rArg, const ScAddress& rPos )
        case ScConditionMode::AboveAverage:
        case ScConditionMode::BelowAverage:
            return false;
        case ScConditionMode::Error:
        case ScConditionMode::NoError:
            bValid = IsError( rPos );
            if(eOp == ScConditionMode::NoError)
                bValid = !bValid;
        break;
        case ScConditionMode::BeginsWith:
            bValid = ScGlobal::GetTransliteration().isMatch(aUpVal1, rArg);
        break;