diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-25 19:59:49 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-25 21:38:08 +0100 |
| commit | e4097762dd48eb2bc3a3e0dc83a3b81766b1c65a (patch) | |
| tree | ca3caabea0f1f0f955c344a4af4afb7fc5b8f10f /desktop | |
| parent | 039eb8c314fe24e7855980dcefd90e164c3b51eb (diff) | |
Audit all PostUserEvent calls and instrument for VclPtr.
Hold a reference on the VclPtr while we're waiting for the UserEvent.
Change-Id: I55c2671ca12eb14761c6a7dffd551af71547ecbd
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 010229251335..92b802fc4fdc 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -659,12 +659,12 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const return true; } -void DialogHelper::PostUserEvent( const Link<>& rLink, void* pCaller ) +void DialogHelper::PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink ) { if ( m_nEventID ) Application::RemoveUserEvent( m_nEventID ); - m_nEventID = Application::PostUserEvent( rLink, pCaller ); + m_nEventID = Application::PostUserEvent( rLink, pCaller, bReferenceLink ); } // ExtMgrDialog @@ -1020,7 +1020,7 @@ void ExtMgrDialog::showProgress( bool _bStart ) OSL_TRACE( "showProgress stop!" ); } - DialogHelper::PostUserEvent( LINK( this, ExtMgrDialog, startProgress ), reinterpret_cast<void*>(bStart) ); + DialogHelper::PostUserEvent( LINK( this, ExtMgrDialog, startProgress ), reinterpret_cast<void*>(bStart), true ); } @@ -1342,7 +1342,7 @@ void UpdateRequiredDialog::showProgress( bool _bStart ) OSL_TRACE( "showProgress stop!" ); } - DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, startProgress ), reinterpret_cast<void*>(bStart) ); + DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, startProgress ), reinterpret_cast<void*>(bStart), true ); } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 46a0c9e3f448..6e8037f42ab2 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -66,7 +66,7 @@ public: void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const; Dialog* getWindow() const { return m_pVCLWindow; }; - void PostUserEvent( const Link<>& rLink, void* pCaller ); + void PostUserEvent( const Link<>& rLink, void* pCaller, bool bReferenceLink = false ); void clearEventID() { m_nEventID = 0; } virtual void showProgress( bool bStart ) = 0; |