accessibility/inc/standard/vclxaccessibletoolboxitem.hxx | 17 +++++-------
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 10 -------
2 files changed, 9 insertions(+), 18 deletions(-)
New commits:
commit 4499db6b901a0c4eaad652a3efb5ad2857523c02
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 26 17:45:51 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 27 11:48:19 2023 +0000
Use ImplInheritanceHelper in VCLXAccessibleToolBoxItem
Change-Id: I380d8ae6dd237c0d09209c71dfdcf7b1ad995fb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146241
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 39982db1b7e8..5bff8ef95374 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -24,20 +24,20 @@
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/accessibletexthelper.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/vclptr.hxx>
typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
-typedef ::cppu::ImplHelper4 < css::accessibility::XAccessible,
- css::accessibility::XAccessibleAction,
- css::accessibility::XAccessibleValue,
- css::lang::XServiceInfo >
VCLXAccessibleToolBoxItem_BASE;
-class VCLXAccessibleToolBoxItem final : public AccessibleTextHelper_BASE,
- public VCLXAccessibleToolBoxItem_BASE
+class VCLXAccessibleToolBoxItem final : public cppu::ImplInheritanceHelper<
+ AccessibleTextHelper_BASE,
+ css::accessibility::XAccessible,
+
css::accessibility::XAccessibleAction,
+
css::accessibility::XAccessibleValue,
+ css::lang::XServiceInfo>
{
private:
OUString m_sOldName;
@@ -86,8 +86,7 @@ public:
void ToggleEnableState();
// XInterface
- DECLARE_XINTERFACE( )
- DECLARE_XTYPEPROVIDER( )
+ css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType)
override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index ed88660333f5..808f2fe642d4 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -258,7 +258,6 @@ void VCLXAccessibleToolBoxItem::implGetSelection(
sal_Int32& nStartIndex, sal_In
// XInterface
-IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem,
AccessibleTextHelper_BASE )
Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType )
{
// #i33611# - toolbox buttons without text don't support XAccessibleText
@@ -266,16 +265,9 @@ Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface(
const Type& _rType )
&& ( !m_pToolBox || m_pToolBox->GetButtonType() ==
ButtonType::SYMBOLONLY ) )
return Any();
- css::uno::Any aReturn = AccessibleTextHelper_BASE::queryInterface( _rType
);
- if ( !aReturn.hasValue() )
- aReturn = VCLXAccessibleToolBoxItem_BASE::queryInterface( _rType );
- return aReturn;
+ return ImplInheritanceHelper::queryInterface( _rType );
}
-// XTypeProvider
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBoxItem,
AccessibleTextHelper_BASE, VCLXAccessibleToolBoxItem_BASE )
-
// XComponent
void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
