[Libreoffice-commits] core.git: svx/source

[Maxim Monastirsky]

 svx/source/fmcomp/fmgridcl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0a849c9315a74754dbbecc529e5c5ccda66fbd86
Author: Maxim Monastirsky <momonasmon at gmail.com>
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

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index a06a858..1e39c96 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -728,6 +728,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());