diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-18 14:23:09 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:01:42 +0100 |
| commit | 4f386d07474790648843665cac42879cb33eba48 (patch) | |
| tree | 822ae19894fe6554e58c571f7cf3e17500ca4ff6 | |
| parent | 739f3a5c2b5410685b22d920e8d6c4d59567dfd3 (diff) | |
more lifecycle cleanup & fixing.
Change-Id: Icc9051bad16c0e66c9e9f631c487a2facde72e9f
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 4cddaa34d81e..0c4c04278806 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 3ab9d13a05d7..42f18115b295 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1477,7 +1477,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 0378a20c35ac..574705a9d4a6 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -165,7 +165,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 25b599b2a1d8..95468f3a5e9f 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 |