cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

15 files changed, 370 insertions, 370 deletions

diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index 549056ed0cea..c83f65d09777 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -47,22 +47,22 @@ public:
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(
         Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException);
+        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL readSomeBytes(
         Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException);
+        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception);
     virtual void SAL_CALL skipBytes(
         sal_Int32 nBytesToSkip )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException);
+        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL available()
-        throw (io::NotConnectedException, io::IOException, RuntimeException);
+        throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception);
     virtual void SAL_CALL closeInput()
-        throw (io::NotConnectedException, io::IOException, RuntimeException);
+        throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception);
 };
 
 sal_Int32 BSeqInputStream::readBytes(
     Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException)
+    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
 {
     nBytesToRead = ((nBytesToRead > _seq.getLength() - _nPos)
                     ? _seq.getLength() - _nPos
@@ -76,25 +76,25 @@ sal_Int32 BSeqInputStream::readBytes(
 
 sal_Int32 BSeqInputStream::readSomeBytes(
     Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException)
+    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
 {
     return readBytes( rData, nMaxBytesToRead );
 }
 
 void BSeqInputStream::skipBytes(
     sal_Int32 /*nBytesToSkip*/ )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException)
+    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
 {
 }
 
 sal_Int32 BSeqInputStream::available()
-    throw (io::NotConnectedException, io::IOException, RuntimeException)
+    throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception)
 {
     return (_seq.getLength() - _nPos);
 }
 
 void BSeqInputStream::closeInput()
-    throw (io::NotConnectedException, io::IOException, RuntimeException)
+    throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception)
 {
 }
 
@@ -112,15 +112,15 @@ public:
     // XOutputStream
     virtual void SAL_CALL writeBytes(
         Sequence< sal_Int8 > const & rData )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException);
+        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception);
     virtual void SAL_CALL flush()
-        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException);
+        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception);
     virtual void SAL_CALL closeOutput()
-        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException);
+        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception);
 };
 
 void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException)
+    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
 {
     sal_Int32 nPos = _seq->getLength();
     _seq->realloc( nPos + rData.getLength() );
@@ -129,12 +129,12 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
                       rData.getLength() );
 }
 void BSeqOutputStream::flush()
-    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException)
+    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
 {
 }
 
 void BSeqOutputStream::closeOutput()
-    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException)
+    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
 {
 }
 
diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index 97b52995326f..08f0dc463793 100644
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
@@ -65,20 +65,20 @@ void XMLElement::dump( Reference< xml::sax::XDocumentHandler > const & xOut )
 
 // XAttributeList
 sal_Int16 XMLElement::getLength()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return static_cast<sal_Int16>(_attrNames.size());
 }
 
 OUString XMLElement::getNameByIndex( sal_Int16 nPos )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT( (size_t)nPos < _attrNames.size() );
     return _attrNames[ nPos ];
 }
 
 OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT( (size_t)nPos < _attrNames.size() );
     static_cast<void>(nPos);
@@ -87,21 +87,21 @@ OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
 }
 
 OUString XMLElement::getTypeByName( OUString const & /*rName*/ )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     // xxx todo
     return OUString();
 }
 
 OUString XMLElement::getValueByIndex( sal_Int16 nPos )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT( (size_t)nPos < _attrNames.size() );
     return _attrValues[ nPos ];
 }
 
 OUString XMLElement::getValueByName( OUString const & rName )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     for ( size_t nPos = 0; nPos < _attrNames.size(); ++nPos )
     {
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 6bcafae6cf39..60a117db3fc3 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -138,48 +138,48 @@ public:
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual sal_Bool SAL_CALL supportsService(
         OUString const & servicename )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 
     // XInitialization
     virtual void SAL_CALL initialize(
         Sequence< Any > const & arguments )
-        throw (Exception);
+        throw (Exception, std::exception);
 
     // XDocumentHandler
     virtual void SAL_CALL startDocument()
-        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 startElement(
         OUString const & rQElementName,
         Reference< xml::sax::XAttributeList > const & xAttribs )
-        throw (xml::sax::SAXException, RuntimeException);
+        throw (xml::sax::SAXException, RuntimeException, std::exception);
     virtual void SAL_CALL endElement(
         OUString const & rQElementName )
-        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 ignorableWhitespace(
         OUString const & rWhitespaces )
-        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);
 
     // XNamespaceMapping
     virtual sal_Int32 SAL_CALL getUidByUri( OUString const & Uri )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual OUString SAL_CALL getUriByUid( sal_Int32 Uid )
