sccomp/source/solver/SolverComponent.cxx | 7 +++---- sccomp/source/solver/SolverComponent.hxx | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit 2b7e49aa5d39aefe20933ce1a6851dbe7675e5f1 Author: Noel Grandin <[email protected]> AuthorDate: Wed Mar 27 11:35:04 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Mar 29 07:42:41 2024 +0100 convert SolverComponent to comphelper::WeakImplHelper Change-Id: Ia5accd94c3a3b498aa31829832110ec07b780112 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165493 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx index e31a84073337..318a05703944 100644 --- a/sccomp/source/solver/SolverComponent.cxx +++ b/sccomp/source/solver/SolverComponent.cxx @@ -89,7 +89,6 @@ double SolverComponent::GetValue( const uno::Reference<sheet::XSpreadsheetDocume } SolverComponent::SolverComponent() : - OPropertyContainer( GetBroadcastHelper() ), mbMaximize( true ), mbNonNegative( false ), mbInteger( false ), @@ -111,8 +110,8 @@ SolverComponent::~SolverComponent() { } -IMPLEMENT_FORWARD_XINTERFACE2( SolverComponent, SolverComponent_Base, OPropertyContainer ) -IMPLEMENT_FORWARD_XTYPEPROVIDER2( SolverComponent, SolverComponent_Base, OPropertyContainer ) +IMPLEMENT_FORWARD_XINTERFACE2( SolverComponent, SolverComponent_Base, comphelper::OPropertyContainer2 ) +IMPLEMENT_FORWARD_XTYPEPROVIDER2( SolverComponent, SolverComponent_Base, comphelper::OPropertyContainer2 ) cppu::IPropertyArrayHelper* SolverComponent::createArrayHelper() const { @@ -121,7 +120,7 @@ cppu::IPropertyArrayHelper* SolverComponent::createArrayHelper() const return new cppu::OPropertyArrayHelper( aProps ); } -cppu::IPropertyArrayHelper& SAL_CALL SolverComponent::getInfoHelper() +cppu::IPropertyArrayHelper& SolverComponent::getInfoHelper() { return *getArrayHelper(); } diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx index 4e10c038a474..7b5ff1dd49f0 100644 --- a/sccomp/source/solver/SolverComponent.hxx +++ b/sccomp/source/solver/SolverComponent.hxx @@ -24,8 +24,8 @@ #include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> -#include <comphelper/broadcasthelper.hxx> -#include <comphelper/propertycontainer.hxx> +#include <comphelper/compbase.hxx> +#include <comphelper/propertycontainer2.hxx> #include <comphelper/proparrhlp.hxx> #include <unotools/resmgr.hxx> @@ -53,14 +53,13 @@ struct ScSolverCellEqual typedef std::unordered_map< css::table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap; -typedef cppu::WeakImplHelper< +typedef comphelper::WeakImplHelper< css::sheet::XSolver, css::sheet::XSolverDescription, css::lang::XServiceInfo > SolverComponent_Base; -class SolverComponent : public comphelper::OMutexAndBroadcastHelper, - public comphelper::OPropertyContainer, +class SolverComponent : public comphelper::OPropertyContainer2, public comphelper::OPropertyArrayUsageHelper< SolverComponent >, public SolverComponent_Base { @@ -102,7 +101,7 @@ public: DECLARE_XTYPEPROVIDER() virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // from OPropertySetHelper + virtual ::cppu::IPropertyArrayHelper& getInfoHelper() override; // from OPropertySetHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // from OPropertyArrayUsageHelper // XSolver
