diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-19 23:17:42 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-22 20:57:36 +0000 |
| commit | cdcc4656dade53710eb07682c7de070ad9fd2a3a (patch) | |
| tree | 6489bfc626b640c16360ee7ca06721674966d79d /svx | |
| parent | f649b2e7b48141457b9d2b7619e6a2e16006825f (diff) | |
Dispose unused submenu
Open Writer, Insert > Form Control > Table Control, draw it,
cancel the wizard. Now right click on the table header -> crash.
(can't be tested with gtk/gtk3 vclplug, because GtkSalMenu
holds reference to the menu).
Probably this crashreport:
http://crashreport.libreoffice.org/stats/crash_details/
0bfabafd-3ba4-4c07-8479-399dea07c006
Change-Id: I6588b1e0b5ad4537a4eb98f6a343d0e92264329f
(cherry picked from commit 0a849c9315a74754dbbecc529e5c5ccda66fbd86)
Reviewed-on: https://gerrit.libreoffice.org/33329
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index d07db154241f..5dadb7d55325 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -706,6 +706,8 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe pControlMenu->EnableItem(SID_FM_FORMATTEDFIELD + nChangeTypeOffset, bDesignMode && (nColType != TYPE_FORMATTEDFIELD)); rMenu.SetPopupMenu(SID_FM_CHANGECOL, pControlMenu); } + else + pControlMenu.disposeAndClear(); rMenu.EnableItem(SID_FM_INSERTCOL, bDesignMode && xCols.is()); rMenu.EnableItem(SID_FM_DELETECOL, bDesignMode && bMarked && xCols.is()); |