-        throw (container::NoSuchElementException, RuntimeException);
+        throw (container::NoSuchElementException, RuntimeException, std::exception);
 };
 
 DocumentHandlerImpl::DocumentHandlerImpl(
@@ -346,31 +346,31 @@ public:
 
     // XAttributes
     virtual sal_Int32 SAL_CALL getLength()
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL getIndexByQName(
         OUString const & rQName )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL getIndexByUidName(
         sal_Int32 nUid, OUString const & rLocalName )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual OUString SAL_CALL getQNameByIndex(
         sal_Int32 nIndex )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL getUidByIndex(
         sal_Int32 nIndex )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual OUString SAL_CALL getLocalNameByIndex(
         sal_Int32 nIndex )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual OUString SAL_CALL getValueByIndex(
         sal_Int32 nIndex )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual OUString SAL_CALL getValueByUidName(
         sal_Int32 nUid, OUString const & rLocalName )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual OUString SAL_CALL getTypeByIndex(
         sal_Int32 nIndex )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 };
 
 inline ExtendedAttributes::ExtendedAttributes(
@@ -409,19 +409,19 @@ ExtendedAttributes::~ExtendedAttributes() throw ()
 // XServiceInfo
 
 OUString DocumentHandlerImpl::getImplementationName()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return getImplementationName_DocumentHandlerImpl();
 }
 
 sal_Bool DocumentHandlerImpl::supportsService( OUString const & servicename )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, servicename);
 }
 
 Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return getSupportedServiceNames_DocumentHandlerImpl();
 }
@@ -430,7 +430,7 @@ Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
 
 void DocumentHandlerImpl::initialize(
     Sequence< Any > const & arguments )
-    throw (Exception)
+    throw (Exception, std::exception)
 {
     MGuard guard( m_pMutex );
     Reference< xml::input::XRoot > xRoot;
@@ -449,7 +449,7 @@ void DocumentHandlerImpl::initialize(
 // XNamespaceMapping
 
 sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     sal_Int32 uid = getUidByURI( Uri );
     SAL_WARN_IF( uid == UID_UNKNOWN, "xmlscript.xmlhelper", "uid UNKNOWN");
@@ -457,7 +457,7 @@ sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
 }
 
 OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
-    throw (container::NoSuchElementException, RuntimeException)
+    throw (container::NoSuchElementException, RuntimeException, std::exception)
 {
     MGuard guard( m_pMutex );
     t_OUString2LongMap::const_iterator iPos( m_URI2Uid.begin() );
@@ -473,13 +473,13 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
 // XDocumentHandler
 
 void DocumentHandlerImpl::startDocument()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     m_xRoot->startDocument( static_cast< xml::input::XNamespaceMapping * >( this ) );
 }
 
 void DocumentHandlerImpl::endDocument()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     m_xRoot->endDocument();
 }
@@ -487,7 +487,7 @@ void DocumentHandlerImpl::endDocument()
 void DocumentHandlerImpl::startElement(
     OUString const & rQElementName,
     Reference< xml::sax::XAttributeList > const & xAttribs )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement;
     Reference< xml::input::XAttributes > xAttributes;
@@ -622,7 +622,7 @@ void DocumentHandlerImpl::startElement(
 
 void DocumentHandlerImpl::endElement(
     OUString const & rQElementName )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement;
     {
@@ -664,7 +664,7 @@ void DocumentHandlerImpl::endElement(
 }
 
 void DocumentHandlerImpl::characters( OUString const & rChars )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
     if (xCurrentElement.is())
@@ -673,7 +673,7 @@ void DocumentHandlerImpl::characters( OUString const & rChars )
 
 void DocumentHandlerImpl::ignorableWhitespace(
     OUString const & rWhitespaces )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
     if (xCurrentElement.is())
@@ -682,7 +682,7 @@ void DocumentHandlerImpl::ignorableWhitespace(
 
 void DocumentHandlerImpl::processingInstruction(
     OUString const & rTarget, OUString const & rData )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
     if (xCurrentElement.is())
@@ -693,7 +693,7 @@ void DocumentHandlerImpl::processingInstruction(
 
 void DocumentHandlerImpl::setDocumentLocator(
     Reference< xml::sax::XLocator > const & xLocator )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     m_xRoot->setDocumentLocator( xLocator );
 }
@@ -701,7 +701,7 @@ void DocumentHandlerImpl::setDocumentLocator(
 // XAttributes
 
 sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     for ( sal_Int32 nPos = m_nAttributes; nPos--; )
     {
@@ -714,13 +714,13 @@ sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
 }
 
 sal_Int32 ExtendedAttributes::getLength()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return m_nAttributes;
 }
 
 OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pLocalNames[ nIndex ];
@@ -729,7 +729,7 @@ OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
 }
 
 OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pQNames[ nIndex ];
@@ -738,7 +738,7 @@ OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
 }
 
 OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     static_cast<void>(nIndex);
     SAL_WARN_IF( nIndex >= m_nAttributes , "xmlscript.xmlhelper", "nIndex is bigger then m_nAttributes");
@@ -746,7 +746,7 @@ OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
 }
 
 OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pValues[ nIndex ];
@@ -756,7 +756,7 @@ OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
 
 sal_Int32 ExtendedAttributes::getIndexByUidName(
     sal_Int32 nUid, OUString const & rLocalName )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     for ( sal_Int32 nPos = m_nAttributes; nPos--; )
     {
@@ -769,7 +769,7 @@ sal_Int32 ExtendedAttributes::getIndexByUidName(
 }
 
 sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pUids[ nIndex ];
@@ -779,7 +779,7 @@ sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
 
 OUString ExtendedAttributes::getValueByUidName(
     sal_Int32 nUid, OUString const & rLocalName )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     for ( sal_Int32 nPos = m_nAttributes; nPos--; )
     {
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index b417f63b8370..79768a0c40c9 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -181,20 +181,20 @@ public:
     virtual void SAL_CALL startDocument(
         css::uno::Reference< css::xml::input::XNamespaceMapping >
         const & xNamespaceMapping )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL processingInstruction(
         OUString const & rTarget, OUString const & rData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL setDocumentLocator(
         css::uno::Reference< css::xml::sax::XLocator > const & xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startRootElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 };
 
 class ElementBase
@@ -219,28 +219,28 @@ public:
 
     // XElement
     virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL getUid()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
     virtual css::uno::Reference< css::xml::input::XAttributes >
-    SAL_CALL getAttributes() throw (css::uno::RuntimeException);
+    SAL_CALL getAttributes() throw (css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL ignorableWhitespace(
         OUString const & rWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL characters( OUString const & rChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL processingInstruction(
         OUString const & Target, OUString const & Data )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 };
 
 class StylesElement
@@ -251,7 +251,7 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline StylesElement(
         OUString const & rLocalName,
@@ -288,9 +288,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     bool importTextColorStyle(
         css::uno::Reference< css::beans::XPropertySet > const & xProps );
@@ -334,7 +334,7 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline MenuPopupElement(
         OUString const & rLocalName,
@@ -505,9 +505,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline WindowElement(
         OUString const & rLocalName,
@@ -523,7 +523,7 @@ class EventElement
 {
 public:
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline EventElement(
         sal_Int32 nUid, OUString const & rLocalName,
@@ -542,7 +542,7 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     BulletinBoardElement(
         OUString const & rLocalName,
@@ -559,9 +559,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline ButtonElement(
         OUString const & rLocalName,
@@ -580,9 +580,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline CheckBoxElement(
         OUString const & rLocalName,
@@ -602,9 +602,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline ComboBoxElement(
         OUString const & rLocalName,
@@ -624,9 +624,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline MenuListElement(
         OUString const & rLocalName,
@@ -645,7 +645,7 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline RadioElement(
         OUString const & rLocalName,
@@ -665,9 +665,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline RadioGroupElement(
         OUString const & rLocalName,
@@ -688,9 +688,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline TitledBoxElement(
         OUString const & rLocalName,
@@ -709,9 +709,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline TextElement(
         OUString const & rLocalName,
@@ -729,9 +729,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline FixedHyperLinkElement(
         OUString const & rLocalName,
@@ -750,9 +750,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline TextFieldElement(
         OUString const & rLocalName,
@@ -771,9 +771,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline ImageControlElement(
         OUString const & rLocalName,
@@ -792,9 +792,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline FileControlElement(
         OUString const & rLocalName,
@@ -813,9 +813,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline TreeControlElement(
         OUString const & rLocalName,
@@ -834,9 +834,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline CurrencyFieldElement(
         OUString const & rLocalName,
@@ -855,9 +855,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline DateFieldElement(
         OUString const & rLocalName,
@@ -876,9 +876,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline NumericFieldElement(
         OUString const & rLocalName,
@@ -897,9 +897,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline TimeFieldElement(
         OUString const & rLocalName,
@@ -918,9 +918,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline PatternFieldElement(
         OUString const & rLocalName,
@@ -939,9 +939,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline FormattedFieldElement(
         OUString const & rLocalName,
@@ -960,9 +960,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline FixedLineElement(
         OUString const & rLocalName,
@@ -981,9 +981,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline ScrollBarElement(
         OUString const & rLocalName,
@@ -1002,9 +1002,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline SpinButtonElement(
         OUString const & rLocalName,
@@ -1023,9 +1023,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline MultiPage(
         OUString const & rLocalName,
@@ -1049,9 +1049,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline Frame(
         OUString const & rLocalName,
@@ -1072,9 +1072,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline Page(
         OUString const & rLocalName,
@@ -1097,9 +1097,9 @@ public:
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
     virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception);
 
     inline ProgressBarElement(
         OUString const & rLocalName,
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index 13ede1a23b7c..852ccc3f5c6e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -47,10 +47,10 @@ public:
 
     // XInputStreamProvider
     virtual Reference< io::XInputStream > SAL_CALL createInputStream()
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 };
 Reference< io::XInputStream > InputStreamProvider::createInputStream()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return ::xmlscript::createInputStream( _bytes );
 }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 5691a502ec20..a9f2337451b2 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -42,7 +42,7 @@ namespace xmlscript
 Reference< xml::input::XElement > Frame::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)
 {
     if ( !m_xContainer.is() )
         m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoFrameModel" ), UNO_QUERY );
@@ -72,7 +72,7 @@ Reference< xml::input::XElement > Frame::startChildElement(
 }
 
 void Frame::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
         if ( !m_xContainer.is() )
             m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoFrameModel" ), UNO_QUERY );
@@ -109,7 +109,7 @@ void Frame::endElement()
 Reference< xml::input::XElement > MultiPage::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -133,7 +133,7 @@ Reference< xml::input::XElement > MultiPage::startChildElement(
 }
 
 void MultiPage::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
         Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
         // _pImport is what we need to add to ( e.g. the dialog in this case )
@@ -163,7 +163,7 @@ void MultiPage::endElement()
 Reference< xml::input::XElement > Page::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -186,7 +186,7 @@ Reference< xml::input::XElement > Page::startChildElement(
 }
 
 void Page::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
         Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
 
@@ -216,7 +216,7 @@ void Page::endElement()
 Reference< xml::input::XElement > ProgressBarElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -232,7 +232,7 @@ Reference< xml::input::XElement > ProgressBarElement::startChildElement(
     }
 }
 void ProgressBarElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlProgressBarModel" );
 
@@ -260,7 +260,7 @@ void ProgressBarElement::endElement()
 Reference< xml::input::XElement > ScrollBarElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -273,7 +273,7 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement(
     }
 }
 void ScrollBarElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlScrollBarModel" , _xAttributes ) );
 
@@ -310,7 +310,7 @@ void ScrollBarElement::endElement()
 Reference< xml::input::XElement > SpinButtonElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -324,7 +324,7 @@ Reference< xml::input::XElement > SpinButtonElement::startChildElement(
 }
 
 void SpinButtonElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlSpinButtonModel", _xAttributes ) );
 
@@ -358,7 +358,7 @@ void SpinButtonElement::endElement()
 Reference< xml::input::XElement > FixedLineElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -371,7 +371,7 @@ Reference< xml::input::XElement > FixedLineElement::startChildElement(
     }
 }
 void FixedLineElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx(_pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedLineModel" );
 
@@ -398,7 +398,7 @@ void FixedLineElement::endElement()
 Reference< xml::input::XElement > PatternFieldElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -411,7 +411,7 @@ Reference< xml::input::XElement > PatternFieldElement::startChildElement(
     }
 }
 void PatternFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlPatternFieldModel" );
 
@@ -446,7 +446,7 @@ void PatternFieldElement::endElement()
 Reference< xml::input::XElement > FormattedFieldElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -460,7 +460,7 @@ Reference< xml::input::XElement > FormattedFieldElement::startChildElement(
 }
 
 void FormattedFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFormattedFieldModel" );
 
@@ -574,7 +574,7 @@ void FormattedFieldElement::endElement()
 Reference< xml::input::XElement > TimeFieldElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -587,7 +587,7 @@ Reference< xml::input::XElement > TimeFieldElement::startChildElement(
     }
 }
 void TimeFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlTimeFieldModel" );
 
@@ -628,7 +628,7 @@ void TimeFieldElement::endElement()
 Reference< xml::input::XElement > NumericFieldElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -641,7 +641,7 @@ Reference< xml::input::XElement > NumericFieldElement::startChildElement(
     }
 }
 void NumericFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlNumericFieldModel" );
 
@@ -682,7 +682,7 @@ void NumericFieldElement::endElement()
 Reference< xml::input::XElement > DateFieldElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -695,7 +695,7 @@ Reference< xml::input::XElement > DateFieldElement::startChildElement(
     }
 }
 void DateFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlDateFieldModel" );
 
@@ -737,7 +737,7 @@ void DateFieldElement::endElement()
 Reference< xml::input::XElement > CurrencyFieldElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -750,7 +750,7 @@ Reference< xml::input::XElement > CurrencyFieldElement::startChildElement(
     }
 }
 void CurrencyFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlCurrencyFieldModel" );
 
@@ -793,7 +793,7 @@ void CurrencyFieldElement::endElement()
 Reference< xml::input::XElement > FileControlElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -806,7 +806,7 @@ Reference< xml::input::XElement > FileControlElement::startChildElement(
     }
 }
 void FileControlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFileControlModel" );
 
@@ -837,7 +837,7 @@ void FileControlElement::endElement()
 Reference< xml::input::XElement > TreeControlElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -850,7 +850,7 @@ Reference< xml::input::XElement > TreeControlElement::startChildElement(
     }
 }
 void TreeControlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.tree.TreeControlModel" );
 
@@ -883,7 +883,7 @@ void TreeControlElement::endElement()
 Reference< xml::input::XElement > ImageControlElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -897,7 +897,7 @@ Reference< xml::input::XElement > ImageControlElement::startChildElement(
 }
 
 void ImageControlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlImageControlModel" );
 
@@ -926,7 +926,7 @@ void ImageControlElement::endElement()
 Reference< xml::input::XElement > TextElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -940,7 +940,7 @@ Reference< xml::input::XElement > TextElement::startChildElement(
 }
 
 void TextElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedTextModel" );
 
@@ -973,7 +973,7 @@ void TextElement::endElement()
 Reference< xml::input::XElement > FixedHyperLinkElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -986,7 +986,7 @@ Reference< xml::input::XElement > FixedHyperLinkElement::startChildElement(
     }
 }
 void FixedHyperLinkElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedHyperlinkModel" );
 
@@ -1022,7 +1022,7 @@ void FixedHyperLinkElement::endElement()
 Reference< xml::input::XElement > TextFieldElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1035,7 +1035,7 @@ Reference< xml::input::XElement > TextFieldElement::startChildElement(
     }
 }
 void TextFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlEditModel" );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1081,7 +1081,7 @@ void TextFieldElement::endElement()
 Reference< xml::input::XElement > TitledBoxElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1121,7 +1121,7 @@ Reference< xml::input::XElement > TitledBoxElement::startChildElement(
 }
 
 void TitledBoxElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     {
     ControlImportContext ctx(_pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlGroupBoxModel" );
@@ -1203,7 +1203,7 @@ void TitledBoxElement::endElement()
 Reference< xml::input::XElement > RadioElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1220,7 +1220,7 @@ Reference< xml::input::XElement > RadioElement::startChildElement(
 Reference< xml::input::XElement > RadioGroupElement::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)
 {
     if (_pImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1242,7 +1242,7 @@ Reference< xml::input::XElement > RadioGroupElement::startChildElement(
     }
 }
 void RadioGroupElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     for ( size_t nPos = 0; nPos < _radios.size(); ++nPos )
     {
@@ -1299,7 +1299,7 @@ void RadioGroupElement::endElement()
 Reference< xml::input::XElement > MenuPopupElement::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)
 {
     if (_pImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1352,7 +1352,7 @@ Sequence< sal_Int16 > MenuPopupElement::getSelectedItems()
 Reference< xml::input::XElement > MenuListElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1376,7 +1376,7 @@ Reference< xml::input::XElement > MenuListElement::startChildElement(
 }
 
 void MenuListElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlListBoxModel", _xAttributes  ) );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1420,7 +1420,7 @@ void MenuListElement::endElement()
 Reference< xml::input::XElement > ComboBoxElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1443,7 +1443,7 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement(
     }
 }
 void ComboBoxElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlComboBoxModel", _xAttributes ) );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1487,7 +1487,7 @@ void ComboBoxElement::endElement()
 Reference< xml::input::XElement > CheckBoxElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1500,7 +1500,7 @@ Reference< xml::input::XElement > CheckBoxElement::startChildElement(
     }
 }
 void CheckBoxElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlCheckBoxModel" );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1553,7 +1553,7 @@ void CheckBoxElement::endElement()
 Reference< xml::input::XElement > ButtonElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1567,7 +1567,7 @@ Reference< xml::input::XElement > ButtonElement::startChildElement(
 }
 
 void ButtonElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( _pImport, getControlId( _xAttributes ), "com.sun.star.awt.UnoControlButtonModel" );
 
@@ -1617,7 +1617,7 @@ void ButtonElement::endElement()
 Reference< xml::input::XElement > BulletinBoardElement::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)
 {
     if (_pImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1778,13 +1778,13 @@ BulletinBoardElement::BulletinBoardElement(
 Reference< xml::input::XElement > StyleElement::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 sub elements of style!", Reference< XInterface >(), Any() );
 }
 
 void StyleElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XAttributes > xStyle;
     OUString aStyleId( _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, "style-id" ) );
@@ -1802,7 +1802,7 @@ void StyleElement::endElement()
 Reference< xml::input::XElement > StylesElement::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)
 {
     if (_pImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1823,7 +1823,7 @@ Reference< xml::input::XElement > StylesElement::startChildElement(
 Reference< xml::input::XElement > WindowElement::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)
 {
     // event
     if (_pImport->isEventElement( nUid, rLocalName ))
@@ -1851,7 +1851,7 @@ Reference< xml::input::XElement > WindowElement::startChildElement(
 }
 
 void WindowElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xProps(
         _pImport->_xDialogModel, UNO_QUERY_THROW );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index a3dc9ec9a3ce..e4fbc16981f0 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -64,7 +64,7 @@ namespace xmlscript
 {
 
 void EventElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     static_cast< ControlElement * >( _pParent )->_events.push_back( this );
 }
@@ -1600,57 +1600,57 @@ void ImportContext::importDefaults(
 }
 
 Reference< xml::input::XElement > ElementBase::getParent()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return static_cast< xml::input::XElement * >( _pParent );
 }
 
 OUString ElementBase::getLocalName()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return _aLocalName;
 }
 
 sal_Int32 ElementBase::getUid()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return _nUid;
 }
 
 Reference< xml::input::XAttributes > ElementBase::getAttributes()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return _xAttributes;
 }
 
 void ElementBase::ignorableWhitespace(
     OUString const & /*rWhitespaces*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // not used
 }
 
 void ElementBase::characters( OUString const & /*rChars*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // not used, all characters ignored
 }
 
 void ElementBase::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void ElementBase::processingInstruction(
     OUString const & /*Target*/, OUString const & /*Data*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 Reference< xml::input::XElement > ElementBase::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() );
 }
@@ -1694,28 +1694,28 @@ ElementBase::~ElementBase()
 
 void DialogImport::startDocument(
     Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     XMLNS_DIALOGS_UID = xNamespaceMapping->getUidByUri( XMLNS_DIALOGS_URI );
     XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( XMLNS_SCRIPT_URI );
 }
 
 void DialogImport::endDocument()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // ignored
 }
 
 void DialogImport::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // ignored for now: xxx todo
 }
 
 void DialogImport::setDocumentLocator(
     Reference< xml::sax::XLocator > const & /*xLocator*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // ignored for now: xxx todo
 }
@@ -1723,7 +1723,7 @@ void DialogImport::setDocumentLocator(
 Reference< xml::input::XElement > DialogImport::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_DIALOGS_UID != nUid)
     {
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index d699513aac1a..ecce3c63c089 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -112,14 +112,14 @@ namespace xmlscript
     }
 
     // XServiceInfo
-    sal_Bool XMLBasicExporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException)
+    sal_Bool XMLBasicExporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
     {
         return cppu::supportsService(this, rServiceName);
     }
 
     // XInitialization
 
-    void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
+    void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -141,7 +141,7 @@ namespace xmlscript
     // XExporter
 
     void XMLBasicExporterBase::setSourceDocument( const Reference< XComponent >& rxDoc )
-        throw (IllegalArgumentException, RuntimeException)
+        throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -156,7 +156,7 @@ namespace xmlscript
     // XFilter
 
 sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /*aDescriptor*/ )
-        throw (RuntimeException)
+        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -391,7 +391,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
     }
 
     void XMLBasicExporterBase::cancel()
-        throw (RuntimeException)
+        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -411,12 +411,12 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
 
     // XServiceInfo
 
-    OUString XMLBasicExporter::getImplementationName(  ) throw (RuntimeException)
+    OUString XMLBasicExporter::getImplementationName(  ) throw (RuntimeException, std::exception)
     {
         return getImplementationName_XMLBasicExporter();
     }
 
-    Sequence< OUString > XMLBasicExporter::getSupportedServiceNames(  ) throw (RuntimeException)
+    Sequence< OUString > XMLBasicExporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
     {
         return getSupportedServiceNames_XMLBasicExporter();
     }
@@ -434,12 +434,12 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
 
     // XServiceInfo
 
-    OUString XMLOasisBasicExporter::getImplementationName(  ) throw (RuntimeException)
+    OUString XMLOasisBasicExporter::getImplementationName(  ) throw (RuntimeException, std::exception)
     {
         return getImplementationName_XMLOasisBasicExporter();
     }
 
-    Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames(  ) throw (RuntimeException)
+    Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
     {
         return getSupportedServiceNames_XMLOasisBasicExporter();
     }
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index aefe41975f40..0f386dc870af 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
@@ -55,21 +55,21 @@ namespace xmlscript
 
         // XServiceInfo
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         // XInitialization
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
 
         // XExporter
         virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDoc )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
         // XFilter
         virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL cancel()
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class XMLBasicExporter
@@ -83,9 +83,9 @@ namespace xmlscript
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class XMLOasisBasicExporter
@@ -99,9 +99,9 @@ namespace xmlscript
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
     };
 
 }   // namespace xmlscript
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 7c2e354b85b9..6c59c5d46b10 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -89,19 +89,19 @@ namespace xmlscript
     // XElement
 
     Reference< xml::input::XElement > BasicElementBase::getParent()
-        throw (RuntimeException)
+        throw (RuntimeException, std::exception)
     {
         return static_cast< xml::input::XElement* >( m_pParent );
     }
 
     OUString BasicElementBase::getLocalName()
-        throw (RuntimeException)
+        throw (RuntimeException, std::exception)
     {
         return m_aLocalName;
     }
 
     sal_Int32 BasicElementBase::getUid()
-        throw (RuntimeException)
+        throw (RuntimeException, std::exception)
     {
         sal_Int32 nId = -1;
         if ( m_pImport )
@@ -110,7 +110,7 @@ namespace xmlscript
     }
 
     Reference< xml::input::XAttributes > BasicElementBase::getAttributes()
-        throw (RuntimeException)
+        throw (RuntimeException, std::exception)
     {
         return m_xAttributes;
     }
@@ -118,29 +118,29 @@ namespace xmlscript
     Reference< xml::input::XElement > BasicElementBase::startChildElement(
         sal_Int32 /*nUid*/, const OUString& /*rLocalName*/,
         const Reference< xml::input::XAttributes >& /*xAttributes*/ )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
     }
 
 void BasicElementBase::characters( const OUString& /*rChars*/ )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         // not used, all characters ignored
     }
 
 void BasicElementBase::ignorableWhitespace( const OUString& /*rWhitespaces*/ )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
 void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
     void BasicElementBase::endElement()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
@@ -160,7 +160,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     Reference< xml::input::XElement > BasicLibrariesElement::startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const Reference< xml::input::XAttributes >& xAttributes )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         Reference< xml::input::XElement > xElement;
 
@@ -244,7 +244,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicLibrariesElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
@@ -276,7 +276,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     Reference< xml::input::XElement > BasicEmbeddedLibraryElement::startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const Reference< xml::input::XAttributes >& xAttributes )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         Reference< xml::input::XElement > xElement;
 
@@ -303,7 +303,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicEmbeddedLibraryElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         if ( m_xLibContainer.is() && m_xLibContainer->hasByName( m_aLibName ) && m_bReadOnly )
             m_xLibContainer->setLibraryReadOnly( m_aLibName, m_bReadOnly );
@@ -326,7 +326,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     Reference< xml::input::XElement > BasicModuleElement::startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const Reference< xml::input::XAttributes >& xAttributes )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         // TODO: <byte-code>
 
@@ -355,7 +355,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicModuleElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
@@ -374,13 +374,13 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     // XElement
 
     void BasicSourceCodeElement::characters( const OUString& rChars )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         m_aBuffer.append( rChars );
     }
 
     void BasicSourceCodeElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         try
         {
@@ -422,7 +422,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     // XRoot
 
     void BasicImport::startDocument( const Reference< xml::input::XNamespaceMapping >& xNamespaceMapping )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         if ( xNamespaceMapping.is() )
         {
@@ -437,23 +437,23 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicImport::endDocument()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
 void BasicImport::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
 void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*xLocator*/ )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
     Reference< xml::input::XElement > BasicImport::startRootElement( sal_Int32 nUid, const OUString& rLocalName,
             Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         Reference< xml::input::XElement > xElement;
 
@@ -570,14 +570,14 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     // XServiceInfo
-    sal_Bool XMLBasicImporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException)
+    sal_Bool XMLBasicImporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
     {
         return cppu::supportsService(this, rServiceName);
     }
 
     // XImporter
     void XMLBasicImporterBase::setTargetDocument( const Reference< XComponent >& rxDoc )
-        throw (IllegalArgumentException, RuntimeException)
+        throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -604,7 +604,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     // XDocumentHandler
 
     void XMLBasicImporterBase::startDocument()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -613,7 +613,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::endDocument()
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -623,7 +623,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     void XMLBasicImporterBase::startElement( const OUString& aName,
             const Reference< xml::sax::XAttributeList >& xAttribs )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -632,7 +632,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::endElement( const OUString& aName )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -641,7 +641,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::characters( const OUString& aChars )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -650,7 +650,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::ignorableWhitespace( const OUString& aWhitespaces )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -660,7 +660,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     void XMLBasicImporterBase::processingInstruction( const OUString& aTarget,
             const OUString& aData )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -669,7 +669,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::setDocumentLocator( const Reference< xml::sax::XLocator >& xLocator )
-        throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -690,12 +690,12 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     // XServiceInfo
 
-    OUString XMLBasicImporter::getImplementationName(  ) throw (RuntimeException)
+    OUString XMLBasicImporter::getImplementationName(  ) throw (RuntimeException, std::exception)
     {
         return getImplementationName_XMLBasicImporter();
     }
 
-    Sequence< OUString > XMLBasicImporter::getSupportedServiceNames(  ) throw (RuntimeException)
+    Sequence< OUString > XMLBasicImporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
     {
         return getSupportedServiceNames_XMLBasicImporter();
     }
@@ -713,12 +713,12 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     // XServiceInfo
 
-    OUString XMLOasisBasicImporter::getImplementationName(  ) throw (RuntimeException)
+    OUString XMLOasisBasicImporter::getImplementationName(  ) throw (RuntimeException, std::exception)
     {
         return getImplementationName_XMLOasisBasicImporter();
     }
 
-    Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames(  ) throw (RuntimeException)
+    Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
     {
         return getSupportedServiceNames_XMLOasisBasicImporter();
     }
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index 25be4b8516e0..0e10f6c86a28 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
@@ -61,27 +61,27 @@ namespace xmlscript
 
         // XElement
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL getParent()
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual OUString SAL_CALL getLocalName()
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual sal_Int32 SAL_CALL getUid()
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes > SAL_CALL getAttributes()
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL characters( const OUString& rChars )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL ignorableWhitespace(
             const OUString& rWhitespaces )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL processingInstruction(
             const OUString& rTarget, const OUString& rData )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endElement()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class BasicLibrariesElement
@@ -101,9 +101,9 @@ namespace xmlscript
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endElement()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class BasicEmbeddedLibraryElement
@@ -127,9 +127,9 @@ namespace xmlscript
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endElement()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class BasicModuleElement
@@ -151,9 +151,9 @@ namespace xmlscript
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endElement()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class BasicSourceCodeElement
@@ -174,9 +174,9 @@ namespace xmlscript
 
         // XElement
         virtual void SAL_CALL characters( const OUString& rChars )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endElement()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class BasicImport
@@ -204,19 +204,19 @@ namespace xmlscript
         // XRoot
         virtual void SAL_CALL startDocument(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XNamespaceMapping >& xNamespaceMapping )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endDocument()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL processingInstruction(
             const OUString& rTarget, const OUString& rData )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::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);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XElement > SAL_CALL startRootElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::input::XAttributes >& xAttributes )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class XMLBasicImporterBase
@@ -241,30 +241,30 @@ namespace xmlscript
 
         // XServiceInfo
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         // XImporter
         virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDoc )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
 
         // XDocumentHandler
         virtual void SAL_CALL startDocument()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endDocument()
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::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);
+            throw (::com::sun::star::xml::sax::SAXException, ::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);
+            throw (::com::sun::star::xml::sax::SAXException, ::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);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::xml::sax::SAXException, ::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);
+            throw (::com::sun::star::xml::sax::SAXException, ::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);
+            throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class XMLBasicImporter
@@ -278,9 +278,9 @@ namespace xmlscript
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
     };
 
     // class XMLOasisBasicImporter
@@ -294,9 +294,9 @@ namespace xmlscript
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
     };
 
 }   // namespace xmlscript
diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx
index 0a26825d87f4..fc41ae734c5d 100644
--- a/xmlscript/source/xmllib_imexp/imp_share.hxx
+++ b/xmlscript/source/xmllib_imexp/imp_share.hxx
@@ -131,19 +131,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 LibElementBase
@@ -167,27 +167,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);
 };
 
 class LibrariesElement : public LibElementBase
@@ -201,9 +201,9 @@ public:
     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);
     virtual void SAL_CALL endElement()
-        throw (xml::sax::SAXException, RuntimeException);
+        throw (xml::sax::SAXException, RuntimeException, std::exception);
 
     LibrariesElement(
         OUString const & rLocalName,
@@ -224,9 +224,9 @@ public:
     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);
     virtual void SAL_CALL endElement()
-        throw (xml::sax::SAXException, RuntimeException);
+        throw (xml::sax::SAXException, RuntimeException, std::exception);
 
     LibraryElement(
         OUString const & rLocalName,
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index e1873ff7ef85..9af39029da4c 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -24,55 +24,55 @@ namespace xmlscript
 {
 
 Reference< xml::input::XElement > LibElementBase::getParent()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return static_cast< xml::input::XElement * >( _pParent );
 }
 
 OUString LibElementBase::getLocalName()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return _aLocalName;
 }
 
 sal_Int32 LibElementBase::getUid()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return _pImport->XMLNS_LIBRARY_UID;
 }
 
 Reference< xml::input::XAttributes > LibElementBase::getAttributes()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return _xAttributes;
 }
 
 void LibElementBase::ignorableWhitespace(
     OUString const & /*rWhitespaces*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibElementBase::characters( OUString const & /*rChars*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // not used, all characters ignored
 }
 
 void LibElementBase::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibElementBase::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 Reference< xml::input::XElement > LibElementBase::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,33 +115,33 @@ LibElementBase::~LibElementBase()
 
 void LibraryImport::startDocument(
     Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( XMLNS_LIBRARY_URI );
     XMLNS_XLINK_UID = xNamespaceMapping->getUidByUri( XMLNS_XLINK_URI );
 }
 
 void LibraryImport::endDocument()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibraryImport::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibraryImport::setDocumentLocator(
     Reference< xml::sax::XLocator > const & /*xLocator*/ )
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 Reference< xml::input::XElement > LibraryImport::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_LIBRARY_UID != nUid)
     {
@@ -181,7 +181,7 @@ LibraryImport::~LibraryImport()
 Reference< xml::input::XElement > LibrariesElement::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)
 {
     if (_pImport->XMLNS_LIBRARY_UID != nUid)
     {
@@ -209,7 +209,7 @@ Reference< xml::input::XElement > LibrariesElement::startChildElement(
 }
 
 void LibrariesElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     sal_Int32 nLibCount = _pImport->mpLibArray->mnLibCount = (sal_Int32)mLibDescriptors.size();
     _pImport->mpLibArray->mpLibs = new LibDescriptor[ nLibCount ];
@@ -225,7 +225,7 @@ void LibrariesElement::endElement()
 Reference< xml::input::XElement > LibraryElement::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)
 {
     if (_pImport->XMLNS_LIBRARY_UID != nUid)
     {
@@ -247,7 +247,7 @@ Reference< xml::input::XElement > LibraryElement::startChildElement(
 }
 
 void LibraryElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException)
+    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     sal_Int32 nElementCount = mElements.size();
     Sequence< OUString > aElementNames( nElementCount );
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)
     {