framework/source/uielement/langselectionstatusbarcontroller.cxx | 17
+++++-----
sw/source/ui/lingu/olmenu.cxx | 7 ++--
2 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 1bab1e998762bf4a11614b5b0bd074873b88424c
Author: Jan Holesovsky <ke...@suse.cz>
Date: Fri May 25 12:18:13 2012 +0200
language status bar control: Don't set radio buttons for some entries.
There are entries in the popup menu that are not supposed to be radio
buttons,
like More... ;-)
Change-Id: Ic7986a668522901a244d35eda7e9cfbe0133f37e
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx
b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 902b2bd..5e67beb 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -224,8 +224,11 @@ throw (::com::sun::star::uno::RuntimeException)
}
}
xPopupMenu->insertItem( MID_LANG_SEL_NONE, String( FwkResId(
STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_NONE
);
- xPopupMenu->insertItem( MID_LANG_SEL_RESET, String( FwkResId(
STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK,
MID_LANG_SEL_RESET );
- xPopupMenu->insertItem( MID_LANG_SEL_MORE, String( FwkResId(
STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_MORE
);
+ if ( aLanguageTable.GetString( LANGUAGE_NONE ) == m_aCurLang )
+ xPopupMenu->checkItem( MID_LANG_SEL_NONE, sal_True );
+
+ xPopupMenu->insertItem( MID_LANG_SEL_RESET, String( FwkResId(
STR_RESET_TO_DEFAULT_LANGUAGE )), 0, MID_LANG_SEL_RESET );
+ xPopupMenu->insertItem( MID_LANG_SEL_MORE, String( FwkResId(
STR_LANGSTATUS_MORE )), 0, MID_LANG_SEL_MORE );
// add entries to submenu ('set language for paragraph')
nItemId = static_cast< sal_Int16 >(MID_LANG_PARA_1);
@@ -238,18 +241,18 @@ throw (::com::sun::star::uno::RuntimeException)
{
DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <=
MID_LANG_PARA_9,
"nItemId outside of expected range!" );
- subPopupMenu->insertItem( nItemId, rStr,
css::awt::MenuItemStyle::RADIOCHECK, nItemId );
+ subPopupMenu->insertItem( nItemId, rStr, 0, nItemId );
aLangMap[nItemId] = rStr;
++nItemId;
}
}
- subPopupMenu->insertItem( MID_LANG_PARA_NONE, String( FwkResId(
STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_NONE
);
- subPopupMenu->insertItem( MID_LANG_PARA_RESET, String( FwkResId(
STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK,
MID_LANG_PARA_RESET );
- subPopupMenu->insertItem( MID_LANG_PARA_MORE, String( FwkResId(
STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_MORE
);
+ subPopupMenu->insertItem( MID_LANG_PARA_NONE, String( FwkResId(
STR_LANGSTATUS_NONE )), 0, MID_LANG_PARA_NONE );
+ subPopupMenu->insertItem( MID_LANG_PARA_RESET, String( FwkResId(
STR_RESET_TO_DEFAULT_LANGUAGE )), 0, MID_LANG_PARA_RESET );
+ subPopupMenu->insertItem( MID_LANG_PARA_MORE, String( FwkResId(
STR_LANGSTATUS_MORE )), 0, MID_LANG_PARA_MORE );
// add last two entries to main menu
xPopupMenu->insertSeparator( MID_LANG_PARA_SEPERATOR );
- xPopupMenu->insertItem( MID_LANG_PARA_STRING, String( FwkResId(
STR_SET_LANGUAGE_FOR_PARAGRAPH )), css::awt::MenuItemStyle::RADIOCHECK,
MID_LANG_PARA_STRING );
+ xPopupMenu->insertItem( MID_LANG_PARA_STRING, String( FwkResId(
STR_SET_LANGUAGE_FOR_PARAGRAPH )), 0, MID_LANG_PARA_STRING );
xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu );
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 1d53314..171a797 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -314,8 +314,11 @@ void SwSpellPopup::fillLangPopupMenu(
}
pPopupMenu->InsertItem( nLangItemIdStart + MN_NONE_OFFSET, String(SW_RES(
STR_LANGSTATUS_NONE )), MIB_RADIOCHECK );
- pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, String(SW_RES(
STR_RESET_TO_DEFAULT_LANGUAGE )), MIB_RADIOCHECK );
- pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, String(SW_RES(
STR_LANGSTATUS_MORE )), MIB_RADIOCHECK );
+ if ( aLanguageTable.GetString( LANGUAGE_NONE ) == aCurLang )
+ pPopupMenu->CheckItem( nLangItemIdStart + MN_NONE_OFFSET, sal_True );
+
+ pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, String(SW_RES(
STR_RESET_TO_DEFAULT_LANGUAGE )), 0 );
+ pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, String(SW_RES(
STR_LANGSTATUS_MORE )), 0 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
