summaryrefslogtreecommitdiff
path: root/sccomp
diff options
context:
space:
mode:
Diffstat (limited to 'sccomp')
-rw-r--r--sccomp/qa/unit/lpsolver.cxx4
-rw-r--r--sccomp/source/solver/CoinMPSolver.cxx6
-rw-r--r--sccomp/source/solver/LpsolveSolver.cxx6
-rw-r--r--sccomp/source/solver/SolverComponent.hxx46
4 files changed, 31 insertions, 31 deletions
diff --git a/sccomp/qa/unit/lpsolver.cxx b/sccomp/qa/unit/lpsolver.cxx
index 75c091bd782d..b6a14b431f3a 100644
--- a/sccomp/qa/unit/lpsolver.cxx
+++ b/sccomp/qa/unit/lpsolver.cxx
@@ -30,8 +30,8 @@ class LpSolverTest: public test::BootstrapFixture
void testSolver(const uno::Reference<sheet::XSolver>& xSolver);
public:
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
CPPUNIT_TEST_SUITE(LpSolverTest);
CPPUNIT_TEST(test);
diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx
index 5edf90366128..41c71bc4a0c1 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -40,14 +40,14 @@ public:
virtual ~CoinMPSolver() {}
private:
- virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw(css::uno::RuntimeException, std::exception) override
{
return OUString("com.sun.star.comp.Calc.CoinMPSolver");
}
virtual OUString SAL_CALL getComponentDescription()
- throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (uno::RuntimeException, std::exception) override
{
return SolverComponent::GetResourceString( RID_COINMP_SOLVER_COMPONENT );
}
diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx
index b06cfeb7b0dd..5323be22b8cd 100644
--- a/sccomp/source/solver/LpsolveSolver.cxx
+++ b/sccomp/source/solver/LpsolveSolver.cxx
@@ -71,14 +71,14 @@ public:
virtual ~LpsolveSolver() {}
private:
- virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw(css::uno::RuntimeException, std::exception) override
{
return OUString("com.sun.star.comp.Calc.LpsolveSolver");
}
virtual OUString SAL_CALL getComponentDescription()
- throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (uno::RuntimeException, std::exception) override
{
return SolverComponent::GetResourceString( RID_SOLVER_COMPONENT );
}
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index c311752d7138..316426e2a5be 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -105,52 +105,52 @@ public:
DECLARE_XTYPEPROVIDER()
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // from OPropertySetHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; // from OPropertyArrayUsageHelper
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // from OPropertySetHelper
+ virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // from OPropertyArrayUsageHelper
// XSolver
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > SAL_CALL getDocument()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocument( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XSpreadsheetDocument >& _document )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::table::CellAddress SAL_CALL getObjective() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::com::sun::star::table::CellAddress SAL_CALL getObjective() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setObjective( const ::com::sun::star::table::CellAddress& _objective )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellAddress > SAL_CALL getVariables()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setVariables( const ::com::sun::star::uno::Sequence<
::com::sun::star::table::CellAddress >& _variables )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SolverConstraint > SAL_CALL getConstraints()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setConstraints( const ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::SolverConstraint >& _constraints )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL getMaximize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setMaximize( sal_Bool _maximize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL getMaximize() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setMaximize( sal_Bool _maximize ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getSuccess() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual double SAL_CALL getResultValue() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL getSuccess() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getResultValue() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getSolution()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL solve() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
+ virtual void SAL_CALL solve() throw(::com::sun::star::uno::RuntimeException, std::exception) override = 0;
// XSolverDescription
- 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 getComponentDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0;
+ virtual OUString SAL_CALL getStatusDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override = 0;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
};
#endif