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

[Stephan Bergmann]

 sw/source/uibase/docvw/edtwin.cxx     |    3 ++-
 sw/source/uibase/inc/FrameControl.hxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b4b71d20e33b82d377e287f0e5cf07b7e6182e78
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 15 08:03:04 2015 +0200

    loplugin:vclwidgets
    
    Change-Id: Ib64f7585bf44bdaa6dd1101b97848baa1f121725

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 427faaf..665e815 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4975,7 +4975,6 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
 SwEditWin::~SwEditWin()
 {
     disposeOnce();
-    delete m_pFrameControlsManager;
 }
 
 void SwEditWin::dispose()
@@ -5003,6 +5002,8 @@ void SwEditWin::dispose()
     m_pAnchorMarker = NULL;
 
     m_pFrameControlsManager->dispose();
+    delete m_pFrameControlsManager;
+    m_pFrameControlsManager = nullptr;
 
     vcl::Window::dispose();
 }
diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx
index 5787b23..653c6e1 100644
--- a/sw/source/uibase/inc/FrameControl.hxx
+++ b/sw/source/uibase/inc/FrameControl.hxx
@@ -56,7 +56,7 @@ class SwFrameMenuButtonBase : public MenuButton, public ISwFrameControl
     const SwFrm*          m_pFrm;
 
 protected:
-    virtual ~SwFrameMenuButtonBase() {}
+    virtual ~SwFrameMenuButtonBase() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE;
 
 public: