accessibility/inc/extended/AccessibleGridControlBase.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c83ec45d7d36d8371ec3fab843fdace6b23ac153
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 19 14:58:40 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 19 18:40:14 2023 +0000
Base AccessibleGridControlBase on WeakComponentImplHelper
...rather than on the deprecated WeakAggComponentImplHelper4.
It was found that e.g. GridControlAccessibleElement, deriving from
AccessibleGridControlBase, was implementing queryInterface in a way that is
incompatible with the XAggregation protocol inherited via
WeakAggComponentImplHelper4. It looks like no code actually made use of the
XAggregation offered by this class hierarchy, so the easiest fix for that
queryInterface implementation appears to switch from
WeakAggComponentImplHelper4 to WeakComponentImplHelper (thereby dropping
XAggregation, and thus rendering the existing queryInterface implementation
OK).
Change-Id: Ia7f033d0a93e78a48573cb489dc5542603c35b8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145793
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx
b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index ca706c977fcd..75bfa96ce87e 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -24,7 +24,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ref.hxx>
#include <tools/gen.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -41,7 +41,7 @@ namespace vcl { class Window; }
namespace accessibility {
-typedef ::cppu::WeakAggComponentImplHelper4<
+typedef ::cppu::WeakComponentImplHelper<
css::accessibility::XAccessibleContext,
css::accessibility::XAccessibleComponent,
css::accessibility::XAccessibleEventBroadcaster,
