summaryrefslogtreecommitdiffstats
path: root/dbaccess
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-10-27 22:31:47 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-10-27 22:11:07 +0000
commit89c23b4aaef931b5d6009efaf44ce6e6c976e8d4 (patch)
tree73cb7691235d8c723ba5bc8add032daac0a6d53b /dbaccess
parentcoverity#1374310 Uncaught exception (diff)
downloadcore-89c23b4aaef931b5d6009efaf44ce6e6c976e8d4.tar.gz
core-89c23b4aaef931b5d6009efaf44ce6e6c976e8d4.zip
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 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx2
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 983ab27d7a07..374a3bba72bb 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -681,7 +681,7 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
}
}
-void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu, sal_uInt16 nExecutionResult)
+void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult)
{
switch (nExecutionResult)
{
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 18e20d5b86ea..4908ab97c826 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -176,7 +176,7 @@ namespace dbaui
// FmGridHeader overridables
virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu) override;
- virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu, sal_uInt16 nExecutionResult) override;
+ virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) override;
private:
// DragSourceHelper overridables