sc/source/ui/app/inputwin.cxx | 4 +--- sfx2/source/view/viewfrm.cxx | 1 - vcl/source/window/toolbox2.cxx | 2 +- vcl/source/window/window2.cxx | 3 ++- 4 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 45bc9edb9be2bb2127dde858078c2aad922f73c2 Author: Michael Meeks <[email protected]> Date: Wed Mar 18 14:23:09 2015 +0000 more lifecycle cleanup & fixing. Change-Id: Icc9051bad16c0e66c9e9f631c487a2facde72e9f diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 179c807..bed685f 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -288,11 +288,9 @@ void ScInputWindow::dispose() SfxImageManager::GetImageManager( *SC_MOD() )->ReleaseToolBox( this ); + pRuntimeWindow.disposeAndClear(); aWndPos.disposeAndClear(); - pRuntimeWindow.reset(); - - pRuntimeWindow.disposeAndClear(); ToolBox::dispose(); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index abe011c..54a795c 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1489,7 +1489,6 @@ SfxViewFrame::SfxViewFrame SfxViewFrame::~SfxViewFrame() { - SetDowning_Impl(); if ( SfxViewFrame::Current() == this ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 85b24a5..85c4d68 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -169,7 +169,7 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) : ImplToolItem::~ImplToolItem() { - mpWindow.disposeAndClear(); + // don't dispose mpWindow - we get copied around. } ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index f2feaec..58a2664 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1346,7 +1346,8 @@ void Window::SetHelpText( const OUString& rHelpText ) void Window::SetQuickHelpText( const OUString& rHelpText ) { - mpWindowImpl->maQuickHelpText = rHelpText; + if (mpWindowImpl) + mpWindowImpl->maQuickHelpText = rHelpText; } const OUString& Window::GetQuickHelpText() const _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
