cui/source/customize/cfg.cxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
New commits: commit 9fbdb3d37fab7c8e0d6507807166c4de079d272f Author: Maxim Monastirsky <momonas...@gmail.com> Date: Mon Nov 2 15:06:27 2015 +0200 Fix popup menu IDs after .ui conversion Change-Id: I8955bee3ac2bb7a757c1f70dd46141833a068517 diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index a6c4f1b..3c8340b 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2282,9 +2282,9 @@ void SvxMenuConfigPage::UpdateButtonStates() m_pMoveUpButton->Enable( false ); m_pMoveDownButton->Enable( false ); - pPopup->EnableItem( ID_BEGIN_GROUP ); - pPopup->EnableItem( ID_RENAME, false ); - pPopup->EnableItem( ID_DELETE, false ); + pPopup->EnableItem( "addseparator" ); + pPopup->EnableItem( "modrename", false ); + pPopup->EnableItem( "moddelete", false ); m_pDescriptionField->SetText(""); @@ -2302,17 +2302,17 @@ void SvxMenuConfigPage::UpdateButtonStates() if ( pEntryData->IsSeparator() ) { - pPopup->EnableItem( ID_DELETE ); - pPopup->EnableItem( ID_BEGIN_GROUP, false ); - pPopup->EnableItem( ID_RENAME, false ); + pPopup->EnableItem( "moddelete" ); + pPopup->EnableItem( "addseparator", false ); + pPopup->EnableItem( "modrename", false ); m_pDescriptionField->SetText(""); } else { - pPopup->EnableItem( ID_BEGIN_GROUP ); - pPopup->EnableItem( ID_DELETE ); - pPopup->EnableItem( ID_RENAME ); + pPopup->EnableItem( "addseparator" ); + pPopup->EnableItem( "moddelete" ); + pPopup->EnableItem( "modrename" ); m_pDescriptionField->SetText(pEntryData->GetHelpText()); } @@ -2391,9 +2391,9 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void ) PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu(); if ( pMenuData ) { - pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() ); - pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() ); - pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() ); + pPopup->EnableItem( "delete", pMenuData->IsDeletable() ); + pPopup->EnableItem( "rename", pMenuData->IsRenamable() ); + pPopup->EnableItem( "move", pMenuData->IsMovable() ); SvxEntries* pEntries = pMenuData->GetEntries(); SvxEntries::const_iterator iter = pEntries->begin(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits