diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:11:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:48 +0200 |
commit | dfd44d0b122869e291ba42085e31164a401a0a23 (patch) | |
tree | 5d021229f819e04824a72045517b9c30d2b41b22 /xmlscript/source/xmlmod_imexp | |
parent | e5c20a785c5fafdd4dc9e6ac14ce548d2a527571 (diff) |
xmlscript: remove SAL_THROW macro
Change-Id: Ic830c23d8696fde323dcf67697248a84658be2bf
Diffstat (limited to 'xmlscript/source/xmlmod_imexp')
-rw-r--r-- | xmlscript/source/xmlmod_imexp/imp_share.hxx | 10 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_export.cxx | 1 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx index 07fb25e312f5..9ea39c160be2 100644 --- a/xmlscript/source/xmlmod_imexp/imp_share.hxx +++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx @@ -53,7 +53,7 @@ struct ModuleImport sal_Int32 XMLNS_XLINK_UID; public: - ModuleImport(ModuleDescriptor& rModuleDesc) SAL_THROW(()) + ModuleImport(ModuleDescriptor& rModuleDesc) : mrModuleDesc(rModuleDesc) , XMLNS_SCRIPT_UID(0) , XMLNS_LIBRARY_UID(0) @@ -61,7 +61,7 @@ public: { } - virtual ~ModuleImport() SAL_THROW(()); + virtual ~ModuleImport(); // XRoot virtual void SAL_CALL startDocument( @@ -96,10 +96,8 @@ public: ModuleElement( OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, - ModuleElement * pParent, ModuleImport * pImport ) - SAL_THROW(()); - virtual ~ModuleElement() - SAL_THROW(()); + ModuleElement * pParent, ModuleImport * pImport ); + virtual ~ModuleElement(); // XElement virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx index b656cd0c437f..377fb440320a 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx @@ -30,7 +30,6 @@ void SAL_CALL exportScriptModule( Reference< xml::sax::XWriter > const & xOut, const ModuleDescriptor& rMod ) - SAL_THROW( (Exception) ) { xOut->startDocument(); diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx index 52b5d8d3582b..797af996eab1 100644 --- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx +++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx @@ -84,7 +84,6 @@ ModuleElement::ModuleElement( OUString const & rLocalName, Reference< xml::input::XAttributes > const & xAttributes, ModuleElement * pParent, ModuleImport * pImport ) - SAL_THROW(()) : _pImport( pImport ) , _pParent( pParent ) , _aLocalName( rLocalName ) @@ -99,7 +98,6 @@ ModuleElement::ModuleElement( } ModuleElement::~ModuleElement() - SAL_THROW(()) { _pImport->release(); @@ -166,8 +164,8 @@ Reference< xml::input::XElement > ModuleImport::startRootElement( throw xml::sax::SAXException("illegal root element (expected module) given: " + rLocalName, Reference< XInterface >(), Any() ); } } + ModuleImport::~ModuleImport() - SAL_THROW(()) { #if OSL_DEBUG_LEVEL > 1 SAL_INFO("xmlscript.xmlmod", "ModuleImport::~ModuleImport()." ); @@ -176,7 +174,6 @@ ModuleImport::~ModuleImport() Reference< xml::sax::XDocumentHandler > SAL_CALL importScriptModule( ModuleDescriptor& rMod ) - SAL_THROW( (Exception) ) { return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new ModuleImport( rMod ) ) ); |