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>

3 files changed, 18 insertions, 17 deletions

diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 88e4e1116304..ed2324a62053 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 
+#include <i18nutil/searchopt.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
@@ -543,7 +544,7 @@ void SwMacrosTest::testFindReplace()
     pPaM->Move(fnMoveBackward, GoInDoc);
 
     bool bCancel(false);
-    util::SearchOptions2 opts(
+    i18nutil::SearchOptions2 opts(
             util::SearchAlgorithms_REGEXP,
             65536,
             "$",
@@ -552,7 +553,8 @@ void SwMacrosTest::testFindReplace()
             2,
             2,
             2,
-            1073745152,
+            TransliterationFlags::IGNORE_CASE | TransliterationFlags::IGNORE_WIDTH |
+            TransliterationFlags::IGNORE_KASHIDA_CTL | TransliterationFlags::IGNORE_DIACRITICS_CTL,
             util::SearchAlgorithms2::REGEXP,
             '\\');
 
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 9486e369e9e7..c0c45601fc8a 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -13,10 +13,9 @@
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
-
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>
+#include <i18nutil/transliteration.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/transliterationwrapper.hxx>
@@ -1145,7 +1144,7 @@ void SwDocTest::randomTest()
 }
 
 static OUString
-translitTest(SwDoc & rDoc, SwPaM & rPaM, sal_uInt32 const nType)
+translitTest(SwDoc & rDoc, SwPaM & rPaM, TransliterationFlags const nType)
 {
     utl::TransliterationWrapper aTrans(
             ::comphelper::getProcessComponentContext(), nType);
@@ -1165,22 +1164,22 @@ void SwDocTest::testTransliterate()
 
     CPPUNIT_ASSERT_EQUAL(OUString("FOOBAR"),
             translitTest(*m_pDoc, aPaM,
-                i18n::TransliterationModules_LOWERCASE_UPPERCASE));
+                TransliterationFlags::LOWERCASE_UPPERCASE));
     CPPUNIT_ASSERT_EQUAL(OUString("Foobar"),
             translitTest(*m_pDoc, aPaM,
-                i18n::TransliterationModulesExtra::TITLE_CASE));
+                TransliterationFlags::TITLE_CASE));
     CPPUNIT_ASSERT_EQUAL(OUString("fOOBAR"),
             translitTest(*m_pDoc, aPaM,
-                i18n::TransliterationModulesExtra::TOGGLE_CASE));
+                TransliterationFlags::TOGGLE_CASE));
     CPPUNIT_ASSERT_EQUAL(OUString("foobar"),
             translitTest(*m_pDoc, aPaM,
-                i18n::TransliterationModules_UPPERCASE_LOWERCASE));
+                TransliterationFlags::UPPERCASE_LOWERCASE));
     CPPUNIT_ASSERT_EQUAL(OUString("Foobar"),
             translitTest(*m_pDoc, aPaM,
-                i18n::TransliterationModulesExtra::SENTENCE_CASE));
+                TransliterationFlags::SENTENCE_CASE));
     CPPUNIT_ASSERT_EQUAL(OUString("Foobar"),
             translitTest(*m_pDoc, aPaM,
-                i18n::TransliterationModules_HIRAGANA_KATAKANA));
+                TransliterationFlags::HIRAGANA_KATAKANA));
 }
 
 namespace
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8e6479f20538..d9c76ba5c459 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -54,6 +54,8 @@
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/wghtitem.hxx>
+#include <i18nutil/transliteration.hxx>
+#include <i18nutil/searchopt.hxx>
 #include <reffld.hxx>
 #include <txatbase.hxx>
 #include <ftnidx.hxx>
@@ -71,11 +73,9 @@
 #include "com/sun/star/util/XNumberFormatTypes.hpp"
 #include "com/sun/star/util/NumberFormat.hpp"
 #include "com/sun/star/util/XNumberFormatsSupplier.hpp"
-#include <com/sun/star/util/SearchOptions2.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include "com/sun/star/util/SearchAlgorithms.hpp"
-#include "com/sun/star/i18n/TransliterationModulesExtra.hpp"
 #include "com/sun/star/sdbcx/XTablesSupplier.hpp"
 #include "com/sun/star/text/XParagraphCursor.hpp"
 #include "com/sun/star/util/XPropertyReplace.hpp"
@@ -2005,7 +2005,7 @@ void SwUiWriterTest::testSearchWithTransliterate()
         SwPaM aPaM(aIdx);
         pDoc->getIDocumentContentOperations().InsertString(aPaM,"This is Other PARAGRAPH");
     }
-    css::util::SearchOptions2 SearchOpt;
+    i18nutil::SearchOptions2 SearchOpt;
     SearchOpt.algorithmType = css::util::SearchAlgorithms_ABSOLUTE;
     SearchOpt.searchFlag = css::util::SearchFlags::ALL_IGNORE_CASE;
     SearchOpt.searchString = "other";
@@ -2013,7 +2013,7 @@ void SwUiWriterTest::testSearchWithTransliterate()
     SearchOpt.changedChars = 0;
     SearchOpt.deletedChars = 0;
     SearchOpt.insertedChars = 0;
-    SearchOpt.transliterateFlags = css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
+    SearchOpt.transliterateFlags = TransliterationFlags::IGNORE_DIACRITICS_CTL;
     SearchOpt.AlgorithmType2 = css::util::SearchAlgorithms2::ABSOLUTE;
     SearchOpt.WildcardEscapeCharacter = 0;
     //transliteration option set so that at least one of the search strings is not found
@@ -2022,7 +2022,7 @@ void SwUiWriterTest::testSearchWithTransliterate()
     CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCursor->GetText());
     CPPUNIT_ASSERT_EQUAL(0,(int)case1);
     SearchOpt.searchString = "paragraph";
-    SearchOpt.transliterateFlags = css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
+    SearchOpt.transliterateFlags = TransliterationFlags::IGNORE_KASHIDA_CTL;
     //transliteration option set so that all search strings are found
     sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,SwDocPositions::Start,SwDocPositions::End);
     pShellCursor = pWrtShell->getShellCursor(true);
@@ -2047,7 +2047,7 @@ void SwUiWriterTest::testTdf73660()
     pWrtShell->Insert(aData5 + " ");
     pWrtShell->Insert("Now we have enough text let's test search for all the cases");
     //searching for all 5 strings entered with soft-hyphen, search string contains no soft-hyphen
-    css::util::SearchOptions2 searchOpt;
+    i18nutil::SearchOptions2 searchOpt;
     searchOpt.algorithmType = css::util::SearchAlgorithms_REGEXP;
     searchOpt.searchFlag = css::util::SearchFlags::NORM_WORD_ONLY;
     //case 1