From a0093404ffbca79655a52019d6bf66b976964fe9 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 23 Jan 2012 18:38:45 +0100
Subject: 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)
---
 sfx2/source/inc/virtmenu.hxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sfx2/source/inc/virtmenu.hxx')

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
 {
-- 
cgit