da21e9de6a
OAccessibleContextHelper methods are locked by OExternalLockGuard which effectively only locks its ExternalMutex (i.e. SolarMutex); so ensure that all sub-classes actually pass in a SolarMutex by removing the default constructor. (since these classes are in comphelper they can only use the SolarMutex indirectly) This uncovers that AccessibleToolPanelDeckTabBarItem and OAccessibleControlContext did not pass in SolarMutex before. Change-Id: Ib9085eeee6225f7c74b158e72f04b1bf62622071
137 lines
6.7 KiB
C++
137 lines
6.7 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 .
|
|
*/
|
|
|
|
#ifndef COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
|
|
#define COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
|
|
|
|
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
|
|
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
|
|
#include <comphelper/accessiblecontexthelper.hxx>
|
|
#include <cppuhelper/implbase1.hxx>
|
|
#include <comphelper/uno3.hxx>
|
|
#include "comphelper/comphelperdllapi.h"
|
|
|
|
//.........................................................................
|
|
namespace comphelper
|
|
{
|
|
//.........................................................................
|
|
|
|
//=====================================================================
|
|
//= OCommonAccessibleComponent
|
|
//=====================================================================
|
|
/** base class encapsulating common functionality for the helper classes implementing
|
|
the XAccessibleComponent respectively XAccessibleExtendendComponent
|
|
*/
|
|
class COMPHELPER_DLLPUBLIC OCommonAccessibleComponent : public OAccessibleContextHelper
|
|
{
|
|
protected:
|
|
/// see the respective base class ctor for an extensive comment on this, please
|
|
OCommonAccessibleComponent( IMutex* _pExternalLock );
|
|
~OCommonAccessibleComponent();
|
|
|
|
protected:
|
|
/// implements the calculation of the bounding rectangle - still waiting to be overwritten
|
|
virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) = 0;
|
|
|
|
protected:
|
|
/** non-virtual versions of the methods which can be implemented using <method>implGetBounds</method>
|
|
note: getLocationOnScreen relies on a valid parent (XAccessibleContext::getParent()->getAccessibleContext()),
|
|
which itself implements XAccessibleComponent
|
|
*/
|
|
sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
|
|
::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException);
|
|
::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException);
|
|
::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
|
|
::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException);
|
|
};
|
|
|
|
//=====================================================================
|
|
//= OAccessibleComponentHelper
|
|
//=====================================================================
|
|
|
|
struct OAccessibleComponentHelper_Base :
|
|
public ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleComponent >
|
|
{
|
|
protected:
|
|
~OAccessibleComponentHelper_Base() {}
|
|
};
|
|
|
|
/** a helper class for implementing an AccessibleContext which at the same time
|
|
supports an XAccessibleComponent interface.
|
|
*/
|
|
class COMPHELPER_DLLPUBLIC OAccessibleComponentHelper
|
|
:public OCommonAccessibleComponent
|
|
,public OAccessibleComponentHelper_Base
|
|
{
|
|
protected:
|
|
/// see the respective base class ctor for an extensive comment on this, please
|
|
OAccessibleComponentHelper( IMutex* _pExternalLock );
|
|
|
|
public:
|
|
// XInterface
|
|
DECLARE_XINTERFACE( )
|
|
DECLARE_XTYPEPROVIDER( )
|
|
|
|
// XAccessibleComponent - default implementations
|
|
virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException);
|
|
};
|
|
|
|
//=====================================================================
|
|
//= OAccessibleExtendedComponentHelper
|
|
//=====================================================================
|
|
|
|
typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleExtendedComponent
|
|
> OAccessibleExtendedComponentHelper_Base;
|
|
|
|
/** a helper class for implementing an AccessibleContext which at the same time
|
|
supports an XAccessibleExtendedComponent interface.
|
|
*/
|
|
class COMPHELPER_DLLPUBLIC OAccessibleExtendedComponentHelper
|
|
:public OCommonAccessibleComponent
|
|
,public OAccessibleExtendedComponentHelper_Base
|
|
{
|
|
protected:
|
|
/// see the respective base class ctor for an extensive comment on this, please
|
|
OAccessibleExtendedComponentHelper( IMutex* _pExternalLock );
|
|
|
|
public:
|
|
// XInterface
|
|
DECLARE_XINTERFACE( )
|
|
DECLARE_XTYPEPROVIDER( )
|
|
|
|
// XAccessibleComponent - default implementations
|
|
virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
|
|
virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException);
|
|
};
|
|
|
|
//.........................................................................
|
|
} // namespace comphelper
|
|
//.........................................................................
|
|
|
|
#endif // COMPHELPER_ACCESSIBLE_COMPONENT_HELPER_HXX
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|