diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 12:18:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 19:02:37 +0000 |
| commit | 1bc2be265c528cebc0f3bf33b217edc46af56ff0 (patch) | |
| tree | 888f66b0c37ce3583af73fc850aaf9d65a2f697d /accessibility | |
| parent | e547fb841d242ed3bd33623c4a1dc4cdb0e239a8 (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleBox
Change-Id: I8763463a2fd85a528870d140051dd9fb49aea608
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146186
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessiblebox.hxx | 22 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblebox.cxx | 5 |
2 files changed, 7 insertions, 20 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 9abebf6f3b19..6c86491a5422 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -24,14 +24,7 @@ #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <cppuhelper/implbase3.hxx> - - -typedef ::cppu::ImplHelper3< - css::accessibility::XAccessible, - css::accessibility::XAccessibleValue, - css::accessibility::XAccessibleAction - > VCLXAccessibleBox_BASE; +#include <cppuhelper/implbase.hxx> /** Base class for list- and combo boxes. This class manages the box' @@ -39,8 +32,11 @@ typedef ::cppu::ImplHelper3< IsValid method and return the correct implementation name. */ class VCLXAccessibleBox - : public VCLXAccessibleComponent, - public VCLXAccessibleBox_BASE + : public cppu::ImplInheritanceHelper< + VCLXAccessibleComponent, + css::accessibility::XAccessible, + css::accessibility::XAccessibleValue, + css::accessibility::XAccessibleAction> { public: enum BoxType {COMBOBOX, LISTBOX}; @@ -51,12 +47,6 @@ public: */ VCLXAccessibleBox (VCLXWindow* pVCLXindow, BoxType aType, bool bIsDropDownBox); - // XTypeProvider - DECLARE_XTYPEPROVIDER() - - // XInterface - DECLARE_XINTERFACE() - // XAccessible diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 9df75a914751..9f7d4e505ba8 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; VCLXAccessibleBox::VCLXAccessibleBox (VCLXWindow* pVCLWindow, BoxType aType, bool bIsDropDownBox) - : VCLXAccessibleComponent (pVCLWindow), + : ImplInheritanceHelper (pVCLWindow), m_aBoxType (aType), m_bIsDropDownBox (bIsDropDownBox) { @@ -246,9 +246,6 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven } } -IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleBox, VCLXAccessibleComponent, VCLXAccessibleBox_BASE) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleBox, VCLXAccessibleComponent, VCLXAccessibleBox_BASE) - //===== XAccessible ========================================================= Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext( ) |