FillLangItems() doesn't need an SvtLanguageTable instance

Change-Id: I4c8b8b54c434343eb72fb75aae3c15038cff72af

4 files changed, 8 insertions, 12 deletions

diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 40e72c13eb08..406de7ae2529 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -38,8 +38,6 @@
 
 #include <set>
 
-class SvtLanguageTable;
-
 // flags for script types in use within selection
 #define LS_SCRIPT_LATIN     0x0001
 #define LS_SCRIPT_ASIAN     0x0002
@@ -135,7 +133,6 @@ FWI_DLLPUBLIC OUString RetrieveLabelFromCommand( const OUString& aCmdURL
             ,const sal_Char* _pName);
 
 FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
-        const SvtLanguageTable &rLanguageTable,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,
         const LanguageGuessingHelper & rLangGuessHelper,
         sal_Int16               nScriptType,
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index ab041d1e06e3..ed1bc75a1d1e 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -131,7 +131,6 @@ OUString RetrieveLabelFromCommand(
 }
 
 void FillLangItems( std::set< OUString > &rLangItems,
-        const SvtLanguageTable &    rLanguageTable,
         const uno::Reference< frame::XFrame > & rxFrame,
         const LanguageGuessingHelper & rLangGuessHelper,
         sal_Int16        nScriptType,
@@ -143,7 +142,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
 
     //1--add current language
     if( !rCurLang.isEmpty() &&
-        LANGUAGE_DONTKNOW != rLanguageTable.GetType( rCurLang ))
+        LANGUAGE_DONTKNOW != SvtLanguageTable::GetLanguageType( rCurLang ))
         rLangItems.insert( rCurLang );
 
     //2--System
@@ -152,7 +151,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
     if( rSystemLanguage != LANGUAGE_DONTKNOW )
     {
         if ( IsScriptTypeMatchingToLanguage( nScriptType, rSystemLanguage ))
-            rLangItems.insert( OUString( rLanguageTable.GetString( rSystemLanguage )) );
+            rLangItems.insert( OUString( SvtLanguageTable::GetLanguageString( rSystemLanguage )) );
     }
 
     //3--UI
@@ -160,7 +159,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
     if( rUILanguage != LANGUAGE_DONTKNOW )
     {
         if ( IsScriptTypeMatchingToLanguage( nScriptType, rUILanguage ))
-            rLangItems.insert( OUString( rLanguageTable.GetString( rUILanguage )) );
+            rLangItems.insert( OUString( SvtLanguageTable::GetLanguageString( rUILanguage )) );
     }
 
     //4--guessed language
@@ -171,13 +170,13 @@ void FillLangItems( std::set< OUString > &rLangItems,
         LanguageType nLang = LanguageTag( aLocale ).makeFallback().getLanguageType();
         if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
             && IsScriptTypeMatchingToLanguage( nScriptType, nLang ))
-            rLangItems.insert( rLanguageTable.GetString( nLang ));
+            rLangItems.insert( SvtLanguageTable::GetLanguageString( nLang ));
     }
 
     //5--keyboard language
     if( !rKeyboardLang.isEmpty() )
     {
-        if ( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rKeyboardLang )))
+        if ( IsScriptTypeMatchingToLanguage( nScriptType, SvtLanguageTable::GetLanguageType( rKeyboardLang )))
             rLangItems.insert( rKeyboardLang );
     }
 
@@ -206,7 +205,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
                 if ( rLangItems.size() == static_cast< size_t >(nMaxCount) )
                     break;
                 const Locale& rLocale=rLocales[i];
-                if( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rLocale.Language )))
+                if( IsScriptTypeMatchingToLanguage( nScriptType, SvtLanguageTable::GetLanguageType( rLocale.Language )))
                     rLangItems.insert( OUString( rLocale.Language ) );
             }
         }
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 12e802dc8734..a1179cf0c9ff 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -225,7 +225,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
 
     // get languages to be displayed in the menu
     std::set< OUString > aLangItems;
-    FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
+    FillLangItems( aLangItems, m_xFrame, m_aLangGuessHelper,
             m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
 
     // now add menu entries
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index dcb1ee35bdce..066c3ae70b4a 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -167,7 +167,7 @@ throw (css::uno::RuntimeException)
 
     // get languages to be displayed in the menu
     std::set< OUString > aLangItems;
-    FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
+    FillLangItems( aLangItems, m_xFrame, m_aLangGuessHelper,
             m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
 
     // add first few entries to main menu