svx/source/fmcomp/fmgridcl.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit cdcc4656dade53710eb07682c7de070ad9fd2a3a
Author: Maxim Monastirsky <[email protected]>
Date: Thu Jan 19 23:17:42 2017 +0200
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 <[email protected]>
Reviewed-by: Caolán McNamara <[email protected]>
Tested-by: Caolán McNamara <[email protected]>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index d07db15..5dadb7d 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());
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
