diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /sw/source/core/unocore/unoftn.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sw/source/core/unocore/unoftn.cxx')
-rw-r--r-- | sw/source/core/unocore/unoftn.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index ea3e1c4bdfa3..a1f8090260d2 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -180,14 +180,14 @@ const uno::Sequence< sal_Int8 > & SwXFootnote::getUnoTunnelId() sal_Int64 SAL_CALL SwXFootnote::getSomething(const uno::Sequence< sal_Int8 >& rId) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { const sal_Int64 nRet( ::sw::UnoTunnelImpl<SwXFootnote>(rId, this) ); return (nRet) ? nRet : SwXText::getSomething(rId); } OUString SAL_CALL -SwXFootnote::getImplementationName() throw (uno::RuntimeException) +SwXFootnote::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("SwXFootnote"); } @@ -205,13 +205,13 @@ static const size_t g_nServicesEndnote( sizeof (g_ServicesFootnote) / sizeof (g_ static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit! sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString& rServiceName) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException) +SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; return ::sw::GetSupportedServiceNamesImpl( @@ -220,7 +220,7 @@ SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException) } uno::Sequence< uno::Type > SAL_CALL -SwXFootnote::getTypes() throw (uno::RuntimeException) +SwXFootnote::getTypes() throw (uno::RuntimeException, std::exception) { const uno::Sequence< uno::Type > aTypes = SwXFootnote_Base::getTypes(); const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes(); @@ -233,14 +233,14 @@ namespace } uno::Sequence< sal_Int8 > SAL_CALL -SwXFootnote::getImplementationId() throw (uno::RuntimeException) +SwXFootnote::getImplementationId() throw (uno::RuntimeException, std::exception) { return theSwXFootnoteImplementationId::get().getSeq(); } uno::Any SAL_CALL SwXFootnote::queryInterface(const uno::Type& rType) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { const uno::Any ret = SwXFootnote_Base::queryInterface(rType); return (ret.getValueType() == ::getCppuVoidType()) @@ -248,7 +248,7 @@ throw (uno::RuntimeException) : ret; } -OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) +OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -270,7 +270,7 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) } void SAL_CALL -SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException) +SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -296,7 +296,7 @@ SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException) void SAL_CALL SwXFootnote::attach(const uno::Reference< text::XTextRange > & xTextRange) -throw (lang::IllegalArgumentException, uno::RuntimeException) +throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -364,7 +364,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) } uno::Reference< text::XTextRange > SAL_CALL -SwXFootnote::getAnchor() throw (uno::RuntimeException) +SwXFootnote::getAnchor() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -380,7 +380,7 @@ SwXFootnote::getAnchor() throw (uno::RuntimeException) return xRet; } -void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException) +void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -397,7 +397,7 @@ void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException) void SAL_CALL SwXFootnote::addEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.addInterface(xListener); @@ -406,7 +406,7 @@ throw (uno::RuntimeException) void SAL_CALL SwXFootnote::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { // no need to lock here as m_pImpl is const and container threadsafe m_pImpl->m_EventListeners.removeInterface(xListener); @@ -433,7 +433,7 @@ SwXFootnote::CreateCursor() throw (uno::RuntimeException) } uno::Reference< text::XTextCursor > SAL_CALL -SwXFootnote::createTextCursor() throw (uno::RuntimeException) +SwXFootnote::createTextCursor() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -453,7 +453,7 @@ SwXFootnote::createTextCursor() throw (uno::RuntimeException) uno::Reference< text::XTextCursor > SAL_CALL SwXFootnote::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -482,7 +482,7 @@ throw (uno::RuntimeException) } uno::Reference< container::XEnumeration > SAL_CALL -SwXFootnote::createEnumeration() throw (uno::RuntimeException) +SwXFootnote::createEnumeration() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -498,19 +498,19 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException) return xRet; } -uno::Type SAL_CALL SwXFootnote::getElementType() throw (uno::RuntimeException) +uno::Type SAL_CALL SwXFootnote::getElementType() throw (uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SwXFootnote::hasElements() throw (uno::RuntimeException) +sal_Bool SAL_CALL SwXFootnote::hasElements() throw (uno::RuntimeException, std::exception) { return sal_True; } uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXFootnote::getPropertySetInfo() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRet = @@ -523,7 +523,7 @@ void SAL_CALL SwXFootnote::setPropertyValue(const OUString&, const uno::Any&) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { //no values to be set throw lang::IllegalArgumentException(); @@ -532,7 +532,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, uno::Any SAL_CALL SwXFootnote::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -573,7 +573,7 @@ SwXFootnote::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::addPropertyChangeListener(): not implemented"); } @@ -583,7 +583,7 @@ SwXFootnote::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::removePropertyChangeListener(): not implemented"); } @@ -593,7 +593,7 @@ SwXFootnote::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::addVetoableChangeListener(): not implemented"); } @@ -603,7 +603,7 @@ SwXFootnote::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL("SwXFootnote::removeVetoableChangeListener(): not implemented"); } |