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 /framework/inc/xml/menudocumenthandler.hxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'framework/inc/xml/menudocumenthandler.hxx')
-rw-r--r-- | framework/inc/xml/menudocumenthandler.hxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index c5ed3f41174d..30cbc9305fb5 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -45,39 +45,39 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // S // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ) = 0; + ::com::sun::star::uno::RuntimeException, std::exception ) = 0; virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ) = 0; + ::com::sun::star::uno::RuntimeException, std::exception ) = 0; virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ) = 0; + ::com::sun::star::uno::RuntimeException, std::exception ) = 0; virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ) = 0; + ::com::sun::star::uno::RuntimeException, std::exception ) = 0; virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ) = 0; + ::com::sun::star::uno::RuntimeException, std::exception ) = 0; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); protected: OUString getErrorLineString(); @@ -108,25 +108,25 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); private: int m_nElementDepth; @@ -147,25 +147,25 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); private: int m_nElementDepth; @@ -185,25 +185,25 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endElement(const OUString& aName) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL characters(const OUString& aChars) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); private: int m_nElementDepth; @@ -223,26 +223,26 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase // XDocumentHandler virtual void SAL_CALL startDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL endElement(const OUString& aName) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL characters(const OUString& aChars) throw ( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); private: enum NextElementClose { ELEM_CLOSE_NONE, ELEM_CLOSE_MENUITEM, ELEM_CLOSE_MENUSEPARATOR }; |