cui/source/customize/cfg.cxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
New commits: commit 13ef923c64859f073d16790e6bf4dfbd3f6d2d39 Author: Maxim Monastirsky <[email protected]> Date: Mon Nov 2 15:06:27 2015 +0200 Fix popup menu IDs after .ui conversion (cherry picked from commit 9fbdb3d37fab7c8e0d6507807166c4de079d272f) Conflicts: cui/source/customize/cfg.cxx Change-Id: I8955bee3ac2bb7a757c1f70dd46141833a068517 Reviewed-on: https://gerrit.libreoffice.org/19739 Tested-by: Jenkins <[email protected]> Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5e74b9c..e4da216 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2298,9 +2298,9 @@ void SvxMenuConfigPage::UpdateButtonStates() m_pMoveUpButton->Enable( false ); m_pMoveDownButton->Enable( false ); - pPopup->EnableItem( ID_BEGIN_GROUP, true ); - pPopup->EnableItem( ID_RENAME, false ); - pPopup->EnableItem( ID_DELETE, false ); + pPopup->EnableItem( "addseparator", true ); + pPopup->EnableItem( "modrename", false ); + pPopup->EnableItem( "moddelete", false ); m_pDescriptionField->SetText(""); @@ -2318,17 +2318,17 @@ void SvxMenuConfigPage::UpdateButtonStates() if ( pEntryData->IsSeparator() ) { - pPopup->EnableItem( ID_DELETE, true ); - pPopup->EnableItem( ID_BEGIN_GROUP, false ); - pPopup->EnableItem( ID_RENAME, false ); + pPopup->EnableItem( "moddelete", true ); + pPopup->EnableItem( "addseparator", false ); + pPopup->EnableItem( "modrename", false ); m_pDescriptionField->SetText(""); } else { - pPopup->EnableItem( ID_BEGIN_GROUP, true ); - pPopup->EnableItem( ID_DELETE, true ); - pPopup->EnableItem( ID_RENAME, true ); + pPopup->EnableItem( "addseparator", true ); + pPopup->EnableItem( "moddelete", true ); + pPopup->EnableItem( "modrename", true ); m_pDescriptionField->SetText(pEntryData->GetHelpText()); } @@ -2409,9 +2409,9 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox ) 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 [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
