View | Details | Raw Unified | Return to issue 121880
Collapse All | Expand All

(-)i18npool/source/search/textsearch.cxx (-2 / +3 lines)
Lines 64-70 Link Here
64
    TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
64
    TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
65
    TransliterationModules_ignoreProlongedSoundMark_ja_JP;
65
    TransliterationModules_ignoreProlongedSoundMark_ja_JP;
66
static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP | TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
66
static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP | TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
67
static const sal_Int32 SIMPLE_TRANS_MASK = ~(COMPLEX_TRANS_MASK | TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE | TransliterationModules_LOWERCASE_UPPERCASE);
67
static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
68
static const sal_Int32 REGEX_TRANS_MASK = ~(COMPLEX_TRANS_MASK | TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE | TransliterationModules_LOWERCASE_UPPERCASE);
68
    // Above 2 transliteration is simple but need to take effect in
69
    // Above 2 transliteration is simple but need to take effect in
69
    // complex transliteration
70
    // complex transliteration
70
71
Lines 705-711 Link Here
705
{
706
{
706
	// select the transliterated pattern string
707
	// select the transliterated pattern string
707
	const OUString& rPatternStr = 
708
	const OUString& rPatternStr = 
708
		(rOptions.transliterateFlags & SIMPLE_TRANS_MASK) ? sSrchStr
709
		(rOptions.transliterateFlags & REGEX_TRANS_MASK) ? sSrchStr
709
		: ((rOptions.transliterateFlags & COMPLEX_TRANS_MASK) ? sSrchStr2 : rOptions.searchString);
710
		: ((rOptions.transliterateFlags & COMPLEX_TRANS_MASK) ? sSrchStr2 : rOptions.searchString);
710
711
711
	sal_uInt32 nIcuSearchFlags = UREGEX_UWORD; // request UAX#29 unicode capability
712
	sal_uInt32 nIcuSearchFlags = UREGEX_UWORD; // request UAX#29 unicode capability

Return to issue 121880