diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-06 20:43:06 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-07 09:45:08 +0100 |
| commit | 207b0799d9b5b7029ccde23787f55e6efc2df2aa (patch) | |
| tree | efc38be41c566b22d1174679fdc425583f0bd536 | |
| parent | ca0bf47a14fc57c0c38915ad4a5a0ebfa0219295 (diff) | |
tdf#91073 - keep the popup pointer around while we operate on it.
Change-Id: I33767036847aed3d5c7ee4a7d13e81590e46b65b
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index d30b026265f8..5119f608b4e4 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -622,7 +622,7 @@ void SAL_CALL SfxToolBoxControl::doubleClick() throw (::com::sun::star::uno::Run Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - vcl::Window* pWindow = CreatePopupWindow(); + VclPtr<vcl::Window> pWindow = CreatePopupWindow(); if ( pWindow ) return VCLUnoHelper::GetInterface( pWindow ); else diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 0d6ef0d9cc12..f7892c588ad7 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -186,6 +186,7 @@ void FloatingWindow::doDeferredInit(WinBits nBits) FloatingWindow::~FloatingWindow() { disposeOnce(); + assert (!mnPostId); } void FloatingWindow::dispose() |