diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-30 12:29:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-30 17:49:35 +0200 |
| commit | 129e395935bf7330a1fe84986dd78502af36e07e (patch) | |
| tree | 9f56e052b6a88eb425c578a44b2f69c3ec87b202 /accessibility | |
| parent | 3c58ea89f4bbf7ec9a0ea88a8b753209ff68af64 (diff) | |
make IAccessibleBrowseBox extend cppu::WeakImplHelper
i.e. push this up from the implementation class
AccessibleBrowseBoxAccess to the interface class.
Which means we don't need the getMyself helper method, and make the
memory management simpler.
Change-Id: Icecb83834bb3f5304908bbd3682b3d2ea06dbfe0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156285
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/extended/AccessibleBrowseBox.hxx | 10 | ||||
| -rw-r--r-- | accessibility/source/helper/acc_factory.cxx | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 6605ff02be8b..b7e912df6e92 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -21,7 +21,6 @@ #pragma once #include <extended/AccessibleBrowseBoxBase.hxx> -#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <vcl/accessibletableprovider.hxx> #include <mutex> @@ -192,9 +191,7 @@ private: The instance holds its XAccessibleContext with a hard reference, while the context holds this instance weak. */ -class AccessibleBrowseBoxAccess final : - public cppu::WeakImplHelper<css::accessibility::XAccessible>, - public ::vcl::IAccessibleBrowseBox +class AccessibleBrowseBoxAccess final : public ::vcl::IAccessibleBrowseBox { private: std::mutex m_aMutex; @@ -221,11 +218,6 @@ private: SAL_CALL getAccessibleContext() override; // IAccessibleBrowseBox - virtual css::uno::Reference< css::accessibility::XAccessible > - getMyself() override - { - return this; - } void dispose() override; virtual bool isAlive() const override { diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 364c8a3c8211..fb0468fe6d65 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -122,7 +122,7 @@ public: SvHeaderTabListBox& rBox ) const override; - virtual vcl::IAccessibleBrowseBox* + virtual rtl::Reference<vcl::IAccessibleBrowseBox> createAccessibleBrowseBox( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox @@ -374,7 +374,7 @@ vcl::IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox( return new AccessibleTabListBox( rxParent, rBox ); } -vcl::IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox( +rtl::Reference<vcl::IAccessibleBrowseBox> AccessibleFactory::createAccessibleBrowseBox( const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox ) const { return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox ); |