i18npool/source/search/textsearch.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit f932a3f1195290f9aa37b593190bd4c6ac5fe2f6
Author: Herbert Dürr <h...@apache.org>
Date: Tue Jan 22 12:01:53 2013 +0000
i#121633# fix ignore-case problem caused by i18nsearch API mess
(cherry picked from commit 7644ec176049937b588fe171a553c9a07b375792)
Change-Id: If1a9f2bd3290a264fed280df6d1718652dbdcb5c
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index 095cf23..97f6da4 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
