Kaydet (Commit) d112cf38 authored tarafından Eike Rathke's avatar Eike Rathke

no temporary instance of SvtLanguageTable necessary here

Change-Id: I19de12c9199dec3d922334a16649142acaea0235
üst b9ba0528
...@@ -561,27 +561,26 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) ...@@ -561,27 +561,26 @@ m_aInfo16( SW_RES(IMG_INFO_16) )
//ADD NEW LANGUAGE MENU ITEM //ADD NEW LANGUAGE MENU ITEM
OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) );
SvtLanguageTable aLanguageTable;
// get keyboard language // get keyboard language
OUString aKeyboardLang; OUString aKeyboardLang;
SwEditWin& rEditWin = pWrtSh->GetView().GetEditWin(); SwEditWin& rEditWin = pWrtSh->GetView().GetEditWin();
LanguageType nLang = rEditWin.GetInputLanguage(); LanguageType nLang = rEditWin.GetInputLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aKeyboardLang = aLanguageTable.GetString( nLang ); aKeyboardLang = SvtLanguageTable::GetLanguageString( nLang );
// get the language that is in use // get the language that is in use
OUString aCurrentLang("*"); OUString aCurrentLang("*");
nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh ); nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh );
if (nLang != LANGUAGE_DONTKNOW) if (nLang != LANGUAGE_DONTKNOW)
aCurrentLang = aLanguageTable.GetString( nLang ); aCurrentLang = SvtLanguageTable::GetLanguageString( nLang );
// build sequence for status value // build sequence for status value
uno::Sequence< OUString > aSeq( 4 ); uno::Sequence< OUString > aSeq( 4 );
aSeq[0] = aCurrentLang; aSeq[0] = aCurrentLang;
aSeq[1] = aScriptTypesInUse; aSeq[1] = aScriptTypesInUse;
aSeq[2] = aKeyboardLang; aSeq[2] = aKeyboardLang;
aSeq[3] = aLanguageTable.GetString(m_nGuessLangWord); aSeq[3] = SvtLanguageTable::GetLanguageString(m_nGuessLangWord);
PopupMenu *pMenu = GetPopupMenu(MN_SET_LANGUAGE_SELECTION); PopupMenu *pMenu = GetPopupMenu(MN_SET_LANGUAGE_SELECTION);
fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text ); fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment