diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-23 18:38:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-23 18:40:34 +0100 |
| commit | a0093404ffbca79655a52019d6bf66b976964fe9 (patch) | |
| tree | c8e6d7de6658a7f6e8f0a890c5b6605f1463e300 /sfx2/source/inc/virtmenu.hxx | |
| parent | 9bea733ecf01da09aaf7281868441b8a02fcf5cc (diff) | |
SfxVirtualMenu: fix context menu crash:
SfxMenuCtrlArr_Impl used to be a PTRARR_DEL, so use a boost::ptr_vector
to ensure elements are deleted.
(regression from 94d4764a42f8f38b884bb8960791d80ac876b786)
Diffstat (limited to 'sfx2/source/inc/virtmenu.hxx')
| -rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 998fe66ce7b6..44bf381589a2 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -25,8 +25,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SFXVIRTMENU_HXX -#define _SFXVIRTMENU_HXX +#ifndef SFXVIRTMENU_HXX +#define SFXVIRTMENU_HXX + +#include <boost/ptr_container/ptr_vector.hpp> #include <sfx2/mnuitem.hxx> #include "mnucfga.hxx" @@ -35,7 +37,7 @@ class SfxBindings; class Timer; class SfxMenuImageControl_Impl; -typedef std::vector<SfxMenuControl*> SfxMenuCtrlArr_Impl; +typedef ::boost::ptr_vector<SfxMenuControl> SfxMenuCtrlArr_Impl; class SAL_DLLPUBLIC_EXPORT SfxVirtualMenu { |