diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-27 22:31:47 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-27 22:11:07 +0000 |
| commit | 89c23b4aaef931b5d6009efaf44ce6e6c976e8d4 (patch) | |
| tree | 73cb7691235d8c723ba5bc8add032daac0a6d53b /svx | |
| parent | 798c107a1afa6e22a0de97c49d0bda552913e56a (diff) | |
Sub menus no longer need manual disposing
after:
commit ee79a2dd7ea60e902cab3a9203e307b8a78fee23
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Jul 29 14:33:22 2016 +0100
Resolves: tdf#101169 crash using column menu in base
Change-Id: I7c6e54dd5574c61cffd5884d1cf1b63075073001
Reviewed-on: https://gerrit.libreoffice.org/30343
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 27994a36cb4a..130dd4fe6fef 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -775,14 +775,11 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe enum InspectorAction { eOpenInspector, eCloseInspector, eUpdateInspector, eNone }; -void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu, sal_uInt16 nExecutionResult) +void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) { Reference< css::container::XIndexContainer > xCols(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns()); sal_uInt16 nPos = GetModelColumnPos(nColId); - // remove and delete the menu we inserted in PreExecuteColumnContextMenu - rMenu.DisposePopupMenu(SID_FM_CHANGECOL); - OUString aFieldType; bool bReplace = false; InspectorAction eInspectorAction = eNone; |