diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-01-22 12:01:53 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-03-07 21:23:11 +0100 |
| commit | f932a3f1195290f9aa37b593190bd4c6ac5fe2f6 (patch) | |
| tree | ce29a44717e1f3293c030bebebc0b2437a771cea /i18npool | |
| parent | i#121633# fix search for upper-case character classes (diff) | |
| download | core-f932a3f1195290f9aa37b593190bd4c6ac5fe2f6.tar.gz core-f932a3f1195290f9aa37b593190bd4c6ac5fe2f6.zip | |
i#121633# fix ignore-case problem caused by i18nsearch API mess
(cherry picked from commit 7644ec176049937b588fe171a553c9a07b375792)
Change-Id: If1a9f2bd3290a264fed280df6d1718652dbdcb5c
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/search/textsearch.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 095cf2339071..97f6da46ae9a 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -673,8 +673,10 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp // REG_NOSUB is not used anywhere => not implemented // NORM_WORD_ONLY is only used for SearchAlgorithm==Absolute // LEV_RELAXED is only used for SearchAlgorithm==Approximate - // why is even ALL_IGNORE_CASE deprecated in UNO? because of transliteration taking care of it??? - if( (rOptions.searchFlag & com::sun::star::util::SearchFlags::ALL_IGNORE_CASE) != 0) + // Note that the search flag ALL_IGNORE_CASE is deprecated in UNO + // 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; UErrorCode nIcuErr = U_ZERO_ERROR; // assumption: transliteration didn't mangle regexp control chars |