commit c98b7c9e75a951012d6693f5adecb1ff0e1f8f6b
author Muhammet Kara <muhammet.kara@collabora.com> Thu Jun 13 13:19:05 2019 +0200
committer Michael Weghorn <m.weghorn@posteo.de> Thu Jun 13 19:41:32 2019 +0200
tree d1d0964d5079fb0f3c27ed46d97bfdc786e4762b
parent 7f89fe721d2b74ad88b5a124cda20ae419746dec

Resolves tdf#125840: Crash when trying to customize Base Data View toolbar

Change-Id: If5b157c1f1362128d22d210286da741ba905e5aa
Reviewed-on: https://gerrit.libreoffice.org/73958
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

cui/source/customize/SvxMenuConfigPage.cxx

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index bf0247c..03e3f9a 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -223,10 +223,14 @@ void SvxMenuConfigPage::UpdateButtonStates()
    {
        SvxConfigEntry* pMenuData = GetTopLevelSelection();
        PopupMenu* pGearPopup = m_pGearBtn->GetPopupMenu();

        if (!pGearPopup)
            return;

        // Add option (gear_add) will always be enabled
        pGearPopup->EnableItem( "gear_delete", pMenuData->IsDeletable() );
        pGearPopup->EnableItem( "gear_rename", pMenuData->IsRenamable() );
        pGearPopup->EnableItem( "gear_move", pMenuData->IsMovable() );
        pGearPopup->EnableItem( "gear_delete", pMenuData && pMenuData->IsDeletable() );
        pGearPopup->EnableItem( "gear_rename", pMenuData && pMenuData->IsRenamable() );
        pGearPopup->EnableItem( "gear_move", pMenuData && pMenuData->IsMovable() );
    }
}