diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-07-14 12:51:04 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:24 +0200 |
| commit | 7c50bdb284c8a89104744113e64bda0c534cff97 (patch) | |
| tree | 28f32749fa6731af71eaac7c94028c33530549ab /svtools | |
| parent | ce400bd25448403d3864a7c1cf6fb7d64f8fbb17 (diff) | |
tdf#92706 - avoid dbaccess wizard crash.
Hold a VclPtr on the window, make reset cleaner, and don't crash
removing listeners from disposed windows.
Change-Id: I3efb71117fc45562d5c740578f5e33dabb2684fe
Reviewed-on: https://gerrit.libreoffice.org/17038
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/dialogcontrolling.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index b381c43d4bd7..ca6280410007 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -49,13 +49,13 @@ namespace svt struct DialogController_Data { - vcl::Window& rInstigator; - ::std::vector< VclPtr<vcl::Window> > aConcernedWindows; + VclPtr<vcl::Window> xInstigator; + ::std::vector< VclPtr<vcl::Window> > aConcernedWindows; PWindowEventFilter pEventFilter; PWindowOperator pOperator; - DialogController_Data( vcl::Window& _rInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) - :rInstigator( _rInstigator ) + DialogController_Data( vcl::Window& _xInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) + :xInstigator( &_xInstigator ) ,pEventFilter( _pEventFilter ) ,pOperator( _pOperator ) { @@ -66,14 +66,14 @@ namespace svt //= DialogController - DialogController::DialogController( vcl::Window& _rInstigator, const PWindowEventFilter& _pEventFilter, + DialogController::DialogController( vcl::Window& _xInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ) - :m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, _pOperator ) ) + :m_pImpl( new DialogController_Data( _xInstigator, _pEventFilter, _pOperator ) ) { DBG_ASSERT( m_pImpl->pEventFilter.get() && m_pImpl->pOperator.get(), "DialogController::DialogController: invalid filter and/or operator!" ); - m_pImpl->rInstigator.AddEventListener( LINK( this, DialogController, OnWindowEvent ) ); + m_pImpl->xInstigator->AddEventListener( LINK( this, DialogController, OnWindowEvent ) ); } @@ -85,7 +85,9 @@ namespace svt void DialogController::reset() { - m_pImpl->rInstigator.RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) ); + if (m_pImpl->xInstigator) + m_pImpl->xInstigator->RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) ); + m_pImpl->xInstigator.clear(); m_pImpl->aConcernedWindows.clear(); m_pImpl->pEventFilter.reset(); m_pImpl->pOperator.reset(); |