diff options
Diffstat (limited to 'svtools/source/graphic/graphicunofactory.cxx')
-rw-r--r-- | svtools/source/graphic/graphicunofactory.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index fa2c98043c70..5a2132bf6bab 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -40,34 +40,31 @@ class GObjectImpl : public GObjectAccess_BASE std::unique_ptr< GraphicObject > mpGObject; public: /// @throws uno::RuntimeException - explicit GObjectImpl(uno::Sequence< uno::Any > const & args) throw (uno::RuntimeException, std::exception); + explicit GObjectImpl(uno::Sequence< uno::Any > const & args); // XGraphicObject - virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException, std::exception) override; - OUString SAL_CALL getUniqueID() throw (uno::RuntimeException, std::exception) override; + virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() override; + virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) override; + OUString SAL_CALL getUniqueID() override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.graphic.GraphicObject"); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { uno::Sequence<OUString> aRet { "com.sun.star.graphic.GraphicObject" }; return aRet; } }; -GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::RuntimeException, std::exception) +GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) { if ( args.getLength() == 1 ) { @@ -81,7 +78,7 @@ GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::Runt mpGObject.reset( new GraphicObject() ); } -uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (uno::RuntimeException, std::exception) +uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !mpGObject.get() ) @@ -89,7 +86,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (un return mpGObject->GetGraphic().GetXGraphic(); } -void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException, std::exception) +void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !mpGObject.get() ) @@ -98,7 +95,7 @@ void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic > mpGObject->SetGraphic( aGraphic ); } -OUString SAL_CALL GObjectImpl::getUniqueID() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL GObjectImpl::getUniqueID() { ::osl::MutexGuard aGuard( m_aMutex ); OUString sId; |