summaryrefslogtreecommitdiff
path: root/sccomp/source/solver
diff options
context:
space:
mode:
Diffstat (limited to 'sccomp/source/solver')
-rw-r--r--sccomp/source/solver/CoinMPSolver.cxx10
-rw-r--r--sccomp/source/solver/LpsolveSolver.cxx10
-rw-r--r--sccomp/source/solver/SolverComponent.cxx33
-rw-r--r--sccomp/source/solver/SolverComponent.hxx55
4 files changed, 44 insertions, 64 deletions
diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx
index 189a6f9f64a0..d7f1751972c3 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -39,20 +39,18 @@ public:
CoinMPSolver() {}
private:
- virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL solve() override;
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.Calc.CoinMPSolver");
}
- virtual OUString SAL_CALL getComponentDescription()
- throw (uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getComponentDescription() override
{
return SolverComponent::GetResourceString( RID_COINMP_SOLVER_COMPONENT );
}
};
-void SAL_CALL CoinMPSolver::solve() throw(uno::RuntimeException, std::exception)
+void SAL_CALL CoinMPSolver::solve()
{
uno::Reference<frame::XModel> xModel( mxDoc, uno::UNO_QUERY );
if ( !xModel.is() )
diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx
index c605bc17e4a9..d517696c8577 100644
--- a/sccomp/source/solver/LpsolveSolver.cxx
+++ b/sccomp/source/solver/LpsolveSolver.cxx
@@ -70,20 +70,18 @@ public:
LpsolveSolver() {}
private:
- virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL solve() override;
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.Calc.LpsolveSolver");
}
- virtual OUString SAL_CALL getComponentDescription()
- throw (uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getComponentDescription() override
{
return SolverComponent::GetResourceString( RID_SOLVER_COMPONENT );
}
};
-void SAL_CALL LpsolveSolver::solve() throw(uno::RuntimeException, std::exception)
+void SAL_CALL LpsolveSolver::solve()
{
uno::Reference<frame::XModel> xModel( mxDoc, uno::UNO_QUERY );
if ( !xModel.is() )
diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx
index 4f4778cdfab0..bac5e8dc2b2c 100644
--- a/sccomp/source/solver/SolverComponent.cxx
+++ b/sccomp/source/solver/SolverComponent.cxx
@@ -132,19 +132,19 @@ cppu::IPropertyArrayHelper& SAL_CALL SolverComponent::getInfoHelper()
return *getArrayHelper();
}
-uno::Reference<beans::XPropertySetInfo> SAL_CALL SolverComponent::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
+uno::Reference<beans::XPropertySetInfo> SAL_CALL SolverComponent::getPropertySetInfo()
{
return createPropertySetInfo( getInfoHelper() );
}
// XSolverDescription
-OUString SAL_CALL SolverComponent::getStatusDescription() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SolverComponent::getStatusDescription()
{
return maStatus;
}
-OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName )
{
sal_uInt32 nResId = 0;
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
@@ -178,84 +178,81 @@ OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rProp
// XSolver: settings
-uno::Reference<sheet::XSpreadsheetDocument> SAL_CALL SolverComponent::getDocument() throw(uno::RuntimeException, std::exception)
+uno::Reference<sheet::XSpreadsheetDocument> SAL_CALL SolverComponent::getDocument()
{
return mxDoc;
}
void SAL_CALL SolverComponent::setDocument( const uno::Reference<sheet::XSpreadsheetDocument>& _document )
- throw(uno::RuntimeException, std::exception)
{
mxDoc = _document;
}
-table::CellAddress SAL_CALL SolverComponent::getObjective() throw(uno::RuntimeException, std::exception)
+table::CellAddress SAL_CALL SolverComponent::getObjective()
{
return maObjective;
}
-void SAL_CALL SolverComponent::setObjective( const table::CellAddress& _objective ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SolverComponent::setObjective( const table::CellAddress& _objective )
{
maObjective = _objective;
}
-uno::Sequence<table::CellAddress> SAL_CALL SolverComponent::getVariables() throw(uno::RuntimeException, std::exception)
+uno::Sequence<table::CellAddress> SAL_CALL SolverComponent::getVariables()
{
return maVariables;
}
void SAL_CALL SolverComponent::setVariables( const uno::Sequence<table::CellAddress>& _variables )
- throw(uno::RuntimeException, std::exception)
{
maVariables = _variables;
}
-uno::Sequence<sheet::SolverConstraint> SAL_CALL SolverComponent::getConstraints() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sheet::SolverConstraint> SAL_CALL SolverComponent::getConstraints()
{
return maConstraints;
}
void SAL_CALL SolverComponent::setConstraints( const uno::Sequence<sheet::SolverConstraint>& _constraints )
- throw(uno::RuntimeException, std::exception)
{
maConstraints = _constraints;
}
-sal_Bool SAL_CALL SolverComponent::getMaximize() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SolverComponent::getMaximize()
{
return mbMaximize;
}
-void SAL_CALL SolverComponent::setMaximize( sal_Bool _maximize ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SolverComponent::setMaximize( sal_Bool _maximize )
{
mbMaximize = _maximize;
}
// XSolver: get results
-sal_Bool SAL_CALL SolverComponent::getSuccess() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SolverComponent::getSuccess()
{
return mbSuccess;
}
-double SAL_CALL SolverComponent::getResultValue() throw(uno::RuntimeException, std::exception)
+double SAL_CALL SolverComponent::getResultValue()
{
return mfResultValue;
}
-uno::Sequence<double> SAL_CALL SolverComponent::getSolution() throw(uno::RuntimeException, std::exception)
+uno::Sequence<double> SAL_CALL SolverComponent::getSolution()
{
return maSolution;
}
// XServiceInfo
-sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName )
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<OUString> SAL_CALL SolverComponent::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL SolverComponent::getSupportedServiceNames()
{
uno::Sequence<OUString> aServiceNames { "com.sun.star.sheet.Solver" };
return aServiceNames;
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index dd0d21affd3b..227d48de5822 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -104,53 +104,40 @@ public:
DECLARE_XINTERFACE()
DECLARE_XTYPEPROVIDER()
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // from OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // from OPropertyArrayUsageHelper
// XSolver
- virtual css::uno::Reference< css::sheet::XSpreadsheetDocument > SAL_CALL getDocument()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sheet::XSpreadsheetDocument > SAL_CALL getDocument() override;
virtual void SAL_CALL setDocument( const css::uno::Reference<
- css::sheet::XSpreadsheetDocument >& _document )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual css::table::CellAddress SAL_CALL getObjective() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setObjective( const css::table::CellAddress& _objective )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::table::CellAddress > SAL_CALL getVariables()
- throw(css::uno::RuntimeException, std::exception) override;
+ css::sheet::XSpreadsheetDocument >& _document ) override;
+ virtual css::table::CellAddress SAL_CALL getObjective() override;
+ virtual void SAL_CALL setObjective( const css::table::CellAddress& _objective ) override;
+ virtual css::uno::Sequence< css::table::CellAddress > SAL_CALL getVariables() override;
virtual void SAL_CALL setVariables( const css::uno::Sequence<
- css::table::CellAddress >& _variables )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::sheet::SolverConstraint > SAL_CALL getConstraints()
- throw(css::uno::RuntimeException, std::exception) override;
+ css::table::CellAddress >& _variables ) override;
+ virtual css::uno::Sequence< css::sheet::SolverConstraint > SAL_CALL getConstraints() override;
virtual void SAL_CALL setConstraints( const css::uno::Sequence<
- css::sheet::SolverConstraint >& _constraints )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getMaximize() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMaximize( sal_Bool _maximize ) throw(css::uno::RuntimeException, std::exception) override;
+ css::sheet::SolverConstraint >& _constraints ) override;
+ virtual sal_Bool SAL_CALL getMaximize() override;
+ virtual void SAL_CALL setMaximize( sal_Bool _maximize ) override;
- virtual sal_Bool SAL_CALL getSuccess() throw(css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getResultValue() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< double > SAL_CALL getSolution()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL getSuccess() override;
+ virtual double SAL_CALL getResultValue() override;
+ virtual css::uno::Sequence< double > SAL_CALL getSolution() override;
- virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override = 0;
+ virtual void SAL_CALL solve() override = 0;
// XSolverDescription
- virtual OUString SAL_CALL getComponentDescription() throw (css::uno::RuntimeException, std::exception) override = 0;
- virtual OUString SAL_CALL getStatusDescription() throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getComponentDescription() override = 0;
+ virtual OUString SAL_CALL getStatusDescription() override;
+ virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) override = 0;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override = 0;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 20:51:31 +0000