sc/source/ui/inc/AccessibleContextBase.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bf1bf0bcd57fdc53bbc0ea97cc83275545398916
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 20 14:54:08 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 20 19:00:24 2023 +0000
Base ScAccessibleContextBase on WeakComponentImplHelper
...rather than on the deprecated WeakAggComponentImplHelper5.
Various classes like ScAccessibleCellBase, ScAccessiblePreviewHeaderCell,
and
ScAccessiblePreviewTable, all deriving from ScAccessibleContextBase, had
been
found to implement their respective queryInterface in a way that is
incompatible
with the XAggregation protocol inherited via WeakAggComponentImplHelper5.
It
looks like no code actually made use of the XAggregation offered by this
class
hierarchy, so the easiest fix for those queryInterface implementations
appears
to switch from WeakAggComponentImplHelper5 to WeakComponentImplHelper
(thereby
dropping XAggregation, and thus rendering the existing queryInterface
implementations OK).
Change-Id: Icfd07f0606b7a56d75c32681408384dd3ff51238
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145901
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx
b/sc/source/ui/inc/AccessibleContextBase.hxx
index 8fa51ea52382..0df386d6edd5 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -29,7 +29,7 @@
#include <svl/lstner.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
namespace tools { class Rectangle; }
@@ -39,7 +39,7 @@ namespace tools { class Rectangle; }
<code>AccessibleContext</code> service.
*/
-typedef cppu::WeakAggComponentImplHelper5<
+typedef cppu::WeakComponentImplHelper<
css::accessibility::XAccessible,
css::accessibility::XAccessibleComponent,
css::accessibility::XAccessibleContext,
