[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - i18npool/source

[Caolán McNamara]

 i18npool/source/search/textsearch.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a988f3a9aeb82c2f7be6392d74c7e2e77e94928d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 9 10:29:03 2016 +0100

    Resolves: tdf#101924 fatal exception on Sounds like Japanese options
    
    suspected regression from
    
    commit 1a967fead616b201535449fa812775c88d5b2e3b
    Author: Eike Rathke <erack at 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 at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit abbe7584543ad27e658de515c7dafcc1ce34a18c)
    Reviewed-on: https://gerrit.libreoffice.org/28877
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index c71dea3..da2c5a4 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 )