Files
libreoffice/accessibility/source/extended/listboxaccessible.cxx
Stephan Bergmann 8e1ad96626 Some missing SolarMutexGuard around VclPtr acquire/release
At least OutputDevice::acquire/release use a plain unguarded int and ++, --, so
apparently rely on the SolarMutex being locked whenever they are called.  Fixed
those places that caused "make check" to fail for me when temporarily adding
DBG_TESTSOLARMUTEX() to OutputDevice::acquire/release.  (A recurring pattern is
that a class fails to ensure the SolarMutex is locked around the destruction of
non-null VclPtr members.)

Change-Id: I77cba6f3908f2de1b516ce28f1c3c43b3f57a9c5
2015-06-17 15:24:19 +02:00

85 lines
3.1 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <accessibility/extended/listboxaccessible.hxx>
#include <svtools/treelistbox.hxx>
#include <vcl/svapp.hxx>
namespace accessibility
{
// ListBoxAccessibleBase
ListBoxAccessibleBase::ListBoxAccessibleBase( SvTreeListBox& _rWindow )
:m_pWindow( &_rWindow )
{
m_pWindow->AddEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
}
ListBoxAccessibleBase::~ListBoxAccessibleBase( )
{
if ( m_pWindow )
{
// cannot call "dispose" here, as it is abstract, so the VTABLE of the derived class
// is not intact anymore
// so we call our "disposing" only
disposing();
}
}
IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclSimpleEvent*, pEvent )
{
OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "ListBoxAccessibleBase::WindowEventListener: unexpected WindowEvent!" );
if ( pEvent && pEvent->ISA( VclWindowEvent ) )
{
OSL_ENSURE( static_cast< VclWindowEvent* >( pEvent )->GetWindow() , "ListBoxAccessibleBase::WindowEventListener: no event window!" );
OSL_ENSURE( static_cast< VclWindowEvent* >( pEvent )->GetWindow() == m_pWindow, "ListBoxAccessibleBase::WindowEventListener: where did this come from?" );
ProcessWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
}
return 0;
}
void ListBoxAccessibleBase::disposing()
{
SolarMutexGuard g;
if ( m_pWindow )
m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
m_pWindow = NULL;
}
void ListBoxAccessibleBase::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
{
if ( isAlive() )
{
switch ( _rVclWindowEvent.GetId() )
{
case VCLEVENT_OBJECT_DYING :
{
if ( m_pWindow )
m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
m_pWindow = NULL;
dispose();
break;
}
}
}
}
} // namespace accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */