From 527f5da2f051e32372d9d4d5e808bdf022d18840 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 4 Apr 2014 14:10:42 +0200 Subject: sccomp: Fix description of com.sun.star.comp.Calc.CoinMPSolver. Forgotten in 077bdc73f2bcd625be1030fa8ff630c3dbd83657 Change-Id: Iddf90f1107f05351754830b49344cb24db1e1089 --- sccomp/source/solver/CoinMPSolver.cxx | 5 +++++ sccomp/source/solver/LpsolveSolver.cxx | 5 +++++ sccomp/source/solver/SolverComponent.cxx | 5 ----- sccomp/source/solver/SolverComponent.hxx | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'sccomp') diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx index a7127e38724b..f1ee10b40b80 100644 --- a/sccomp/source/solver/CoinMPSolver.cxx +++ b/sccomp/source/solver/CoinMPSolver.cxx @@ -44,6 +44,11 @@ private: { return OUString("com.sun.star.comp.Calc.CoinMPSolver"); } + virtual OUString SAL_CALL getComponentDescription() + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + { + return SolverComponent::GetResourceString( RID_COINMP_SOLVER_COMPONENT ); + } }; void SAL_CALL CoinMPSolver::solve() throw(uno::RuntimeException, std::exception) diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx index a977f91ac000..817152f4e02f 100644 --- a/sccomp/source/solver/LpsolveSolver.cxx +++ b/sccomp/source/solver/LpsolveSolver.cxx @@ -77,6 +77,11 @@ private: { return OUString("com.sun.star.comp.Calc.LpsolveSolver"); } + virtual OUString SAL_CALL getComponentDescription() + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + { + return SolverComponent::GetResourceString( RID_SOLVER_COMPONENT ); + } }; void SAL_CALL LpsolveSolver::solve() throw(uno::RuntimeException, std::exception) diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx index bb20cfe20c52..d84fbd4351b3 100644 --- a/sccomp/source/solver/SolverComponent.cxx +++ b/sccomp/source/solver/SolverComponent.cxx @@ -139,11 +139,6 @@ uno::Reference SAL_CALL SolverComponent::getPropertySet // XSolverDescription -OUString SAL_CALL SolverComponent::getComponentDescription() throw (uno::RuntimeException, std::exception) -{ - return SolverComponent::GetResourceString( RID_SOLVER_COMPONENT ); -} - OUString SAL_CALL SolverComponent::getStatusDescription() throw (uno::RuntimeException, std::exception) { return maStatus; diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx index 1d2ceede0407..b0f9a24c39a8 100644 --- a/sccomp/source/solver/SolverComponent.hxx +++ b/sccomp/source/solver/SolverComponent.hxx @@ -139,7 +139,7 @@ public: virtual void SAL_CALL solve() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // XSolverDescription - virtual OUString SAL_CALL getComponentDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getComponentDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual OUString SAL_CALL getStatusDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -- cgit