diff options
| author | Eike Rathke <erack@redhat.com> | 2014-04-18 01:43:14 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-04-18 01:43:24 +0200 |
| commit | bf1737cfe67588bb853112e2b044e43d704d8bf5 (patch) | |
| tree | 5f011eecf6a15e9557ad9a2146440347e411c01a /framework | |
| parent | 3f814cd286889995c96a6ced3ee7f5793ea92fc6 (diff) | |
and another SvtLanguageTable instance bites the dust
Change-Id: I1109d1b7a403d4feb2791e758e1c0540b25029ba
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/langselectionstatusbarcontroller.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 066c3ae70b4a..7d3e9be73c6e 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -73,8 +73,6 @@ using namespace css::i18n; using namespace css::document; using namespace framework; -class SvtLanguageTable; - namespace { class LangSelectionStatusbarController: @@ -163,8 +161,6 @@ throw (css::uno::RuntimeException) //sub menu that contains all items except the last two items: Separator + Set Language for Paragraph Reference< awt::XPopupMenu > subPopupMenu( awt::PopupMenu::create( m_xContext ) ); - SvtLanguageTable aLanguageTable; - // get languages to be displayed in the menu std::set< OUString > aLangItems; FillLangItems( aLangItems, m_xFrame, m_aLangGuessHelper, @@ -179,7 +175,7 @@ throw (css::uno::RuntimeException) for (it = aLangItems.begin(); it != aLangItems.end(); ++it) { const OUString & rStr( *it ); - if ( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) ) && + if ( rStr != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) ) && rStr != sAsterisk && rStr != sEmpty) { @@ -197,7 +193,7 @@ throw (css::uno::RuntimeException) } xPopupMenu->insertItem( MID_LANG_SEL_NONE, FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE ); - if ( aLanguageTable.GetString( LANGUAGE_NONE ) == m_aCurLang ) + if ( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) == m_aCurLang ) xPopupMenu->checkItem( MID_LANG_SEL_NONE, sal_True ); xPopupMenu->insertItem( MID_LANG_SEL_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET ); xPopupMenu->insertItem( MID_LANG_SEL_MORE, FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE ); @@ -207,7 +203,7 @@ throw (css::uno::RuntimeException) for (it = aLangItems.begin(); it != aLangItems.end(); ++it) { const OUString & rStr( *it ); - if( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&& + if( rStr != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) )&& rStr != sAsterisk && rStr != sEmpty) { |