sc/source/ui/unoobj/celllistsource.cxx | 2 +- sc/source/ui/unoobj/celllistsource.hxx | 12 ++++++------ sc/source/ui/unoobj/cellvaluebinding.cxx | 2 +- sc/source/ui/unoobj/cellvaluebinding.hxx | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit 46f64f6df4a7e545114c4ec92598f6634d38b04b Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Jan 20 14:48:46 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Jan 20 17:18:13 2023 +0000 Base OCellListSource on WeakComponentImplHelper ...rather than on the deprecated WeakAggComponentImplHelper4. It was found that that class 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, so the easiest fix for this queryInterface implementation appears to switch from WeakAggComponentImplHelper4 to WeakComponentImplHelper (thereby dropping XAggregation, and thus rendering the existing queryInterface implementation OK). Change-Id: I91d7feb28da3fd65ce1e213b59feb4f8dd6fc6b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145899 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 9c9d595465d9..81942e44fc09 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -93,7 +93,7 @@ namespace calc EventObject aDisposeEvent( *this ); m_aListEntryListeners.disposeAndClear( aDisposeEvent ); - WeakAggComponentImplHelperBase::disposing(); + WeakComponentImplHelperBase::disposing(); // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.) } diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 7a5f72c02bd7..c919c18ec27e 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -20,7 +20,7 @@ #pragma once #include <com/sun/star/form/binding/XListEntryTypedSource.hpp> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer3.hxx> #include <comphelper/propertycontainer.hxx> @@ -41,11 +41,11 @@ namespace calc class OCellListSource; // the base for our interfaces - typedef ::cppu::WeakAggComponentImplHelper4 < css::form::binding::XListEntryTypedSource - , css::util::XModifyListener - , css::lang::XServiceInfo - , css::lang::XInitialization - > OCellListSource_Base; + typedef ::cppu::WeakComponentImplHelper < css::form::binding::XListEntryTypedSource + , css::util::XModifyListener + , css::lang::XServiceInfo + , css::lang::XInitialization + > OCellListSource_Base; // the base for the property handling typedef ::comphelper::OPropertyContainer OCellListSource_PBase; // the second base for property handling commit aaa30075e1a5e362ee8610e11ad1739947c06ebd Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Jan 20 14:51:48 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Jan 20 17:18:03 2023 +0000 Base OCellValueBinding on WeakComponentImplHelper ...rather than on the deprecated WeakAggComponentImplHelper5. It was found that that class was implementing 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, so the easiest fix for this queryInterface implementation appears to switch from WeakAggComponentImplHelper5 to WeakComponentImplHelper (thereby dropping XAggregation, and thus rendering the existing queryInterface implementation OK). Change-Id: I43661bd66927f2f605eb1c63e2370838cd03597c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145900 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 29c15ceb12de..6a5b764546b6 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -95,7 +95,7 @@ namespace calc xBroadcaster->removeModifyListener( this ); } - WeakAggComponentImplHelperBase::disposing(); + WeakComponentImplHelperBase::disposing(); // TODO: clean up here whatever you need to clean up (e.g. deregister as XEventListener // for the cell) diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 048e7d504760..511303f7edcd 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/form/binding/XValueBinding.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer3.hxx> #include <comphelper/propertycontainer.hxx> @@ -41,12 +41,12 @@ namespace calc class OCellValueBinding; // the base for our interfaces - typedef ::cppu::WeakAggComponentImplHelper5 < css::form::binding::XValueBinding - , css::lang::XServiceInfo - , css::util::XModifyBroadcaster - , css::util::XModifyListener - , css::lang::XInitialization - > OCellValueBinding_Base; + typedef ::cppu::WeakComponentImplHelper < css::form::binding::XValueBinding + , css::lang::XServiceInfo + , css::util::XModifyBroadcaster + , css::util::XModifyListener + , css::lang::XInitialization + > OCellValueBinding_Base; // the base for the property handling typedef ::comphelper::OPropertyContainer OCellValueBinding_PBase; // the second base for property handling
