diff options
Diffstat (limited to 'dbaccess/source/core/recovery/subcomponentrecovery.cxx')
-rw-r--r-- | dbaccess/source/core/recovery/subcomponentrecovery.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index c755d8458a75..c40dcd3582e5 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -267,14 +267,14 @@ namespace dbaccess public: // XDocumentHandler - virtual void SAL_CALL startDocument( ) throw (SAXException, RuntimeException); - virtual void SAL_CALL endDocument( ) throw (SAXException, RuntimeException); - virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException); - virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException); - virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException); - virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException); + virtual void SAL_CALL startDocument( ) throw (SAXException, RuntimeException, std::exception); + virtual void SAL_CALL endDocument( ) throw (SAXException, RuntimeException, std::exception); + virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException, std::exception); + virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException, std::exception); + virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException, std::exception); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException, std::exception); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException, std::exception); + virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException, std::exception); const ::comphelper::NamedValueCollection& getSettings() const { return m_aSettings; } @@ -283,15 +283,15 @@ namespace dbaccess ::comphelper::NamedValueCollection m_aSettings; }; - void SAL_CALL SettingsDocumentHandler::startDocument( ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::startDocument( ) throw (SAXException, RuntimeException, std::exception) { } - void SAL_CALL SettingsDocumentHandler::endDocument( ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::endDocument( ) throw (SAXException, RuntimeException, std::exception) { } - void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException, std::exception) { ::rtl::Reference< SettingsImport > pNewState; @@ -322,7 +322,7 @@ namespace dbaccess m_aStates.push( pNewState ); } - void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException, std::exception) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); (void)i_Name; @@ -332,7 +332,7 @@ namespace dbaccess m_aStates.pop(); } - void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException, std::exception) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); @@ -340,20 +340,20 @@ namespace dbaccess pCurrentState->characters( i_Chars ); } - void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException, std::exception) { // ignore them - that's why they're called "ignorable" (void)aWhitespaces; } - void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException, std::exception) { OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." ); (void)i_Target; (void)i_Data; } - void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException, std::exception) { (void)i_Locator; } |