summaryrefslogtreecommitdiff
path: root/xmlscript/source/xmlmod_imexp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /xmlscript/source/xmlmod_imexp
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'xmlscript/source/xmlmod_imexp')
-rw-r--r--xmlscript/source/xmlmod_imexp/imp_share.hxx28
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_import.cxx28
2 files changed, 28 insertions, 28 deletions
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index 5529cd494f14..1ed5ff7ba564 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -64,19 +64,19 @@ public:
// XRoot
virtual void SAL_CALL startDocument(
Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual void SAL_CALL endDocument()
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual void SAL_CALL processingInstruction(
OUString const & rTarget, OUString const & rData )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual void SAL_CALL setDocumentLocator(
Reference< xml::sax::XLocator > const & xLocator )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual Reference< xml::input::XElement > SAL_CALL startRootElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
};
class ModuleElement
@@ -101,27 +101,27 @@ public:
// XElement
virtual Reference< xml::input::XElement > SAL_CALL getParent()
- throw (RuntimeException);
+ throw (RuntimeException, std::exception);
virtual OUString SAL_CALL getLocalName()
- throw (RuntimeException);
+ throw (RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL getUid()
- throw (RuntimeException);
+ throw (RuntimeException, std::exception);
virtual Reference< xml::input::XAttributes > SAL_CALL getAttributes()
- throw (RuntimeException);
+ throw (RuntimeException, std::exception);
virtual void SAL_CALL ignorableWhitespace(
OUString const & rWhitespaces )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual void SAL_CALL characters( OUString const & rChars )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual void SAL_CALL processingInstruction(
OUString const & rTarget, OUString const & rData )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual void SAL_CALL endElement()
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
virtual Reference< xml::input::XElement > SAL_CALL startChildElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
- throw (xml::sax::SAXException, RuntimeException);
+ throw (xml::sax::SAXException, RuntimeException, std::exception);
};
}
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index c65a567b51ea..da798bace906 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -24,47 +24,47 @@ namespace xmlscript
{
Reference< xml::input::XElement > ModuleElement::getParent()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return static_cast< xml::input::XElement * >( _pParent );
}
OUString ModuleElement::getLocalName()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return _aLocalName;
}
sal_Int32 ModuleElement::getUid()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return _pImport->XMLNS_SCRIPT_UID;
}
Reference< xml::input::XAttributes > ModuleElement::getAttributes()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return _xAttributes;
}
void ModuleElement::ignorableWhitespace(
OUString const & /*rWhitespaces*/ )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
// not used
}
void ModuleElement::characters( OUString const & rChars )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
_StrBuffer.append( rChars );
}
void ModuleElement::processingInstruction(
OUString const & /*rTarget*/, OUString const & /*rData*/ )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
}
void ModuleElement::endElement()
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
_pImport->mrModuleDesc.aCode = _StrBuffer.makeStringAndClear();
}
@@ -72,7 +72,7 @@ void ModuleElement::endElement()
Reference< xml::input::XElement > ModuleElement::startChildElement(
sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
Reference< xml::input::XAttributes > const & /*xAttributes*/ )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
}
@@ -115,7 +115,7 @@ ModuleElement::~ModuleElement()
void ModuleImport::startDocument(
Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( XMLNS_SCRIPT_URI );
XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( XMLNS_LIBRARY_URI );
@@ -123,27 +123,27 @@ void ModuleImport::startDocument(
}
void ModuleImport::endDocument()
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
// ignored
}
void ModuleImport::processingInstruction(
OUString const & /*rTarget*/, OUString const & /*rData*/ )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
}
void ModuleImport::setDocumentLocator(
Reference< xml::sax::XLocator > const & /*xLocator*/ )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
}
Reference< xml::input::XElement > ModuleImport::startRootElement(
sal_Int32 nUid, OUString const & rLocalName,
Reference< xml::input::XAttributes > const & xAttributes )
- throw (xml::sax::SAXException, RuntimeException)
+ throw (xml::sax::SAXException, RuntimeException, std::exception)
{
if (XMLNS_SCRIPT_UID != nUid)
{