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/06/24 16:55:16 UTC
svn commit: r1496073 -
/openoffice/trunk/main/i18npool/source/search/textsearch.cxx
Author: hdu
Date: Mon Jun 24 14:55:16 2013
New Revision: 1496073
URL: http://svn.apache.org/r1496073
Log:
#i121880# fix case-sensitive non-regexp text search
Patch by: Tsutomu Uchino <ha...@gmail.com>
Review by: Herbert Duerr <hd...@apache.org>
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=1496073&r1=1496072&r2=1496073&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/search/textsearch.cxx (original)
+++ openoffice/trunk/main/i18npool/source/search/textsearch.cxx Mon Jun 24 14:55:16 2013
@@ -64,7 +64,8 @@ static sal_Int32 COMPLEX_TRANS_MASK_TMP
TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
TransliterationModules_ignoreProlongedSoundMark_ja_JP;
static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP | TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
-static const sal_Int32 SIMPLE_TRANS_MASK = ~(COMPLEX_TRANS_MASK | TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE | TransliterationModules_LOWERCASE_UPPERCASE);
+static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
+static const sal_Int32 REGEX_TRANS_MASK = ~(COMPLEX_TRANS_MASK | TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE | TransliterationModules_LOWERCASE_UPPERCASE);
// Above 2 transliteration is simple but need to take effect in
// complex transliteration
@@ -705,7 +706,7 @@ void TextSearch::RESrchPrepare( const ::
{
// select the transliterated pattern string
const OUString& rPatternStr =
- (rOptions.transliterateFlags & SIMPLE_TRANS_MASK) ? sSrchStr
+ (rOptions.transliterateFlags & REGEX_TRANS_MASK) ? sSrchStr
: ((rOptions.transliterateFlags & COMPLEX_TRANS_MASK) ? sSrchStr2 : rOptions.searchString);
sal_uInt32 nIcuSearchFlags = UREGEX_UWORD; // request UAX#29 unicode capability