svx/source/accessibility/charmapacc.cxx | 3 --
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 3 --
svx/source/inc/charmapacc.hxx | 19 ++------------
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 9 ++----
4 files changed, 8 insertions(+), 26 deletions(-)
New commits:
commit c6dcbf93577632fdd6ecc1d94ab1642143c6bbca
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 16:01:51 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:44:16 2023 +0000
Use ImplInheritanceHelper in SvxPixelCtlAccessible
Change-Id: I9509bfcbcc015876cba1c17e84e4de5e28de3cf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146282
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index d31af4062d49..23847464b58c 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -49,9 +49,6 @@ SvxPixelCtlAccessible::~SvxPixelCtlAccessible()
ensureDisposed();
}
-IMPLEMENT_FORWARD_XINTERFACE2( SvxPixelCtlAccessible,
OAccessibleSelectionHelper, OAccessibleHelper_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxPixelCtlAccessible,
OAccessibleSelectionHelper, OAccessibleHelper_Base )
-
uno::Reference< XAccessibleContext >
SvxPixelCtlAccessible::getAccessibleContext( )
{
return this;
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index fb14ac4720e7..25c2cfa77a35 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/accessibleselectionhelper.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
@@ -97,15 +98,13 @@ private:
tools::Long mnIndexInParent;
};
-class SvxPixelCtlAccessible final : public
::comphelper::OAccessibleSelectionHelper,
- public OAccessibleHelper_Base
+class SvxPixelCtlAccessible final : public cppu::ImplInheritanceHelper<
+
::comphelper::OAccessibleSelectionHelper,
+ css::accessibility::XAccessible>
{
public:
SvxPixelCtlAccessible(SvxPixelCtl* pPixelCtl);
- DECLARE_XINTERFACE( )
- DECLARE_XTYPEPROVIDER( )
-
//XAccessibleComponent
virtual void SAL_CALL grabFocus( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
commit 64716d41e2e6c74dea1762bb59ea5485c265557b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:51:18 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:44:09 2023 +0000
OAccessibleHelper_Base_2 is unused
...ever since 374599f8c26713905a310673d2b429083321186a "weld SvxCharacterMap
dialog"
Change-Id: I955a399756c2802295168e07dfdfe30f1515a64c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146281
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 2183e1d7a52a..c909756c22d1 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <tools/gen.hxx>
#include <rtl/ref.hxx>
@@ -33,9 +32,6 @@ class SvxShowCharSet;
namespace svx
{
- typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible
- > OAccessibleHelper_Base_2;
-
class SvxShowCharSetAcc;
class SvxShowCharSetItemAcc;
commit c2f14c9a0aa07c36446ea308b9192248e4c6213d
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:48:15 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:44:01 2023 +0000
Use ImplInheritanceHelper in SvxShowCharSetItemAcc
Change-Id: I0baaac510afcbae5a8a9fa5886daa8b4f83145e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146280
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/accessibility/charmapacc.cxx
b/svx/source/accessibility/charmapacc.cxx
index 89e0b62199dc..d6c8b4b49216 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -379,9 +379,6 @@ SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc()
ensureDisposed();
}
-IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetItemAcc,
OAccessibleComponentHelper, OAccessibleHelper_Base_3 )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetItemAcc,
OAccessibleComponentHelper, OAccessibleHelper_Base_3 )
-
void SvxShowCharSetItemAcc::ParentDestroyed()
{
const ::osl::MutexGuard aGuard( GetMutex() );
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 339192ced108..2183e1d7a52a 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <tools/gen.hxx>
#include <rtl/ref.hxx>
@@ -149,14 +148,12 @@ namespace svx
// - SvxShowCharSetItemAcc -
- typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible,
- css::accessibility::XAccessibleAction
- > OAccessibleHelper_Base_3;
-
/** The child implementation of the table.
*/
- class SvxShowCharSetItemAcc final : public
::comphelper::OAccessibleComponentHelper,
- public OAccessibleHelper_Base_3
+ class SvxShowCharSetItemAcc final : public cppu::ImplInheritanceHelper<
+
::comphelper::OAccessibleComponentHelper,
+ css::accessibility::XAccessible,
+
css::accessibility::XAccessibleAction>
{
private:
SvxShowCharSetItem* mpParent;
@@ -168,10 +165,6 @@ namespace svx
virtual css::awt::Rectangle implGetBounds( ) override;
public:
- // XInterface
- DECLARE_XINTERFACE( )
- DECLARE_XTYPEPROVIDER( )
-
SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent );
void ParentDestroyed();
