some i18n wrappers with LanguageTag

Change-Id: I2ceaa3159e8669c2c569fa8559c1e061dcad399d

7 files changed, 11 insertions, 11 deletions

diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index bb20aee77d82..544074230a0f 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -458,7 +458,7 @@ StringCompare SvxSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry*
         if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
             nLeftKind == SV_ITEM_ID_LBOXSTRING )
         {
-            IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag().getLocale() );
+            IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag() );
             const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator();
 
             eCompare=(StringCompare)pCollator->compareString( ((SvLBoxString*)pLeftItem)->GetText(),
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 44552338f22b..0456a44d7595 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -64,7 +64,7 @@ OSystemParseContext::~OSystemParseContext()
 //-----------------------------------------------------------------------------
 ::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const
 {
-    return SvtSysLocale().GetLocaleData().getLocale();
+    return SvtSysLocale().GetLanguageTag().getLocale();
 }
 
 //-----------------------------------------------------------------------------
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 06e34f9bc0d0..05292acf8063 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -143,7 +143,7 @@ namespace svxform
                 // determine the script type associated with the system locale
                 const SvtSysLocale aSysLocale;
                 const LocaleDataWrapper& rSysLocaleData = aSysLocale.GetLocaleData();
-                const sal_Int16 eSysLocaleScriptType = MsLangId::getScriptType( LanguageTag( rSysLocaleData.getLocale() ).getLanguageType() );
+                const sal_Int16 eSysLocaleScriptType = MsLangId::getScriptType( rSysLocaleData.getLanguageTag().getLanguageType() );
 
                 // depending on this script type, use the right property from the document's style which controls the
                 // default locale for document content
@@ -182,7 +182,7 @@ namespace svxform
                 // fall back to the system locale
                 if ( aDocumentCharLocale.Language.isEmpty() )
                 {
-                    aDocumentCharLocale = rSysLocaleData.getLocale();
+                    aDocumentCharLocale = rSysLocaleData.getLanguageTag().getLocale();
                 }
 
                 // retrieve a default font for this locale, and set it at the control
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 14fb1fca3639..006a6dee101c 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -585,7 +585,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O
         aParam.insertedChars = m_nLevLonger;
     }
     aParam.searchString = strExpression;
-    aParam.Locale = SvtSysLocale().GetLocaleData().getLocale();
+    aParam.Locale = SvtSysLocale().GetLanguageTag().getLocale();
     ::utl::TextSearch aLocalEngine(aParam);
 
     // --------------------------------------------------------------
@@ -686,7 +686,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
 
     :m_xSearchCursor(xCursor)
     ,m_xFormatSupplier(xFormatSupplier)
-    ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLocaleData().getLocale() )
+    ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLanguageTag() )
     ,m_aStringCompare( _rxORB )
     ,m_nCurrentFieldIndex(-2)   // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig'
     ,m_bUsingTextComponents(sal_False)
@@ -723,7 +723,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XMultiServiceFactory >& _rxORB,
         const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
         const InterfaceArray& arrFields, FMSEARCH_MODE eMode)
     :m_xSearchCursor(xCursor)
-    ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLocaleData().getLocale() )
+    ,m_aCharacterClassficator( comphelper::getComponentContext(_rxORB), SvtSysLocale().GetLanguageTag() )
     ,m_aStringCompare( _rxORB )
     ,m_nCurrentFieldIndex(-2)   // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig'
     ,m_bUsingTextComponents(sal_True)
@@ -872,7 +872,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
         bCaseSensitiveIdentifiers = xMeta->supportsMixedCaseQuotedIdentifiers();
 
     // now that we have this information, we need a collator which is able to case (in)sentively compare strings
-    m_aStringCompare.loadDefaultCollator( SvtSysLocale().GetLocaleData().getLocale(),
+    m_aStringCompare.loadDefaultCollator( SvtSysLocale().GetLanguageTag().getLocale(),
         bCaseSensitiveIdentifiers ? 0 : ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
 
     try
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 5cf18fe9e8a3..f47cf3310913 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -586,7 +586,7 @@ namespace svxform
                     nFormatKey = OStaticDataAccessTools().getDefaultNumberFormat(
                         _rxDatabaseField,
                         Reference< XNumberFormatTypes >( _rxNumberFormats, UNO_QUERY ),
-                        SvtSysLocale().GetLocaleData().getLocale()
+                        SvtSysLocale().GetLanguageTag().getLocale()
                     );
                 }
 
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 8e711f0988fc..9c3ebf9eadd8 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -878,7 +878,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
         if(!pIntlWrapper)
             pIntlWrapper = pMyIntlWrapper = new IntlWrapper(
                 ::comphelper::getProcessServiceFactory(),
-                Application::GetSettings().GetLanguageTag().getLanguageType() );
+                Application::GetSettings().GetLanguageTag() );
 
         if(pIntlWrapper->getLocaleData()->isNumLeadingZero())
             nAnz++;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index c4710abcf4d8..03da42e329fd 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -396,7 +396,7 @@ StringCompare DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListE
         if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
             nLeftKind == SV_ITEM_ID_LBOXSTRING )
         {
-            IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag().getLocale() );
+            IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag() );
             const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator();
 
             eCompare=(StringCompare)pCollator->compareString( ((SvLBoxString*)pLeftItem)->GetText(),