diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/langselectionmenucontroller.cxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/langselectionstatusbarcontroller.cxx | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 5d89a000994f..6cb7728976f8 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -200,7 +200,6 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup sal_Int16 nItemId = 1; // in this control the item id is not important for executing the command const OUString sAsterisk("*"); // multiple languages in current selection - const OUString sEmpty; // 'no language found' from language guessing const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE )); std::set< OUString >::const_iterator it; for (it = aLangItems.begin(); it != aLangItems.end(); ++it) @@ -208,7 +207,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup const OUString & rStr( *it ); if (rStr != sNone && rStr != sAsterisk && - rStr != sEmpty) + !rStr.isEmpty()) // 'no language found' from language guessing { pPopupMenu->InsertItem( nItemId, rStr ); aCmd = aCmd_Language; diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 2f2ab7969604..ea8a10665b5a 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -149,7 +149,6 @@ throw (css::uno::RuntimeException, std::exception) // add first few entries to main menu sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1); const OUString sAsterisk("*"); // multiple languages in current selection - const OUString sEmpty; // 'no language found' from language guessing const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE )); std::map< sal_Int16, OUString > aLangMap; std::set< OUString >::const_iterator it; @@ -158,7 +157,7 @@ throw (css::uno::RuntimeException, std::exception) const OUString & rStr( *it ); if ( rStr != sNone && rStr != sAsterisk && - rStr != sEmpty) + !rStr.isEmpty()) // 'no language found' from language guessing { DBG_ASSERT( MID_LANG_SEL_1 <= nItemId && nItemId <= MID_LANG_SEL_9, "nItemId outside of expected range!" ); @@ -186,7 +185,7 @@ throw (css::uno::RuntimeException, std::exception) const OUString & rStr( *it ); if( rStr != sNone && rStr != sAsterisk && - rStr != sEmpty) + !rStr.isEmpty()) // 'no language found' from language guessing { DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <= MID_LANG_PARA_9, "nItemId outside of expected range!" ); |