diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-27 11:33:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-29 07:42:32 +0100 |
| commit | 973d1d888738ca574f2b288f1d5a25814713c760 (patch) | |
| tree | 099d127275c3497b01b6576f50081c6f0c281b52 /sccomp | |
| parent | 8e048c3c572dc02f1161744278d875c9f842574e (diff) | |
convert SwarmSolver to comphelper::WeakImplHelper
Change-Id: I20a97cd2355648d02c1bb9a4d999c5a6ed4470a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165492
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/source/solver/SwarmSolver.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx index 01814e6f44ea..6c847d1e561f 100644 --- a/sccomp/source/solver/SwarmSolver.cxx +++ b/sccomp/source/solver/SwarmSolver.cxx @@ -25,8 +25,8 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/broadcasthelper.hxx> -#include <comphelper/propertycontainer.hxx> +#include <comphelper/compbase.hxx> +#include <comphelper/propertycontainer2.hxx> #include <comphelper/proparrhlp.hxx> #include <cmath> @@ -96,13 +96,12 @@ enum } // end anonymous namespace -typedef cppu::WeakImplHelper<sheet::XSolver, sheet::XSolverDescription, lang::XServiceInfo> +typedef comphelper::WeakImplHelper<sheet::XSolver, sheet::XSolverDescription, lang::XServiceInfo> SwarmSolver_Base; namespace { -class SwarmSolver : public comphelper::OMutexAndBroadcastHelper, - public comphelper::OPropertyContainer, +class SwarmSolver : public comphelper::OPropertyContainer2, public comphelper::OPropertyArrayUsageHelper<SwarmSolver>, public SwarmSolver_Base { @@ -138,8 +137,7 @@ private: public: SwarmSolver() - : OPropertyContainer(GetBroadcastHelper()) - , mbMaximize(true) + : mbMaximize(true) , mbNonNegative(false) , mbInteger(false) , mnTimeout(60000) @@ -165,10 +163,7 @@ public: return createPropertySetInfo(getInfoHelper()); } // OPropertySetHelper - virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override - { - return *getArrayHelper(); - } + virtual cppu::IPropertyArrayHelper& getInfoHelper() override { return *getArrayHelper(); } // OPropertyArrayUsageHelper virtual cppu::IPropertyArrayHelper* createArrayHelper() const override { @@ -309,8 +304,8 @@ double SwarmSolver::getValue(const table::CellAddress& rPosition) return getCell(rPosition)->getValue(); } -IMPLEMENT_FORWARD_XINTERFACE2(SwarmSolver, SwarmSolver_Base, OPropertyContainer) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(SwarmSolver, SwarmSolver_Base, OPropertyContainer) +IMPLEMENT_FORWARD_XINTERFACE2(SwarmSolver, SwarmSolver_Base, comphelper::OPropertyContainer2) +IMPLEMENT_FORWARD_XTYPEPROVIDER2(SwarmSolver, SwarmSolver_Base, comphelper::OPropertyContainer2) void SwarmSolver::applyVariables(std::vector<double> const& rVariables) { |