From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- sccomp/source/solver/solver.cxx | 42 ++++++++++++++++++++--------------------- sccomp/source/solver/solver.hxx | 42 ++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 42 deletions(-) (limited to 'sccomp') diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 0dae2e9926e9..9bcf6e514761 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -200,24 +200,24 @@ cppu::IPropertyArrayHelper& SAL_CALL SolverComponent::getInfoHelper() return *getArrayHelper(); } -uno::Reference SAL_CALL SolverComponent::getPropertySetInfo() throw(uno::RuntimeException) +uno::Reference SAL_CALL SolverComponent::getPropertySetInfo() throw(uno::RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ); } // XSolverDescription -OUString SAL_CALL SolverComponent::getComponentDescription() throw (uno::RuntimeException) +OUString SAL_CALL SolverComponent::getComponentDescription() throw (uno::RuntimeException, std::exception) { return lcl_GetResourceString( RID_SOLVER_COMPONENT ); } -OUString SAL_CALL SolverComponent::getStatusDescription() throw (uno::RuntimeException) +OUString SAL_CALL SolverComponent::getStatusDescription() throw (uno::RuntimeException, std::exception) { return maStatus; } -OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName ) throw (uno::RuntimeException) +OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName ) throw (uno::RuntimeException, std::exception) { sal_uInt32 nResId = 0; sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); @@ -251,77 +251,77 @@ OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rProp // XSolver: settings -uno::Reference SAL_CALL SolverComponent::getDocument() throw(uno::RuntimeException) +uno::Reference SAL_CALL SolverComponent::getDocument() throw(uno::RuntimeException, std::exception) { return mxDoc; } void SAL_CALL SolverComponent::setDocument( const uno::Reference& _document ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { mxDoc = _document; } -table::CellAddress SAL_CALL SolverComponent::getObjective() throw(uno::RuntimeException) +table::CellAddress SAL_CALL SolverComponent::getObjective() throw(uno::RuntimeException, std::exception) { return maObjective; } -void SAL_CALL SolverComponent::setObjective( const table::CellAddress& _objective ) throw(uno::RuntimeException) +void SAL_CALL SolverComponent::setObjective( const table::CellAddress& _objective ) throw(uno::RuntimeException, std::exception) { maObjective = _objective; } -uno::Sequence SAL_CALL SolverComponent::getVariables() throw(uno::RuntimeException) +uno::Sequence SAL_CALL SolverComponent::getVariables() throw(uno::RuntimeException, std::exception) { return maVariables; } void SAL_CALL SolverComponent::setVariables( const uno::Sequence& _variables ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maVariables = _variables; } -uno::Sequence SAL_CALL SolverComponent::getConstraints() throw(uno::RuntimeException) +uno::Sequence SAL_CALL SolverComponent::getConstraints() throw(uno::RuntimeException, std::exception) { return maConstraints; } void SAL_CALL SolverComponent::setConstraints( const uno::Sequence& _constraints ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maConstraints = _constraints; } -sal_Bool SAL_CALL SolverComponent::getMaximize() throw(uno::RuntimeException) +sal_Bool SAL_CALL SolverComponent::getMaximize() throw(uno::RuntimeException, std::exception) { return mbMaximize; } -void SAL_CALL SolverComponent::setMaximize( sal_Bool _maximize ) throw(uno::RuntimeException) +void SAL_CALL SolverComponent::setMaximize( sal_Bool _maximize ) throw(uno::RuntimeException, std::exception) { mbMaximize = _maximize; } // XSolver: get results -sal_Bool SAL_CALL SolverComponent::getSuccess() throw(uno::RuntimeException) +sal_Bool SAL_CALL SolverComponent::getSuccess() throw(uno::RuntimeException, std::exception) { return mbSuccess; } -double SAL_CALL SolverComponent::getResultValue() throw(uno::RuntimeException) +double SAL_CALL SolverComponent::getResultValue() throw(uno::RuntimeException, std::exception) { return mfResultValue; } -uno::Sequence SAL_CALL SolverComponent::getSolution() throw(uno::RuntimeException) +uno::Sequence SAL_CALL SolverComponent::getSolution() throw(uno::RuntimeException, std::exception) { return maSolution; } -void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException) +void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException, std::exception) { uno::Reference xModel( mxDoc, uno::UNO_QUERY ); if ( !xModel.is() ) @@ -581,17 +581,17 @@ OUString SolverComponent_getImplementationName() return OUString("com.sun.star.comp.Calc.Solver" ); } -OUString SAL_CALL SolverComponent::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL SolverComponent::getImplementationName() throw(uno::RuntimeException, std::exception) { return SolverComponent_getImplementationName(); } -sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -uno::Sequence SAL_CALL SolverComponent::getSupportedServiceNames() throw(uno::RuntimeException) +uno::Sequence SAL_CALL SolverComponent::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { return SolverComponent_getSupportedServiceNames(); } diff --git a/sccomp/source/solver/solver.hxx b/sccomp/source/solver/solver.hxx index 60b2952ffd88..e67e1529dd08 100644 --- a/sccomp/source/solver/solver.hxx +++ b/sccomp/source/solver/solver.hxx @@ -67,52 +67,52 @@ public: DECLARE_XTYPEPROVIDER() virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // from OPropertySetHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // from OPropertyArrayUsageHelper // XSolver virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > SAL_CALL getDocument() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _document ) - throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::table::CellAddress SAL_CALL getObjective() throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::table::CellAddress SAL_CALL getObjective() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setObjective( const ::com::sun::star::table::CellAddress& _objective ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellAddress > SAL_CALL getVariables() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setVariables( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellAddress >& _variables ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SolverConstraint > SAL_CALL getConstraints() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setConstraints( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SolverConstraint >& _constraints ) - throw(::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getMaximize() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMaximize( ::sal_Bool _maximize ) throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getMaximize() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMaximize( ::sal_Bool _maximize ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getSuccess() throw(::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getResultValue() throw(::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getSuccess() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getResultValue() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getSolution() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL solve() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL solve() throw(::com::sun::star::uno::RuntimeException, std::exception); // XSolverDescription - virtual OUString SAL_CALL getComponentDescription() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getStatusDescription() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getComponentDescription() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStatusDescription() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; #endif -- cgit