diff options
Diffstat (limited to 'xmlscript/source')
-rw-r--r-- | xmlscript/source/xml_helper/xml_byteseq.cxx | 32 | ||||
-rw-r--r-- | xmlscript/source/xml_helper/xml_element.cxx | 6 | ||||
-rw-r--r-- | xmlscript/source/xml_helper/xml_impctx.cxx | 92 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/imp_share.hxx | 220 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 58 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 15 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 15 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 27 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 41 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 108 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/imp_share.hxx | 54 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/xmllib_import.cxx | 18 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/imp_share.hxx | 42 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 14 |
15 files changed, 194 insertions, 552 deletions
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx index 9a6254c29b38..7948e1cf0d87 100644 --- a/xmlscript/source/xml_helper/xml_byteseq.cxx +++ b/xmlscript/source/xml_helper/xml_byteseq.cxx @@ -44,23 +44,17 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes( - Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override; + Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes( - Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override; + Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead ) override; virtual void SAL_CALL skipBytes( - sal_Int32 nBytesToSkip ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() - throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() - throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) override; + sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; }; sal_Int32 BSeqInputStream::readBytes( Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) { nBytesToRead = ((nBytesToRead > (sal_Int32)_seq.size() - _nPos) ? _seq.size() - _nPos @@ -77,25 +71,21 @@ sal_Int32 BSeqInputStream::readBytes( sal_Int32 BSeqInputStream::readSomeBytes( Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead ) - 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, std::exception) { } sal_Int32 BSeqInputStream::available() - throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) { return _seq.size() - _nPos; } void BSeqInputStream::closeInput() - throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) { } @@ -111,16 +101,12 @@ public: // XOutputStream virtual void SAL_CALL writeBytes( - Sequence< sal_Int8 > const & rData ) - throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override; - virtual void SAL_CALL flush() - throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput() - throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override; + Sequence< sal_Int8 > const & rData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; }; void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData ) - throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) { sal_Int32 nPos = _seq->size(); _seq->resize( nPos + rData.getLength() ); @@ -129,12 +115,10 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData ) rData.getLength() ); } void BSeqOutputStream::flush() - throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) { } void BSeqOutputStream::closeOutput() - 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 1347ac84d582..326ba5305124 100644 --- a/xmlscript/source/xml_helper/xml_element.cxx +++ b/xmlscript/source/xml_helper/xml_element.cxx @@ -63,20 +63,17 @@ void XMLElement::dump( Reference< xml::sax::XDocumentHandler > const & xOut ) // XAttributeList sal_Int16 XMLElement::getLength() - throw (RuntimeException, std::exception) { return static_cast<sal_Int16>(_attrNames.size()); } OUString XMLElement::getNameByIndex( sal_Int16 nPos ) - throw (RuntimeException, std::exception) { OSL_ASSERT( (size_t)nPos < _attrNames.size() ); return _attrNames[ nPos ]; } OUString XMLElement::getTypeByIndex( sal_Int16 nPos ) - throw (RuntimeException, std::exception) { OSL_ASSERT( (size_t)nPos < _attrNames.size() ); static_cast<void>(nPos); @@ -85,21 +82,18 @@ OUString XMLElement::getTypeByIndex( sal_Int16 nPos ) } OUString XMLElement::getTypeByName( OUString const & /*rName*/ ) - throw (RuntimeException, std::exception) { // xxx todo return OUString(); } OUString XMLElement::getValueByIndex( sal_Int16 nPos ) - throw (RuntimeException, std::exception) { OSL_ASSERT( (size_t)nPos < _attrNames.size() ); return _attrValues[ nPos ]; } OUString XMLElement::getValueByName( OUString const & rName ) - 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 859197517bd4..e6297e915c41 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -138,49 +138,35 @@ public: virtual ~DocumentHandlerImpl() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - OUString const & servicename ) - throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + OUString const & servicename ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XInitialization virtual void SAL_CALL initialize( - Sequence< Any > const & arguments ) - throw (Exception, std::exception) override; + Sequence< Any > const & arguments ) override; // XDocumentHandler - virtual void SAL_CALL startDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL startElement( OUString const & rQElementName, - Reference< xml::sax::XAttributeList > const & xAttribs ) - throw (xml::sax::SAXException, RuntimeException, std::exception) override; + Reference< xml::sax::XAttributeList > const & xAttribs ) override; virtual void SAL_CALL endElement( - OUString const & rQElementName ) - throw (xml::sax::SAXException, RuntimeException, std::exception) override; + OUString const & rQElementName ) override; virtual void SAL_CALL characters( - OUString const & rChars ) - throw (xml::sax::SAXException, RuntimeException, std::exception) override; + OUString const & rChars ) override; virtual void SAL_CALL ignorableWhitespace( - OUString const & rWhitespaces ) - throw (xml::sax::SAXException, RuntimeException, std::exception) override; + OUString const & rWhitespaces ) override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (xml::sax::SAXException, RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; virtual void SAL_CALL setDocumentLocator( - Reference< xml::sax::XLocator > const & xLocator ) - throw (xml::sax::SAXException, RuntimeException, std::exception) override; + Reference< xml::sax::XLocator > const & xLocator ) override; // XNamespaceMapping - virtual sal_Int32 SAL_CALL getUidByUri( OUString const & Uri ) - throw (RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUriByUid( sal_Int32 Uid ) - throw (container::NoSuchElementException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getUidByUri( OUString const & Uri ) override; + virtual OUString SAL_CALL getUriByUid( sal_Int32 Uid ) override; }; DocumentHandlerImpl::DocumentHandlerImpl( @@ -345,32 +331,23 @@ public: virtual ~ExtendedAttributes() throw () override; // XAttributes - virtual sal_Int32 SAL_CALL getLength() - throw (RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getLength() override; virtual sal_Int32 SAL_CALL getIndexByQName( - OUString const & rQName ) - throw (RuntimeException, std::exception) override; + OUString const & rQName ) override; virtual sal_Int32 SAL_CALL getIndexByUidName( - sal_Int32 nUid, OUString const & rLocalName ) - throw (RuntimeException, std::exception) override; + sal_Int32 nUid, OUString const & rLocalName ) override; virtual OUString SAL_CALL getQNameByIndex( - sal_Int32 nIndex ) - throw (RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual sal_Int32 SAL_CALL getUidByIndex( - sal_Int32 nIndex ) - throw (RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual OUString SAL_CALL getLocalNameByIndex( - sal_Int32 nIndex ) - throw (RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual OUString SAL_CALL getValueByIndex( - sal_Int32 nIndex ) - throw (RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; virtual OUString SAL_CALL getValueByUidName( - sal_Int32 nUid, OUString const & rLocalName ) - throw (RuntimeException, std::exception) override; + sal_Int32 nUid, OUString const & rLocalName ) override; virtual OUString SAL_CALL getTypeByIndex( - sal_Int32 nIndex ) - throw (RuntimeException, std::exception) override; + sal_Int32 nIndex ) override; }; inline ExtendedAttributes::ExtendedAttributes( @@ -403,19 +380,16 @@ ExtendedAttributes::~ExtendedAttributes() throw () // XServiceInfo OUString DocumentHandlerImpl::getImplementationName() - throw (RuntimeException, std::exception) { return getImplementationName_DocumentHandlerImpl(); } sal_Bool DocumentHandlerImpl::supportsService( OUString const & servicename ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, servicename); } Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return getSupportedServiceNames_DocumentHandlerImpl(); } @@ -424,7 +398,6 @@ Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames() void DocumentHandlerImpl::initialize( Sequence< Any > const & arguments ) - throw (Exception, std::exception) { MGuard guard( m_pMutex ); Reference< xml::input::XRoot > xRoot; @@ -443,7 +416,6 @@ void DocumentHandlerImpl::initialize( // XNamespaceMapping sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri ) - throw (RuntimeException, std::exception) { sal_Int32 uid = getUidByURI( Uri ); SAL_WARN_IF( uid == UID_UNKNOWN, "xmlscript.xmlhelper", "uid UNKNOWN"); @@ -451,7 +423,6 @@ sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri ) } OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid ) - throw (container::NoSuchElementException, RuntimeException, std::exception) { MGuard guard( m_pMutex ); t_OUString2LongMap::const_iterator iPos( m_URI2Uid.begin() ); @@ -467,13 +438,11 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid ) // XDocumentHandler void DocumentHandlerImpl::startDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) { m_xRoot->startDocument( static_cast< xml::input::XNamespaceMapping * >( this ) ); } void DocumentHandlerImpl::endDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) { m_xRoot->endDocument(); } @@ -481,7 +450,6 @@ void DocumentHandlerImpl::endDocument() void DocumentHandlerImpl::startElement( OUString const & rQElementName, Reference< xml::sax::XAttributeList > const & xAttribs ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< xml::input::XElement > xCurrentElement; Reference< xml::input::XAttributes > xAttributes; @@ -609,7 +577,6 @@ void DocumentHandlerImpl::startElement( void DocumentHandlerImpl::endElement( OUString const & rQElementName ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< xml::input::XElement > xCurrentElement; { @@ -647,7 +614,6 @@ void DocumentHandlerImpl::endElement( } void DocumentHandlerImpl::characters( OUString const & rChars ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< xml::input::XElement > xCurrentElement( getCurrentElement() ); if (xCurrentElement.is()) @@ -656,7 +622,6 @@ void DocumentHandlerImpl::characters( OUString const & rChars ) void DocumentHandlerImpl::ignorableWhitespace( OUString const & rWhitespaces ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< xml::input::XElement > xCurrentElement( getCurrentElement() ); if (xCurrentElement.is()) @@ -665,7 +630,6 @@ void DocumentHandlerImpl::ignorableWhitespace( void DocumentHandlerImpl::processingInstruction( OUString const & rTarget, OUString const & rData ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< xml::input::XElement > xCurrentElement( getCurrentElement() ); if (xCurrentElement.is()) @@ -676,7 +640,6 @@ void DocumentHandlerImpl::processingInstruction( void DocumentHandlerImpl::setDocumentLocator( Reference< xml::sax::XLocator > const & xLocator ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { m_xRoot->setDocumentLocator( xLocator ); } @@ -684,7 +647,6 @@ void DocumentHandlerImpl::setDocumentLocator( // XAttributes sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName ) - throw (RuntimeException, std::exception) { for ( sal_Int32 nPos = m_nAttributes; nPos--; ) { @@ -697,13 +659,11 @@ sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName ) } sal_Int32 ExtendedAttributes::getLength() - throw (RuntimeException, std::exception) { return m_nAttributes; } OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex ) - throw (RuntimeException, std::exception) { if (nIndex < m_nAttributes) return m_pLocalNames[ nIndex ]; @@ -712,7 +672,6 @@ OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex ) } OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex ) - throw (RuntimeException, std::exception) { if (nIndex < m_nAttributes) return m_pQNames[ nIndex ]; @@ -721,7 +680,6 @@ OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex ) } OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex ) - throw (RuntimeException, std::exception) { static_cast<void>(nIndex); SAL_WARN_IF( nIndex >= m_nAttributes , "xmlscript.xmlhelper", "nIndex is bigger then m_nAttributes"); @@ -729,7 +687,6 @@ OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex ) } OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex ) - throw (RuntimeException, std::exception) { if (nIndex < m_nAttributes) return m_pValues[ nIndex ]; @@ -739,7 +696,6 @@ OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex ) sal_Int32 ExtendedAttributes::getIndexByUidName( sal_Int32 nUid, OUString const & rLocalName ) - throw (RuntimeException, std::exception) { for ( sal_Int32 nPos = m_nAttributes; nPos--; ) { @@ -752,7 +708,6 @@ sal_Int32 ExtendedAttributes::getIndexByUidName( } sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex ) - throw (RuntimeException, std::exception) { if (nIndex < m_nAttributes) return m_pUids[ nIndex ]; @@ -762,7 +717,6 @@ sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex ) OUString ExtendedAttributes::getValueByUidName( sal_Int32 nUid, OUString const & rLocalName ) - 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 d29fff943fce..18598891bce7 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -183,21 +183,16 @@ public: // XRoot virtual void SAL_CALL startDocument( css::uno::Reference< css::xml::input::XNamespaceMapping > - const & xNamespaceMapping ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const & xNamespaceMapping ) override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; virtual void SAL_CALL setDocumentLocator( - css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) override; 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, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; }; class ElementBase @@ -220,29 +215,21 @@ public: virtual ~ElementBase() override; // XElement - virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUid() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent() override; + virtual OUString SAL_CALL getLocalName() override; + virtual sal_Int32 SAL_CALL getUid() override; virtual css::uno::Reference< css::xml::input::XAttributes > - SAL_CALL getAttributes() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAttributes() override; virtual void SAL_CALL ignorableWhitespace( - OUString const & rWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( OUString const & rChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rWhitespaces ) override; + virtual void SAL_CALL characters( OUString const & rChars ) override; virtual void SAL_CALL processingInstruction( - OUString const & Target, OUString const & Data ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & Target, OUString const & Data ) override; + virtual void SAL_CALL endElement() override; 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, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; }; class StylesElement @@ -252,8 +239,7 @@ public: 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, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; inline StylesElement( OUString const & rLocalName, @@ -288,10 +274,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; void importTextColorStyle( css::uno::Reference< css::beans::XPropertySet > const & xProps ); @@ -341,8 +325,7 @@ public: 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, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; inline MenuPopupElement( OUString const & rLocalName, @@ -503,7 +486,7 @@ public: /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException - inline void finish() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) + inline void finish() { try { @@ -526,10 +509,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline WindowElement( OUString const & rLocalName, @@ -543,8 +524,7 @@ class EventElement : public ElementBase { public: - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement() override; inline EventElement( sal_Int32 nUid, OUString const & rLocalName, @@ -561,8 +541,7 @@ public: 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, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; BulletinBoardElement( OUString const & rLocalName, @@ -577,10 +556,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline ButtonElement( OUString const & rLocalName, @@ -597,10 +574,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline CheckBoxElement( OUString const & rLocalName, @@ -618,10 +593,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline ComboBoxElement( OUString const & rLocalName, @@ -639,10 +612,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline MenuListElement( OUString const & rLocalName, @@ -659,8 +630,7 @@ public: 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, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; inline RadioElement( OUString const & rLocalName, @@ -678,10 +648,8 @@ public: 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, std::exception) override; - void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + void SAL_CALL endElement() override; inline RadioGroupElement( OUString const & rLocalName, @@ -700,10 +668,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline TitledBoxElement( OUString const & rLocalName, @@ -720,10 +686,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline TextElement( OUString const & rLocalName, @@ -739,10 +703,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline FixedHyperLinkElement( OUString const & rLocalName, @@ -759,10 +721,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline TextFieldElement( OUString const & rLocalName, @@ -779,10 +739,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline ImageControlElement( OUString const & rLocalName, @@ -799,10 +757,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline FileControlElement( OUString const & rLocalName, @@ -819,10 +775,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline TreeControlElement( OUString const & rLocalName, @@ -839,10 +793,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline CurrencyFieldElement( OUString const & rLocalName, @@ -859,10 +811,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline DateFieldElement( OUString const & rLocalName, @@ -879,10 +829,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline NumericFieldElement( OUString const & rLocalName, @@ -899,10 +847,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline TimeFieldElement( OUString const & rLocalName, @@ -919,10 +865,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline PatternFieldElement( OUString const & rLocalName, @@ -939,10 +883,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline FormattedFieldElement( OUString const & rLocalName, @@ -959,10 +901,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline FixedLineElement( OUString const & rLocalName, @@ -979,10 +919,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline ScrollBarElement( OUString const & rLocalName, @@ -999,10 +937,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline SpinButtonElement( OUString const & rLocalName, @@ -1019,10 +955,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline MultiPage( OUString const & rLocalName, @@ -1044,10 +978,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline Frame( OUString const & rLocalName, @@ -1066,10 +998,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline Page( OUString const & rLocalName, @@ -1090,10 +1020,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override; + virtual void SAL_CALL endElement() override; inline ProgressBarElement( OUString const & rLocalName, diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx index beb697136e89..d55aae5e16a5 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx @@ -47,11 +47,9 @@ public: } // XInputStreamProvider - virtual Reference< io::XInputStream > SAL_CALL createInputStream() - throw (RuntimeException, std::exception) override; + virtual Reference< io::XInputStream > SAL_CALL createInputStream() override; }; Reference< io::XInputStream > InputStreamProvider::createInputStream() - 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 79d327eb3ea0..f37993e2bd91 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -44,7 +44,6 @@ 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, std::exception) { if ( !m_xContainer.is() ) m_xContainer.set( m_xImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoFrameModel" ), UNO_QUERY ); @@ -74,7 +73,6 @@ Reference< xml::input::XElement > Frame::startChildElement( } void Frame::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { if ( !m_xContainer.is() ) m_xContainer.set( m_xImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoFrameModel" ), UNO_QUERY ); @@ -110,7 +108,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -134,7 +131,6 @@ Reference< xml::input::XElement > MultiPage::startChildElement( } void MultiPage::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); // m_xImport is what we need to add to ( e.g. the dialog in this case ) @@ -166,7 +162,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -189,7 +184,6 @@ Reference< xml::input::XElement > Page::startChildElement( } void Page::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); @@ -221,7 +215,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -237,7 +230,6 @@ Reference< xml::input::XElement > ProgressBarElement::startChildElement( } } void ProgressBarElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlProgressBarModel" ); @@ -267,7 +259,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -280,7 +271,6 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement( } } void ScrollBarElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlScrollBarModel" , _xAttributes ) ); @@ -319,7 +309,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -333,7 +322,6 @@ Reference< xml::input::XElement > SpinButtonElement::startChildElement( } void SpinButtonElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlSpinButtonModel", _xAttributes ) ); @@ -369,7 +357,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -382,7 +369,6 @@ Reference< xml::input::XElement > FixedLineElement::startChildElement( } } void FixedLineElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx(m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedLineModel" ); @@ -411,7 +397,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -424,7 +409,6 @@ Reference< xml::input::XElement > PatternFieldElement::startChildElement( } } void PatternFieldElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlPatternFieldModel" ); @@ -461,7 +445,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -475,7 +458,6 @@ Reference< xml::input::XElement > FormattedFieldElement::startChildElement( } void FormattedFieldElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFormattedFieldModel" ); @@ -591,7 +573,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -604,7 +585,6 @@ Reference< xml::input::XElement > TimeFieldElement::startChildElement( } } void TimeFieldElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlTimeFieldModel" ); @@ -647,7 +627,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -660,7 +639,6 @@ Reference< xml::input::XElement > NumericFieldElement::startChildElement( } } void NumericFieldElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlNumericFieldModel" ); @@ -705,7 +683,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -718,7 +695,6 @@ Reference< xml::input::XElement > DateFieldElement::startChildElement( } } void DateFieldElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlDateFieldModel" ); @@ -762,7 +738,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -775,7 +750,6 @@ Reference< xml::input::XElement > CurrencyFieldElement::startChildElement( } } void CurrencyFieldElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlCurrencyFieldModel" ); @@ -820,7 +794,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -833,7 +806,6 @@ Reference< xml::input::XElement > FileControlElement::startChildElement( } } void FileControlElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFileControlModel" ); @@ -866,7 +838,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -879,7 +850,6 @@ Reference< xml::input::XElement > TreeControlElement::startChildElement( } } void TreeControlElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.tree.TreeControlModel" ); @@ -914,7 +884,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -928,7 +897,6 @@ Reference< xml::input::XElement > ImageControlElement::startChildElement( } void ImageControlElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlImageControlModel" ); @@ -958,7 +926,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -972,7 +939,6 @@ Reference< xml::input::XElement > TextElement::startChildElement( } void TextElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedTextModel" ); @@ -1007,7 +973,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1020,7 +985,6 @@ Reference< xml::input::XElement > FixedHyperLinkElement::startChildElement( } } void FixedHyperLinkElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedHyperlinkModel" ); @@ -1058,7 +1022,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1071,7 +1034,6 @@ Reference< xml::input::XElement > TextFieldElement::startChildElement( } } void TextFieldElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlEditModel" ); Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); @@ -1124,7 +1086,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1159,7 +1120,6 @@ Reference< xml::input::XElement > TitledBoxElement::startChildElement( } void TitledBoxElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { { ControlImportContext ctx(m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlGroupBoxModel" ); @@ -1244,7 +1204,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1261,7 +1220,6 @@ 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, std::exception) { if (m_xImport->XMLNS_DIALOGS_UID != nUid) { @@ -1283,7 +1241,6 @@ Reference< xml::input::XElement > RadioGroupElement::startChildElement( } } void RadioGroupElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { for (Reference<XElement>& xRadio : _radios) { @@ -1341,7 +1298,6 @@ 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, std::exception) { if (m_xImport->XMLNS_DIALOGS_UID != nUid) { @@ -1394,7 +1350,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1418,7 +1373,6 @@ Reference< xml::input::XElement > MenuListElement::startChildElement( } void MenuListElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlListBoxModel", _xAttributes ) ); Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); @@ -1464,7 +1418,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1487,7 +1440,6 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement( } } void ComboBoxElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlComboBoxModel", _xAttributes ) ); Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); @@ -1533,7 +1485,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1546,7 +1497,6 @@ Reference< xml::input::XElement > CheckBoxElement::startChildElement( } } void CheckBoxElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlCheckBoxModel" ); Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() ); @@ -1601,7 +1551,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1615,7 +1564,6 @@ Reference< xml::input::XElement > ButtonElement::startChildElement( } void ButtonElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlButtonModel" ); @@ -1667,7 +1615,6 @@ 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, std::exception) { if (m_xImport->XMLNS_DIALOGS_UID != nUid) { @@ -1827,13 +1774,11 @@ 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, std::exception) { throw xml::sax::SAXException( "unexpected sub elements of style!", Reference< XInterface >(), Any() ); } void StyleElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< xml::input::XAttributes > xStyle; OUString aStyleId( _xAttributes->getValueByUidName( m_xImport->XMLNS_DIALOGS_UID, "style-id" ) ); @@ -1851,7 +1796,6 @@ 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, std::exception) { if (m_xImport->XMLNS_DIALOGS_UID != nUid) { @@ -1872,7 +1816,6 @@ 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, std::exception) { // event if (m_xImport->isEventElement( nUid, rLocalName )) @@ -1900,7 +1843,6 @@ Reference< xml::input::XElement > WindowElement::startChildElement( } void WindowElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { Reference< beans::XPropertySet > xProps( m_xImport->_xDialogModel, UNO_QUERY_THROW ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index faa8f733e878..e9d2b67505b7 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -67,7 +67,6 @@ namespace xmlscript { void EventElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { static_cast< ControlElement * >( m_xParent.get() )->_events.push_back( this ); } @@ -1614,57 +1613,48 @@ void ImportContext::importDefaults( } Reference< xml::input::XElement > ElementBase::getParent() - throw (RuntimeException, std::exception) { return static_cast< xml::input::XElement * >( m_xParent.get() ); } OUString ElementBase::getLocalName() - throw (RuntimeException, std::exception) { return _aLocalName; } sal_Int32 ElementBase::getUid() - throw (RuntimeException, std::exception) { return _nUid; } Reference< xml::input::XAttributes > ElementBase::getAttributes() - throw (RuntimeException, std::exception) { return _xAttributes; } void ElementBase::ignorableWhitespace( OUString const & /*rWhitespaces*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { // not used } void ElementBase::characters( OUString const & /*rChars*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { // not used, all characters ignored } void ElementBase::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void ElementBase::processingInstruction( OUString const & /*Target*/, OUString const & /*Data*/ ) - 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, std::exception) { throw xml::sax::SAXException( "unexpected element!", Reference< XInterface >(), Any() ); } @@ -1690,28 +1680,24 @@ ElementBase::~ElementBase() void DialogImport::startDocument( Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping ) - 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, std::exception) { // ignored } void DialogImport::processingInstruction( OUString const & /*rTarget*/, OUString const & /*rData*/ ) - 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, std::exception) { // ignored for now: xxx todo } @@ -1719,7 +1705,6 @@ 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, 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 c6fa807f1208..37f9b9e6108a 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx @@ -50,14 +50,14 @@ namespace xmlscript } // XServiceInfo - sal_Bool XMLBasicExporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool XMLBasicExporterBase::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } // XInitialization - void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) + void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -79,7 +79,6 @@ namespace xmlscript // XExporter void XMLBasicExporterBase::setSourceDocument( const Reference< XComponent >& rxDoc ) - throw (IllegalArgumentException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -94,7 +93,6 @@ namespace xmlscript // XFilter sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /*aDescriptor*/ ) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -329,7 +327,6 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / } void XMLBasicExporterBase::cancel() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -349,12 +346,12 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / // XServiceInfo - OUString XMLBasicExporter::getImplementationName( ) throw (RuntimeException, std::exception) + OUString XMLBasicExporter::getImplementationName( ) { return OUString( "com.sun.star.comp.xmlscript.XMLBasicExporter" ); } - Sequence< OUString > XMLBasicExporter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > XMLBasicExporter::getSupportedServiceNames( ) { Sequence< OUString > aNames { "com.sun.star.document.XMLBasicExporter" }; return aNames; @@ -373,12 +370,12 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / // XServiceInfo - OUString XMLOasisBasicExporter::getImplementationName( ) throw (RuntimeException, std::exception) + OUString XMLOasisBasicExporter::getImplementationName( ) { return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicExporter" ); } - Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames( ) { Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicExporter" }; return aNames; diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx index 9476d44f39bd..6d44d6255451 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx @@ -52,22 +52,17 @@ namespace xmlscript virtual ~XMLBasicExporterBase() override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc ) override; // XFilter - virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override; + virtual void SAL_CALL cancel() override; }; // class XMLBasicExporter @@ -79,10 +74,8 @@ namespace xmlscript virtual ~XMLBasicExporter() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; // class XMLOasisBasicExporter @@ -94,10 +87,8 @@ namespace xmlscript virtual ~XMLOasisBasicExporter() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; } // namespace xmlscript diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx index 316b3a0d4007..da62d412f5b7 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx @@ -85,19 +85,16 @@ namespace xmlscript // XElement Reference< xml::input::XElement > BasicElementBase::getParent() - throw (RuntimeException, std::exception) { return m_xParent.get(); } OUString BasicElementBase::getLocalName() - throw (RuntimeException, std::exception) { return m_aLocalName; } sal_Int32 BasicElementBase::getUid() - throw (RuntimeException, std::exception) { sal_Int32 nId = -1; if ( m_xImport.is() ) @@ -106,7 +103,6 @@ namespace xmlscript } Reference< xml::input::XAttributes > BasicElementBase::getAttributes() - throw (RuntimeException, std::exception) { return m_xAttributes; } @@ -114,29 +110,24 @@ 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, std::exception) { throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() ); } void BasicElementBase::characters( const OUString& /*rChars*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { // not used, all characters ignored } void BasicElementBase::ignorableWhitespace( const OUString& /*rWhitespaces*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void BasicElementBase::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { } @@ -156,7 +147,6 @@ 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, std::exception) { Reference< xml::input::XElement > xElement; @@ -240,7 +230,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const } void BasicLibrariesElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { } @@ -272,7 +261,6 @@ 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, std::exception) { Reference< xml::input::XElement > xElement; @@ -299,7 +287,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const } void BasicEmbeddedLibraryElement::endElement() - 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 ); @@ -322,7 +309,6 @@ 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, std::exception) { // TODO: <byte-code> @@ -351,7 +337,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const } void BasicModuleElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { } @@ -370,13 +355,11 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const // XElement void BasicSourceCodeElement::characters( const OUString& rChars ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { m_aBuffer.append( rChars ); } void BasicSourceCodeElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { try { @@ -418,7 +401,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const // XRoot void BasicImport::startDocument( const Reference< xml::input::XNamespaceMapping >& xNamespaceMapping ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { if ( xNamespaceMapping.is() ) { @@ -433,23 +415,19 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const } void BasicImport::endDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void BasicImport::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*xLocator*/ ) - 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, std::exception) { Reference< xml::input::XElement > xElement; @@ -502,14 +480,13 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } // XServiceInfo - sal_Bool XMLBasicImporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool XMLBasicImporterBase::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } // XImporter void XMLBasicImporterBase::setTargetDocument( const Reference< XComponent >& rxDoc ) - throw (IllegalArgumentException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -536,7 +513,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x // XDocumentHandler void XMLBasicImporterBase::startDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -545,7 +521,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } void XMLBasicImporterBase::endDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -555,7 +530,6 @@ 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, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -564,7 +538,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } void XMLBasicImporterBase::endElement( const OUString& aName ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -573,7 +546,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } void XMLBasicImporterBase::characters( const OUString& aChars ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -582,7 +554,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } void XMLBasicImporterBase::ignorableWhitespace( const OUString& aWhitespaces ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -592,7 +563,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x void XMLBasicImporterBase::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -601,7 +571,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x } void XMLBasicImporterBase::setDocumentLocator( const Reference< xml::sax::XLocator >& xLocator ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -622,12 +591,12 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x // XServiceInfo - OUString XMLBasicImporter::getImplementationName( ) throw (RuntimeException, std::exception) + OUString XMLBasicImporter::getImplementationName( ) { return OUString( "com.sun.star.comp.xmlscript.XMLBasicImporter" ); } - Sequence< OUString > XMLBasicImporter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > XMLBasicImporter::getSupportedServiceNames( ) { Sequence< OUString > aNames { "com.sun.star.document.XMLBasicImporter" }; return aNames; @@ -646,12 +615,12 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x // XServiceInfo - OUString XMLOasisBasicImporter::getImplementationName( ) throw (RuntimeException, std::exception) + OUString XMLOasisBasicImporter::getImplementationName( ) { return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicImporter" ); } - Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames( ) { Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicImporter" }; return aNames; diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx index 194283c87d87..247cf835eb3c 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx @@ -62,28 +62,19 @@ namespace xmlscript virtual ~BasicElementBase() override; // XElement - virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUid() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() override; + virtual OUString SAL_CALL getLocalName() override; + virtual sal_Int32 SAL_CALL getUid() override; + virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() override; virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& rChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; virtual void SAL_CALL ignorableWhitespace( - const OUString& rWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const OUString& rWhitespaces ) override; virtual void SAL_CALL processingInstruction( - const OUString& rTarget, const OUString& rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const OUString& rTarget, const OUString& rData ) override; + virtual void SAL_CALL endElement() override; }; // class BasicLibrariesElement @@ -102,10 +93,8 @@ namespace xmlscript // XElement virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override; + virtual void SAL_CALL endElement() override; }; // class BasicEmbeddedLibraryElement @@ -128,10 +117,8 @@ namespace xmlscript // XElement virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override; + virtual void SAL_CALL endElement() override; }; // class BasicModuleElement @@ -152,10 +139,8 @@ namespace xmlscript // XElement virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement( sal_Int32 nUid, const OUString& rLocalName, - const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override; + virtual void SAL_CALL endElement() override; }; // class BasicSourceCodeElement @@ -175,10 +160,8 @@ namespace xmlscript const OUString& rName ); // XElement - virtual void SAL_CALL characters( const OUString& rChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& rChars ) override; + virtual void SAL_CALL endElement() override; }; // class BasicImport @@ -205,20 +188,15 @@ namespace xmlscript // XRoot virtual void SAL_CALL startDocument( - const css::uno::Reference< css::xml::input::XNamespaceMapping >& xNamespaceMapping ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XNamespaceMapping >& xNamespaceMapping ) override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL processingInstruction( - const OUString& rTarget, const OUString& rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const OUString& rTarget, const OUString& rData ) override; virtual void SAL_CALL setDocumentLocator( - const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startRootElement( sal_Int32 nUid, const OUString& rLocalName, - const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override; }; // class XMLBasicImporterBase @@ -242,31 +220,21 @@ namespace xmlscript virtual ~XMLBasicImporterBase() override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // XImporter - virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc ) override; // XDocumentHandler - virtual void SAL_CALL startDocument() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL startElement( const OUString& aName, - const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; }; // class XMLBasicImporter @@ -279,10 +247,8 @@ namespace xmlscript virtual ~XMLBasicImporter() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; // class XMLOasisBasicImporter @@ -295,10 +261,8 @@ namespace xmlscript virtual ~XMLOasisBasicImporter() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; } // namespace xmlscript diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index 71d7d9435be4..8bdb2f7f5d8c 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -136,20 +136,15 @@ public: // XRoot virtual void SAL_CALL startDocument( - css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; virtual void SAL_CALL setDocumentLocator( - css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) override; 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, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; }; class LibElementBase @@ -170,28 +165,19 @@ public: virtual ~LibElementBase() override; // XElement - virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUid() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() override; + virtual OUString SAL_CALL getLocalName() override; + virtual sal_Int32 SAL_CALL getUid() override; + virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() override; virtual void SAL_CALL ignorableWhitespace( - OUString const & rWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( OUString const & rChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rWhitespaces ) override; + virtual void SAL_CALL characters( OUString const & rChars ) override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; + virtual void SAL_CALL endElement() override; 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, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; }; class LibrariesElement : public LibElementBase @@ -204,10 +190,8 @@ protected: public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; + virtual void SAL_CALL endElement() override; LibrariesElement( OUString const & rLocalName, @@ -226,10 +210,8 @@ public: 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, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; + virtual void SAL_CALL endElement() override; LibraryElement( OUString const & rLocalName, diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx index 2bf8b167edb6..2fc285e265b7 100644 --- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx +++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx @@ -31,55 +31,46 @@ namespace xmlscript { Reference< xml::input::XElement > LibElementBase::getParent() - throw (RuntimeException, std::exception) { return mxParent.get(); } OUString LibElementBase::getLocalName() - throw (RuntimeException, std::exception) { return _aLocalName; } sal_Int32 LibElementBase::getUid() - throw (RuntimeException, std::exception) { return mxImport->XMLNS_LIBRARY_UID; } Reference< xml::input::XAttributes > LibElementBase::getAttributes() - throw (RuntimeException, std::exception) { return _xAttributes; } void LibElementBase::ignorableWhitespace( OUString const & /*rWhitespaces*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void LibElementBase::characters( OUString const & /*rChars*/ ) - 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, std::exception) { } void LibElementBase::endElement() - 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, std::exception) { throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() ); } @@ -104,33 +95,28 @@ LibElementBase::~LibElementBase() void LibraryImport::startDocument( Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping ) - 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, std::exception) { } void LibraryImport::processingInstruction( OUString const & /*rTarget*/, OUString const & /*rData*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void LibraryImport::setDocumentLocator( Reference< xml::sax::XLocator > const & /*xLocator*/ ) - 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, std::exception) { if (XMLNS_LIBRARY_UID != nUid) { @@ -167,7 +153,6 @@ 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, std::exception) { if (mxImport->XMLNS_LIBRARY_UID != nUid) { @@ -195,7 +180,6 @@ Reference< xml::input::XElement > LibrariesElement::startChildElement( } void LibrariesElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { sal_Int32 nLibCount = mxImport->mpLibArray->mnLibCount = (sal_Int32)mLibDescriptors.size(); mxImport->mpLibArray->mpLibs.reset( new LibDescriptor[ nLibCount ] ); @@ -211,7 +195,6 @@ 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, std::exception) { if (mxImport->XMLNS_LIBRARY_UID != nUid) { @@ -233,7 +216,6 @@ Reference< xml::input::XElement > LibraryElement::startChildElement( } void LibraryElement::endElement() - 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 1f170a0dc8ca..78c4d2a54830 100644 --- a/xmlscript/source/xmlmod_imexp/imp_share.hxx +++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx @@ -67,20 +67,15 @@ public: // XRoot virtual void SAL_CALL startDocument( - css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) override; + virtual void SAL_CALL endDocument() override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; virtual void SAL_CALL setDocumentLocator( - css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) override; 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, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; }; class ModuleElement @@ -100,28 +95,19 @@ public: virtual ~ModuleElement() override; // XElement - virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUid() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() override; + virtual OUString SAL_CALL getLocalName() override; + virtual sal_Int32 SAL_CALL getUid() override; + virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() override; virtual void SAL_CALL ignorableWhitespace( - OUString const & rWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( OUString const & rChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rWhitespaces ) override; + virtual void SAL_CALL characters( OUString const & rChars ) override; virtual void SAL_CALL processingInstruction( - OUString const & rTarget, OUString const & rData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement() - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + OUString const & rTarget, OUString const & rData ) override; + virtual void SAL_CALL endElement() override; 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, std::exception) override; + css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override; }; } diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index cb562815d7c4..07f67d45f72c 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -31,47 +31,39 @@ namespace xmlscript { Reference< xml::input::XElement > ModuleElement::getParent() - throw (RuntimeException, std::exception) { return nullptr; } OUString ModuleElement::getLocalName() - throw (RuntimeException, std::exception) { return _aLocalName; } sal_Int32 ModuleElement::getUid() - throw (RuntimeException, std::exception) { return mxImport->XMLNS_SCRIPT_UID; } Reference< xml::input::XAttributes > ModuleElement::getAttributes() - throw (RuntimeException, std::exception) { return _xAttributes; } void ModuleElement::ignorableWhitespace( OUString const & /*rWhitespaces*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { // not used } void ModuleElement::characters( OUString const & rChars ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { _strBuffer.append( rChars ); } void ModuleElement::processingInstruction( OUString const & /*rTarget*/, OUString const & /*rData*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void ModuleElement::endElement() - throw (xml::sax::SAXException, RuntimeException, std::exception) { mxImport->mrModuleDesc.aCode = _strBuffer.makeStringAndClear(); } @@ -79,7 +71,6 @@ 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, std::exception) { throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() ); } @@ -103,7 +94,6 @@ ModuleElement::~ModuleElement() void ModuleImport::startDocument( Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( XMLNS_SCRIPT_URI ); XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( XMLNS_LIBRARY_URI ); @@ -111,27 +101,23 @@ void ModuleImport::startDocument( } void ModuleImport::endDocument() - throw (xml::sax::SAXException, RuntimeException, std::exception) { // ignored } void ModuleImport::processingInstruction( OUString const & /*rTarget*/, OUString const & /*rData*/ ) - throw (xml::sax::SAXException, RuntimeException, std::exception) { } void ModuleImport::setDocumentLocator( Reference< xml::sax::XLocator > const & /*xLocator*/ ) - 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, std::exception) { if (XMLNS_SCRIPT_UID != nUid) { |