diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 13:53:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 19:55:55 +0000 |
| commit | 4986d195c3100655ec2770e8f9d2e2c642d9b371 (patch) | |
| tree | 7cdc77ee70098616a2b6f5af482ac283924192cf /accessibility | |
| parent | 57f103f15895ecd6e1882652206add0c1ed6a3c9 (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleList
Change-Id: I2412ef089b5b299b131916d21afa5c5d4fd74c39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146190
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessiblelist.hxx | 19 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblelist.cxx | 6 |
2 files changed, 6 insertions, 19 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index 74f6d5755d17..bab8b649fa07 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -22,14 +22,9 @@ #include <memory> #include <vector> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -typedef ::cppu::ImplHelper2< - css::accessibility::XAccessible, - css::accessibility::XAccessibleSelection - > VCLXAccessibleList_BASE; - typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > > ListItems; @@ -45,8 +40,10 @@ namespace accessibility classes for selection. */ class VCLXAccessibleList final - : public VCLXAccessibleComponent, - public VCLXAccessibleList_BASE + : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessible, + css::accessibility::XAccessibleSelection> { public: enum BoxType {COMBOBOX, LISTBOX}; @@ -76,12 +73,6 @@ public: */ void UpdateSelection (std::u16string_view sTextOfSelectedItem); - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() - // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() override; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 66cb69f97ebf..c38240e3b4e7 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -54,7 +54,7 @@ namespace VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType, const Reference< XAccessible >& _xParent) - : VCLXAccessibleComponent (pVCLWindow), + : ImplInheritanceHelper (pVCLWindow), m_aBoxType (aBoxType), m_nVisibleLineCount (0), m_nIndexInParent (DEFAULT_INDEX_IN_PARENT), @@ -505,10 +505,6 @@ void VCLXAccessibleList::HandleChangedItemList() Any(), Any()); } - -IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE) - // XAccessible Reference<XAccessibleContext> SAL_CALL |