diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /sc/source/filter/xml | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source/filter/xml')
-rw-r--r-- | sc/source/filter/xml/XMLCodeNameProvider.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLCodeNameProvider.hxx | 17 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLEmptyContext.cxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLEmptyContext.hxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/importcontext.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/importcontext.hxx | 9 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlbodyi.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlbodyi.hxx | 9 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcelli.hxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.hxx | 10 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 48 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 15 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlrowi.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlrowi.hxx | 12 | ||||
-rw-r--r-- | sc/source/filter/xml/xmltabi.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmltabi.hxx | 6 |
18 files changed, 42 insertions, 115 deletions
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index db4c1ea25ec6..bb05210c22ab 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -59,7 +59,6 @@ XMLCodeNameProvider::~XMLCodeNameProvider() } sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) - throw (uno::RuntimeException, std::exception ) { if( aName == msDocName ) return !mpDoc->GetCodeName().isEmpty(); @@ -79,8 +78,6 @@ sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) } uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) - throw (container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; uno::Sequence<beans::PropertyValue> aProps(1); @@ -110,7 +107,6 @@ uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) - throw (uno::RuntimeException, std::exception) { SCTAB nCount = mpDoc->GetTableCount() + 1; std::vector< OUString > aNames; @@ -134,13 +130,11 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) } uno::Type SAL_CALL XMLCodeNameProvider::getElementType( ) - throw (uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } sal_Bool SAL_CALL XMLCodeNameProvider::hasElements() - throw (uno::RuntimeException, std::exception ) { if( !mpDoc->GetCodeName().isEmpty() ) return true; diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 4b249782caa8..e0e2156b7e15 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -38,22 +38,15 @@ public: explicit XMLCodeNameProvider(ScDocument* pDoc); virtual ~XMLCodeNameProvider() override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; - virtual css::uno::Type SAL_CALL getElementType( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() override; static void set( const css::uno::Reference< css::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); }; diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index f108b439a14c..e7fa6a6d6532 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -33,7 +33,6 @@ ScXMLEmptyContext::~ScXMLEmptyContext() css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLEmptyContext::createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/ ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext = new ScXMLEmptyContext( GetScImport(), nElement ); diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index e003cde0d33a..49679d2dda4b 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -33,8 +33,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; }; #endif diff --git a/sc/source/filter/xml/importcontext.cxx b/sc/source/filter/xml/importcontext.cxx index 56196ea98f69..d0bceeddbcd7 100644 --- a/sc/source/filter/xml/importcontext.cxx +++ b/sc/source/filter/xml/importcontext.cxx @@ -31,17 +31,14 @@ const ScXMLImport& ScXMLImportContext::GetScImport() const } void SAL_CALL ScXMLImportContext::startFastElement(sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLImportContext::endFastElement(sal_Int32 /*nElement*/) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLImportContext::characters(const OUString &) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { } diff --git a/sc/source/filter/xml/importcontext.hxx b/sc/source/filter/xml/importcontext.hxx index 0d9a13609eee..089b6c1027cb 100644 --- a/sc/source/filter/xml/importcontext.hxx +++ b/sc/source/filter/xml/importcontext.hxx @@ -27,14 +27,11 @@ public: ScXMLImportContext( SvXMLImport& rImport ); virtual void SAL_CALL startFastElement (sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) override; - virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL characters(const OUString & aChars) override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; protected: ScXMLImport& GetScImport(); diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index f31079d79010..486cea560fed 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -198,7 +198,6 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLBodyContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) @@ -237,7 +236,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLBodyContext::characters(const OUString &) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) @@ -250,7 +248,6 @@ void SAL_CALL ScXMLBodyContext::characters(const OUString &) } void SAL_CALL ScXMLBodyContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index b5176cc15aad..b80bbd8cd044 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -52,14 +52,11 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; - virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL characters(const OUString & aChars) override; }; #endif diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 3559cc814b0b..0f6292c3fff7 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -1497,7 +1497,6 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() const } void SAL_CALL ScXMLTableRowCellContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { HasSpecialCaseFormulaText(); if( bFormulaTextResult && (mbPossibleErrorCell || mbCheckWithCompilerForError) ) diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 845bdc07dfc9..284c8ffe1136 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -150,8 +150,7 @@ public: void SetDetectiveObj( const ScAddress& rPosition ); void SetCellRangeSource( const ScAddress& rPosition ); - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; #endif diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 64d2ff96ee02..35a5e92c3b57 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -5040,7 +5040,6 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass ) // XExporter void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XComponent>& xComponent ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvXMLExport::setSourceDocument( xComponent ); @@ -5070,7 +5069,6 @@ void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XCompon // XFilter sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -5082,7 +5080,6 @@ sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::Pro } void SAL_CALL ScXMLExport::cancel() - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -5092,7 +5089,6 @@ void SAL_CALL ScXMLExport::cancel() // XInitialization void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvXMLExport::initialize(aArguments); @@ -5100,7 +5096,6 @@ void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any > // XUnoTunnel sal_Int64 SAL_CALL ScXMLExport::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return SvXMLExport::getSomething(aIdentifier); diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 833163db6cbb..65f6efe54e2a 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -260,17 +260,17 @@ public: virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) 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; // 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; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; virtual void DisposingModel() override; }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index bb4748006a2e..4ec2acdfa287 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -115,7 +115,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw( } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_ALL); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_getImplementationName(), SvXMLImportFlags::ALL )); @@ -133,7 +133,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() t } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META )); @@ -151,7 +151,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlagsSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS)); @@ -169,7 +169,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames( } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::META|SvXMLImportFlags::STYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::SETTINGS|SvXMLImportFlags::FONTDECLS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Content_getImplementationName(), SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS)); @@ -187,7 +187,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames } uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::SETTINGS); return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Settings_getImplementationName(), SvXMLImportFlags::SETTINGS )); @@ -244,18 +244,14 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; virtual void SAL_CALL startFastElement (sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) override; - virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL characters(const OUString & aChars) override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -292,16 +288,13 @@ public: const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override; virtual void SAL_CALL startFastElement (sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; }; ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, @@ -342,7 +335,6 @@ SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext( uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLFlatDocContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if ( nElement != ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_META ) ) return ScXMLDocContext_Impl::createFastChildContext( nElement, xAttrList ); @@ -352,13 +344,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL void SAL_CALL ScXMLFlatDocContext_Impl::startFastElement(sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLMetaDocumentContext::startFastElement( nElement, xAttrList ); } void SAL_CALL ScXMLFlatDocContext_Impl::endFastElement(sal_Int32 nElement) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLMetaDocumentContext::endFastElement( nElement ); } @@ -371,8 +361,7 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; }; ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport, sal_Int32 /*nElement*/, @@ -384,7 +373,6 @@ ScXMLImportContext( rImport ) uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLBodyContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { return GetScImport().CreateBodyContext( nElement, xAttrList ); } @@ -437,7 +425,6 @@ SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDocContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext(nullptr); @@ -463,17 +450,14 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL void SAL_CALL ScXMLDocContext_Impl::startFastElement(sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLDocContext_Impl::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { } void SAL_CALL ScXMLDocContext_Impl::characters(const OUString &) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { } @@ -2335,7 +2319,6 @@ ScXMLImport::~ScXMLImport() throw() } void ScXMLImport::initialize( const css::uno::Sequence<css::uno::Any>& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SvXMLImport::initialize(aArguments); @@ -3068,7 +3051,6 @@ void ScXMLImport::SetStylesToRangesFinished() // XImporter void SAL_CALL ScXMLImport::setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) -throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::setTargetDocument( xDoc ); @@ -3090,7 +3072,6 @@ throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exce // css::xml::sax::XDocumentHandler void SAL_CALL ScXMLImport::startDocument() -throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::startDocument(); @@ -3300,9 +3281,6 @@ void ScXMLImport::SetStringRefSyntaxIfMissing() } void SAL_CALL ScXMLImport::endDocument() - throw(css::xml::sax::SAXException, - css::uno::RuntimeException, - std::exception) { ScXMLImport::MutexGuard aGuard(*this); if (getImportFlags() & SvXMLImportFlags::CONTENT) diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index c09dff58feac..fce8191bba1d 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -968,8 +968,7 @@ public: virtual ~ScXMLImport() throw() 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; // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles @@ -1155,14 +1154,10 @@ public: void SetStylesToRangesFinished(); // XImporter - virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - - 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 setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override; + + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; virtual void DisposingModel() override; diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 130843211c9d..a8409582444d 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -107,7 +107,6 @@ ScXMLTableRowContext::~ScXMLTableRowContext() uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableRowContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext(nullptr); @@ -143,7 +142,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLTableRowContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScXMLImport& rXMLImport(GetScImport()); if (!bHasCell && nRepeatedRows > 1) @@ -253,7 +251,6 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableRowsContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { SvXMLImportContext *pContext(nullptr); @@ -287,7 +284,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLTableRowsContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScXMLImport& rXMLImport(GetScImport()); if (bHeader) diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 5c3ab2920d87..1b3839349dc2 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -40,13 +40,11 @@ public: virtual ~ScXMLTableRowContext() override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; }; class ScXMLTableRowsContext : public ScXMLImportContext @@ -67,11 +65,9 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 6093c5225dce..f482b13fee24 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -323,7 +323,6 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTableContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { const SvXMLTokenMap& rTokenMap(GetScImport().GetTableElemTokenMap()); sal_uInt16 nToken = rTokenMap.Get( nElement ); @@ -365,7 +364,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } void SAL_CALL ScXMLTableContext::endFastElement(sal_Int32 /*nElement*/) - throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { ScXMLImport::MutexGuard aMutexGuard(GetScImport()); ScXMLImport& rImport = GetScImport(); diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 0dfa46d2d2b7..ada786019320 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -59,11 +59,9 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override; + const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override; - virtual void SAL_CALL endFastElement(sal_Int32 nElement) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; class ScXMLTableProtectionContext : public ScXMLImportContext |