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 /comphelper/source/xml | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'comphelper/source/xml')
-rw-r--r-- | comphelper/source/xml/attributelist.cxx | 12 | ||||
-rw-r--r-- | comphelper/source/xml/ofopxmlhelper.cxx | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index 33157cf92df0..29d8d9681c71 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -54,17 +54,17 @@ struct AttributeList_Impl ::std::vector<struct TagAttribute_Impl> vecAttribute; }; -sal_Int16 SAL_CALL AttributeList::getLength(void) throw( ::com::sun::star::uno::RuntimeException ) +sal_Int16 SAL_CALL AttributeList::getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return (sal_Int16)(m_pImpl->vecAttribute.size()); } -OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size()) ) ? m_pImpl->vecAttribute[i].sName : OUString(); } -OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { if( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) { return m_pImpl->vecAttribute[i].sType; @@ -72,12 +72,12 @@ OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun:: return OUString(); } -OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) ? m_pImpl->vecAttribute[i].sValue : OUString(); } -OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); @@ -89,7 +89,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( : return OUString(); } -OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 85e625cb85c2..4c0146bee04a 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -233,19 +233,19 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper::GetParsingRes void SAL_CALL OFOPXMLHelper::startDocument() - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::endDocument() - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT ) { @@ -393,7 +393,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Ref void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT ) { @@ -410,25 +410,25 @@ void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName ) void SAL_CALL OFOPXMLHelper::characters( const OUString& /*aChars*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } |