strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix VCLXWindow related leaks

Browse source 
Change-Id: If2c0a599bdfed4c5390c4d3628157c7d942d5cf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115870
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2021-05-20 13:23:52 +02:00
parent 157fb80b9c
commit dbd45a00db
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
toolkit/source/awt/vclxwindow.cxx
View file

@ -220,6 +220,11 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps
void VCLXWindowImpl::disposing()
{
SolarMutexGuard aGuard;
assert(!mbDisposed);
mbDisposed = true;
if ( mnCallbackEventId )
{
Application::RemoveUserEvent( mnCallbackEventId );
@ -227,8 +232,7 @@ void VCLXWindowImpl::disposing()
// we acquired our VCLXWindow once before posting the event, release this one ref now
mrAntiImpl.release();
}
mbDisposed = true;
maCallbackEvents.clear();
css::lang::EventObject aEvent;
aEvent.Source = mrAntiImpl;
@ -243,6 +247,7 @@ void VCLXWindowImpl::disposing()
maPaintListeners.disposeAndClear( aEvent );
maContainerListeners.disposeAndClear( aEvent );
maTopWindowListeners.disposeAndClear( aEvent );
maWindow2Listeners.disposeAndClear( aEvent );
::toolkit::WindowStyleSettings* pStyleSettings = static_cast< ::toolkit::WindowStyleSettings* >( mxWindowStyleSettings.get() );
if ( pStyleSettings != nullptr )
@ -334,6 +339,8 @@ VCLXWindow::~VCLXWindow()
void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const Callback& i_callback )
{
if (mpImpl->mbDisposing)
return;
mpImpl->callBackAsync( i_callback );
}
@ -345,6 +352,8 @@ void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const Callback& i_callback )
void VCLXWindow::SetWindow( const VclPtr<vcl::Window> &pWindow )
{
assert(!mpImpl->mbDisposing || !pWindow);
if ( GetWindow() )
{
GetWindow()->RemoveEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
@ -416,6 +425,8 @@ namespace
void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
if (mpImpl->mbDisposing)
return;
css::uno::Reference< css::uno::XInterface > xThis( static_cast<cppu::OWeakObject*>(this) );
switch ( rVclWindowEvent.GetId() )