diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-30 12:19:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-30 17:49:26 +0200 |
| commit | 3c58ea89f4bbf7ec9a0ea88a8b753209ff68af64 (patch) | |
| tree | 49d5c62629519099b5ff07864f8fa0fe9fbb728e /accessibility | |
| parent | cf1cdc00e1e2d2684cfe57ac002a37c5f3d100c5 (diff) | |
make IAccessibleTableControl extend cppu::WeakImplHelper
i.e. push this up from the implementation class
AccessibleGridControlAccess to the interface class.
Which means we don't need the getMyself helper method, and make the
memory management simpler.
Change-Id: Iced5f259638531a74ce86876d1a295e105530474
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156284
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/extended/AccessibleGridControl.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/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 7df6b82c3453..a1f7815ce167 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -21,7 +21,6 @@ #include <extended/AccessibleGridControlBase.hxx> #include <extended/AccessibleGridControlTable.hxx> -#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/ref.hxx> #include <vcl/accessibletable.hxx> @@ -160,9 +159,7 @@ private: the context holds this instance weak.</p> */ -class AccessibleGridControlAccess final : - public ::cppu::WeakImplHelper< css::accessibility::XAccessible > - ,public ::vcl::table::IAccessibleTableControl +class AccessibleGridControlAccess final : public ::vcl::table::IAccessibleTableControl { private: css::uno::Reference< css::accessibility::XAccessible > m_xParent; @@ -186,11 +183,6 @@ private: SAL_CALL getAccessibleContext() override; // IAccessibleTable - virtual css::uno::Reference< css::accessibility::XAccessible > - getMyself() override - { - return this; - } void DisposeAccessImpl() override; virtual bool isAlive() const override { diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 10cc27f007c6..364c8a3c8211 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -128,7 +128,7 @@ public: vcl::IAccessibleTableProvider& _rBrowseBox ) const override; - virtual IAccessibleTableControl* + virtual rtl::Reference<IAccessibleTableControl> createAccessibleTableControl( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, IAccessibleTable& _rTable @@ -380,7 +380,7 @@ vcl::IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox( return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox ); } -IAccessibleTableControl* AccessibleFactory::createAccessibleTableControl( +rtl::Reference<IAccessibleTableControl> AccessibleFactory::createAccessibleTableControl( const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable ) const { return new AccessibleGridControlAccess( _rxParent, _rTable ); |