diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-24 09:44:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-24 14:44:52 +0100 |
| commit | c5a0bcf94403a29490d707ae1878fba3e0423d13 (patch) | |
| tree | 5b8bd9f65196b473c242618a4bd4d4983bddfffb /accessibility | |
| parent | d1e270557a62bfe81f63a72b6802a11eff9e047d (diff) | |
use comphelper::WeakComponentImplHelper in EditBrowseBoxTableCellAccess
Change-Id: I36a1dd4fa488517a1e69d3a1c4b03c850d1a933e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127404
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/extended/accessibleeditbrowseboxcell.hxx | 9 | ||||
| -rw-r--r-- | accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index 6d827ac13a05..ab45db70af77 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -20,7 +20,7 @@ #include <extended/accessiblebrowseboxcell.hxx> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <comphelper/accessiblewrapper.hxx> namespace accessibility @@ -89,8 +89,7 @@ namespace accessibility // XAccessible providing an EditBrowseBoxTableCell class EditBrowseBoxTableCellAccess final : - public cppu::BaseMutex, - public cppu::WeakComponentImplHelper<css::accessibility::XAccessible> + public comphelper::WeakComponentImplHelper<css::accessibility::XAccessible> { css::uno::WeakReference< css::accessibility::XAccessibleContext > m_aContext; @@ -120,8 +119,8 @@ namespace accessibility // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; - // XComponent/OComponentHelper - virtual void SAL_CALL disposing() override; + // XComponent/WeakComponentImplHelper + virtual void disposing() override; EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) = delete; EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) = delete; diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 06165071b621..f9985e48a268 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -183,8 +183,7 @@ namespace accessibility const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible, const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow, ::vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos ) - :WeakComponentImplHelper( m_aMutex ) - ,m_xParent( _rxParent ) + :m_xParent( _rxParent ) ,m_xControlAccessible( _rxControlAccessible ) ,m_xFocusWindow( _rxFocusWindow ) ,m_pBrowseBox( &_rBrowseBox ) @@ -213,7 +212,7 @@ namespace accessibility return xMyContext; } - void SAL_CALL EditBrowseBoxTableCellAccess::disposing() + void EditBrowseBoxTableCellAccess::disposing() { // dispose our context, if it still alive css::uno::Reference< XComponent > xMyContext( m_aContext.get(), UNO_QUERY ); |