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

Eike Rathke (via logerrit) logerrit at kemper.freedesktop.org
Fri Jan 3 20:14:16 UTC 2020


 i18npool/source/search/textsearch.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ace8602466986e0249aa41845dce4e7da4fcafba
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Fri Jan 3 21:12:25 2020 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Fri Jan 3 21:13:29 2020 +0100

    Elaborate comment what happens, tdf#78840 follow-up
    
    Change-Id: I30bfc2891e422e8cfcb83f01136c654e3a1b03f5

diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 9c3bf63eeb64..de0f74ad2cb9 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -131,8 +131,15 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions )
     maWildcardReversePattern2.clear();
     TransliterationFlags transliterateFlags = static_cast<TransliterationFlags>(aSrchPara.transliterateFlags);
     if (aSrchPara.AlgorithmType2 == SearchAlgorithms2::REGEXP)
-        // RESrchPrepare will consider SearchAlgorithms2::REGEXP in aSrchPara.transliterateFlags
+    {
+        // RESrchPrepare will consider aSrchPara.transliterateFlags when
+        // picking the actual regex pattern
+        // (sSrchStr|sSrchStr2|SearchOptions2::searchString) and setting
+        // case-insensitivity. Create transliteration instance, if any, without
+        // ignore-case so later in TextSearch::searchForward() the string to
+        // match is not case-altered, leave case-(in)sensitive to regex engine.
         transliterateFlags &= ~TransliterationFlags::IGNORE_CASE;
+    }
 
     // Create Transliteration class
     if( isSimpleTrans( transliterateFlags) )


More information about the Libreoffice-commits mailing list