summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-09 10:29:03 +0100
committerJulien Nabet <serval2412@yahoo.fr>2016-09-13 18:00:59 +0000
commitabbe7584543ad27e658de515c7dafcc1ce34a18c (patch)
tree1a2e913571cb9ccae95fd8e797eae4d6f9a7d553 /i18npool
parent9adafa3283dfc48a433ef9761a1ab7f7f672278f (diff)
Resolves: tdf#101924 fatal exception on Sounds like Japanese options
suspected regression from commit 1a967fead616b201535449fa812775c88d5b2e3b Author: Eike Rathke <erack@redhat.com> Date: Tue Mar 24 15:53:23 2015 +0000 do not include non-mask bits in masks Change-Id: Ic35a4aecc4834fc255eae81d3d83cc4e74618604 Reviewed-on: https://gerrit.libreoffice.org/28764 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/source/search/textsearch.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index c71dea35a3dd..da2c5a4c35bb 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -71,9 +71,9 @@ sal_Int32 maskComplexTrans( sal_Int32 n )
// IGNORE_KANA and FULLWIDTH_HALFWIDTH are simple but need to take effect
// in complex transliteration.
return
- (n & COMPLEX_TRANS_MASK) | // all set ignore bits
+ n & (COMPLEX_TRANS_MASK | // all set ignore bits
TransliterationModules_IGNORE_KANA | // plus IGNORE_KANA bit
- TransliterationModules_FULLWIDTH_HALFWIDTH; // and the FULLWIDTH_HALFWIDTH value
+ TransliterationModules_FULLWIDTH_HALFWIDTH); // and the FULLWIDTH_HALFWIDTH value
}
bool isComplexTrans( sal_Int32 n )