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 <sbergman@redhat.com>
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user