[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/source

[Muhammet Kara]

 cui/source/customize/cfg.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b35ea66a9381c4ddee52bb9aa94b51ecaff98605
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date:   Thu Jan 12 11:17:11 2017 +0300

    tdf#105014: Disable related buttons when there is no menu to edit
    
    Clicking the "Add Separator" or the "Add Submenu" button, when there is
    no menu edit, causes LibreOffice to crash. So disable them properly.
    
    Change-Id: Ibf685145a87c9e4343d83e1bb5ef6f08136c8f31
    Reviewed-on: https://gerrit.libreoffice.org/32987
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit ce0f9962d1d1d5a4f6301be18c23b2d14efd9d6b)
    Reviewed-on: https://gerrit.libreoffice.org/33246
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index cf734f7..93139ca 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2546,7 +2546,6 @@ void SvxMenuConfigPage::UpdateButtonStates()
         m_pMoveUpButton->Enable( false );
         m_pMoveDownButton->Enable( false );
         m_pDeleteCommandButton->Enable(false);
-        m_pAddSeparatorButton->Enable();
 
         pPopup->EnableItem( "modrename", false );
 
@@ -2655,6 +2654,7 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, SelectMenu, ListBox&, void )
     m_pModifyCommandButton->Enable( pMenuData != nullptr );
     m_pAddCommandsButton->Enable( pMenuData != nullptr );
     m_pAddSeparatorButton->Enable( pMenuData != nullptr );
+    m_pAddSubmenuButton->Enable( pMenuData != nullptr );
 
     PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu();
     if ( pMenuData )