Use valid UNOIDL identifiers in TransliterationModulesExtra

ignoreDiacritics_CTL was introduced in LO 4.2, but is unpublished and appears to
be rarely used, so changing it is hopefully OK.

ignoreKashida_CTL is new in LO 4.3.

Change-Id: I52c6d1e8c6b30eec4af22e3bbc72dd5874ef7151

6 files changed, 13 insertions, 13 deletions

diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 7e1d7bf7f34e..f9a9c135df6c 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -194,12 +194,12 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r
                     numCascade++;
         }
         // additional transliterations from TranslationModuleExtra (we cannot extend TransliterationModule)
-        if (modType & TransliterationModulesExtra::ignoreDiacritics_CTL)
+        if (modType & TransliterationModulesExtra::IGNORE_DIACRITICS_CTL)
         {
             if (loadModuleByName(OUString("ignoreDiacritics_CTL"), bodyCascade[numCascade], rLocale))
                 numCascade++;
         }
-        if (modType & TransliterationModulesExtra::ignoreKashida_CTL)
+        if (modType & TransliterationModulesExtra::IGNORE_KASHIDA_CTL)
             if (loadModuleByName(OUString("ignoreKashida_CTL"), bodyCascade[numCascade], rLocale))
                 numCascade++;
 
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
index d1f675f4ee57..be82cf74821a 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
@@ -51,8 +51,8 @@ constants TransliterationModulesExtra
     const short TOGGLE_CASE = 202;
 
     /// because we cannot extend TransliterationModule we used TranslationModuleExtra and it will act the same way
-    const long ignoreDiacritics_CTL   = 0x40000000;
-    const long ignoreKashida_CTL      = 0x00000800;
+    const long IGNORE_DIACRITICS_CTL   = 0x40000000;
+    const long IGNORE_KASHIDA_CTL      = 0x00000800;
 
     const long END_OF_MODULE    = 0;
 };
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 1be294051e40..dbaf87fcb5af 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -145,9 +145,9 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
     if ( aOpt.IsMatchFullHalfWidthForms())
         rFlags |= TransliterationModules_IGNORE_WIDTH;
     if ( aOpt.IsIgnoreDiacritics_CTL())
-        rFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL ;
+        rFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL ;
     if ( aOpt.IsIgnoreKashida_CTL())
-        rFlags |= TransliterationModulesExtra::ignoreKashida_CTL ;
+        rFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL ;
     if ( bAsianOptions )
     {
         if ( aOpt.IsMatchHiraganaKatakana())
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 5f92393cedfa..22f71bee30d3 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1228,9 +1228,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             nFlags &= (TransliterationModules_IGNORE_CASE |
                        TransliterationModules_IGNORE_WIDTH );
         if (GetCheckBoxValue(m_pIgnoreDiacritics))
-            nFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL;
+            nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
         if (GetCheckBoxValue(m_pIgnoreKashida))
-            nFlags |= TransliterationModulesExtra::ignoreKashida_CTL;
+            nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
         pSearchItem->SetTransliterationFlags( nFlags );
 
         if ( !bWriter )
@@ -2182,9 +2182,9 @@ void SvxSearchDialog::SaveToModule_Impl()
         nFlags &= (TransliterationModules_IGNORE_CASE |
                    TransliterationModules_IGNORE_WIDTH );
     if (GetCheckBoxValue(m_pIgnoreDiacritics))
-        nFlags |= TransliterationModulesExtra::ignoreDiacritics_CTL;
+        nFlags |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
     if (GetCheckBoxValue(m_pIgnoreKashida))
-        nFlags |= TransliterationModulesExtra::ignoreKashida_CTL;
+        nFlags |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
     pSearchItem->SetTransliterationFlags( nFlags );
 
     if ( !bWriter )
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index cb86a824f9c9..5b8bf487a388 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -109,7 +109,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
     SvtCTLOptions aCTLOptions;
     sal_Int32 nFlags = 0;
     nFlags |= (!aMatchCase ? static_cast<int>(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0);
-    nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::ignoreDiacritics_CTL:0 );
+    nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 );
     lArgs[3].Value <<= nFlags;
     lArgs[4].Name = OUString(SEARCHITEM_COMMAND);
     lArgs[4].Value <<= (sal_Int16)(aFindAll ?
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 5a9e6d608478..76490942f505 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -287,9 +287,9 @@ sal_Int32 SvtSearchOptions::GetTransliterationFlags() const
     if ( IsIgnoreMiddleDot())
         nRes |= TransliterationModules_ignoreMiddleDot_ja_JP;
     if ( IsIgnoreDiacritics_CTL())
-        nRes |= TransliterationModulesExtra::ignoreDiacritics_CTL;
+        nRes |= TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
     if ( IsIgnoreKashida_CTL())
-        nRes |= TransliterationModulesExtra::ignoreKashida_CTL;
+        nRes |= TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
     return nRes;
 }