Kaydet (Commit) f932a3f1 authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Eike Rathke

i#121633# fix ignore-case problem caused by i18nsearch API mess

(cherry picked from commit 7644ec17)

Change-Id: If1a9f2bd3290a264fed280df6d1718652dbdcb5c
üst 53153889
...@@ -673,8 +673,10 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp ...@@ -673,8 +673,10 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp
// REG_NOSUB is not used anywhere => not implemented // REG_NOSUB is not used anywhere => not implemented
// NORM_WORD_ONLY is only used for SearchAlgorithm==Absolute // NORM_WORD_ONLY is only used for SearchAlgorithm==Absolute
// LEV_RELAXED is only used for SearchAlgorithm==Approximate // LEV_RELAXED is only used for SearchAlgorithm==Approximate
// why is even ALL_IGNORE_CASE deprecated in UNO? because of transliteration taking care of it??? // Note that the search flag ALL_IGNORE_CASE is deprecated in UNO
if( (rOptions.searchFlag & com::sun::star::util::SearchFlags::ALL_IGNORE_CASE) != 0) // probably because the transliteration flag IGNORE_CASE handles it as well.
if( (rOptions.searchFlag & com::sun::star::util::SearchFlags::ALL_IGNORE_CASE) != 0
|| (rOptions.transliterateFlags & TransliterationModules_IGNORE_CASE) != 0)
nIcuSearchFlags |= UREGEX_CASE_INSENSITIVE; nIcuSearchFlags |= UREGEX_CASE_INSENSITIVE;
UErrorCode nIcuErr = U_ZERO_ERROR; UErrorCode nIcuErr = U_ZERO_ERROR;
// assumption: transliteration didn't mangle regexp control chars // assumption: transliteration didn't mangle regexp control chars
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment