summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-03-17 15:37:03 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 11:41:51 +0100
commit2b1772c5b8bd4aedbc7ec7a9a916ac8c8f975f34 (patch)
tree01b2dbc4098bb3d4b30d77dd544f6c8063b68bc4 /sfx2
parent6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9 (diff)
add missing disposeAndClear pieces for VclMEdit
Also correct dispose ordering in dbaccess.
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/viewfrm.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f61969f753da..3ab9d13a05d7 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1489,7 +1489,8 @@ SfxViewFrame::~SfxViewFrame()
// The Bindings delete the Frame!
KillDispatcher_Impl();
- pImp->pWindow.clear();
+ pImp->pWindow.disposeAndClear();
+ pImp->pFocusWin.clear();
if ( GetFrame().GetCurrentViewFrame() == this )
GetFrame().SetCurrentViewFrame_Impl( NULL );