From 4c09fc48e9fa9114f32f2973090cbe75177cdd37 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 23 Feb 2017 16:15:18 +0200
Subject: typesafe wrappers for css::i18nutil::TransliterationModules

and related css::util::SearchOptions2

The TransliterationModules enum has it's constants spread over multiple
UNO enum/constant-collections - TransliterationModules and
TransliterationModulesExtra, which means that most code simply uses
sal_Int32.

Wrap them up into a better bundle so that only the lowest layer needs to
deal directly with the UNO constants.

Change-Id: I1edeab79fcc7817a4a97c933ef84ab7015bb849b
Reviewed-on: https://gerrit.libreoffice.org/34582
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/svl/ondemand.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/svl/ondemand.hxx')

diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index 69139b9cb119..2eeebdad2137 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -27,11 +27,11 @@
 #include <unotools/collatorwrapper.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <unotools/transliterationwrapper.hxx>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <unotools/nativenumberwrapper.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
+#include <i18nutil/transliteration.hxx>
 
 /*
     On demand instantiation and initialization of several i18n wrappers,
@@ -190,7 +190,7 @@ class OnDemandTransliterationWrapper
 {
             css::uno::Reference< css::uno::XComponentContext > m_xContext;
             LanguageType        eLanguage;
-            css::i18n::TransliterationModules  nType;
+            TransliterationFlags  nType;
     mutable std::unique_ptr<::utl::TransliterationWrapper>
                                 pPtr;
     mutable bool                bValid;
@@ -199,7 +199,7 @@ class OnDemandTransliterationWrapper
 public:
                                 OnDemandTransliterationWrapper()
                                     : eLanguage( LANGUAGE_SYSTEM )
-                                    , nType(css::i18n::TransliterationModules_END_OF_MODULE)
+                                    , nType(TransliterationFlags::NONE)
                                     , pPtr(nullptr)
                                     , bValid(false)
                                     , bInitialized(false)
@@ -213,7 +213,7 @@ public:
                                     )
                                     {
                                         m_xContext = rxContext;
-                                        nType = css::i18n::TransliterationModules_IGNORE_CASE;
+                                        nType = TransliterationFlags::IGNORE_CASE;
                                         changeLocale( eLang );
                                         pPtr.reset();
                                         bInitialized = true;
-- 
cgit