You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/01/22 14:01:54 UTC
svn commit: r1436886 -
/openoffice/trunk/main/i18npool/source/search/textsearch.cxx
Author: hdu
Date: Tue Jan 22 13:01:53 2013
New Revision: 1436886
URL: http://svn.apache.org/viewvc?rev=1436886&view=rev
Log:
#i121633# fix ignore-case problem caused by i18nsearch API mess
Modified:
openoffice/trunk/main/i18npool/source/search/textsearch.cxx
Modified: openoffice/trunk/main/i18npool/source/search/textsearch.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/search/textsearch.cxx?rev=1436886&r1=1436885&r2=1436886&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/search/textsearch.cxx (original)
+++ openoffice/trunk/main/i18npool/source/search/textsearch.cxx Tue Jan 22 13:01:53 2013
@@ -715,8 +715,10 @@ void TextSearch::RESrchPrepare( const ::
// 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