1 files changed, 24 insertions, 26 deletions

diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index f6a0fbffe575..b4d570496ffb 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -22,16 +22,14 @@
 #include <unotools/searchopt.hxx>
 #include <tools/debug.hxx>
 #include <unotools/configitem.hxx>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.h>
 #include <sal/macros.h>
 #include <osl/diagnose.h>
+#include <i18nutil/transliteration.hxx>
 
 using namespace utl;
 using namespace com::sun::star::uno;
-using namespace com::sun::star::i18n;
 
 #define MAX_FLAGS_OFFSET    29
 
@@ -268,52 +266,52 @@ void SvtSearchOptions::Commit()
     pImpl->Commit();
 }
 
-sal_Int32 SvtSearchOptions::GetTransliterationFlags() const
+TransliterationFlags SvtSearchOptions::GetTransliterationFlags() const
 {
-    sal_Int32 nRes = 0;
+    TransliterationFlags nRes = TransliterationFlags::NONE;
 
     if (!IsMatchCase()) // 'IsMatchCase' means act case sensitive
-        nRes |= TransliterationModules_IGNORE_CASE;
+        nRes |= TransliterationFlags::IGNORE_CASE;
     if ( IsMatchFullHalfWidthForms())
-        nRes |= TransliterationModules_IGNORE_WIDTH;
+        nRes |= TransliterationFlags::IGNORE_WIDTH;
     if ( IsMatchHiraganaKatakana())
-        nRes |= TransliterationModules_IGNORE_KANA;
+        nRes |= TransliterationFlags::IGNORE_KANA;
     if ( IsMatchContractions())
-        nRes |= TransliterationModules_ignoreSize_ja_JP;
+        nRes |= TransliterationFlags::ignoreSize_ja_JP;
     if ( IsMatchMinusDashChoon())
-        nRes |= TransliterationModules_ignoreMinusSign_ja_JP;
+        nRes |= TransliterationFlags::ignoreMinusSign_ja_JP;
     if ( IsMatchRepeatCharMarks())
-        nRes |= TransliterationModules_ignoreIterationMark_ja_JP;
+        nRes |= TransliterationFlags::ignoreIterationMark_ja_JP;
     if ( IsMatchVariantFormKanji())
-        nRes |= TransliterationModules_ignoreTraditionalKanji_ja_JP;
+        nRes |= TransliterationFlags::ignoreTraditionalKanji_ja_JP;
     if ( IsMatchOldKanaForms())
-        nRes |= TransliterationModules_ignoreTraditionalKana_ja_JP;
+        nRes |= TransliterationFlags::ignoreTraditionalKana_ja_JP;
     if ( IsMatchDiziDuzu())
-        nRes |= TransliterationModules_ignoreZiZu_ja_JP;
+        nRes |= TransliterationFlags::ignoreZiZu_ja_JP;
     if ( IsMatchBavaHafa())
-        nRes |= TransliterationModules_ignoreBaFa_ja_JP;
+        nRes |= TransliterationFlags::ignoreBaFa_ja_JP;
     if ( IsMatchTsithichiDhizi())
-        nRes |= TransliterationModules_ignoreTiJi_ja_JP;
+        nRes |= TransliterationFlags::ignoreTiJi_ja_JP;
     if ( IsMatchHyuiyuByuvyu())
-        nRes |= TransliterationModules_ignoreHyuByu_ja_JP;
+        nRes |= TransliterationFlags::ignoreHyuByu_ja_JP;
     if ( IsMatchSesheZeje())
-        nRes |= TransliterationModules_ignoreSeZe_ja_JP;
+        nRes |= TransliterationFlags::ignoreSeZe_ja_JP;
     if ( IsMatchIaiya())
-        nRes |= TransliterationModules_ignoreIandEfollowedByYa_ja_JP;
+        nRes |= TransliterationFlags::ignoreIandEfollowedByYa_ja_JP;
     if ( IsMatchKiku())
-        nRes |= TransliterationModules_ignoreKiKuFollowedBySa_ja_JP;
+        nRes |= TransliterationFlags::ignoreKiKuFollowedBySa_ja_JP;
     if ( IsIgnorePunctuation())
-        nRes |= TransliterationModules_ignoreSeparator_ja_JP;
+        nRes |= TransliterationFlags::ignoreSeparator_ja_JP;
     if ( IsIgnoreWhitespace())
-        nRes |= TransliterationModules_ignoreSpace_ja_JP;
+        nRes |= TransliterationFlags::ignoreSpace_ja_JP;
     if ( IsIgnoreProlongedSoundMark())
-        nRes |= TransliterationModules_ignoreProlongedSoundMark_ja_JP;
+        nRes |= TransliterationFlags::ignoreProlongedSoundMark_ja_JP;
     if ( IsIgnoreMiddleDot())
-        nRes |= TransliterationModules_ignoreMiddleDot_ja_JP;
+        nRes |= TransliterationFlags::ignoreMiddleDot_ja_JP;
     if ( IsIgnoreDiacritics_CTL())
-        nRes |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
+        nRes |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
     if ( IsIgnoreKashida_CTL())
-        nRes |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
+        nRes |= TransliterationFlags::IGNORE_KASHIDA_CTL;
     return nRes;
 }