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 /include/xmlscript | |
parent | sal/rtl: remove SAL_THROW macro (diff) | |
download | core-dfd44d0b122869e291ba42085e31164a401a0a23.tar.gz core-dfd44d0b122869e291ba42085e31164a401a0a23.zip |
xmlscript: remove SAL_THROW macro
Change-Id: Ic830c23d8696fde323dcf67697248a84658be2bf
Diffstat (limited to 'include/xmlscript')
-rw-r--r-- | include/xmlscript/xml_helper.hxx | 18 | ||||
-rw-r--r-- | include/xmlscript/xmldlg_imexp.hxx | 12 | ||||
-rw-r--r-- | include/xmlscript/xmllib_imexp.hxx | 12 | ||||
-rw-r--r-- | include/xmlscript/xmlmod_imexp.hxx | 6 |
4 files changed, 16 insertions, 32 deletions
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index 0c64b42634ab..f4dad80fa534 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -43,7 +43,6 @@ class XMLSCRIPT_DLLPUBLIC XMLElement { public: inline XMLElement( OUString const & name ) - SAL_THROW(()) : _name( name ) {} @@ -52,30 +51,27 @@ public: @param xElem element reference */ void SAL_CALL addSubElement( - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > const & xElem ) - SAL_THROW(()); + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > const & xElem ); /** Gets sub element of given index. The index follows order in which sub elements were added. @param nIndex index of sub element */ - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex ) - SAL_THROW(()); + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex ); /** Adds an attribute to elements. @param rAttrName qname of attribute @param rValue value string of element */ - void SAL_CALL addAttribute( OUString const & rAttrName, OUString const & rValue ) - SAL_THROW(()); + void SAL_CALL addAttribute( OUString const & rAttrName, OUString const & rValue ); /** Gets the tag name (qname) of element. @return qname of element */ - inline OUString SAL_CALL getName() SAL_THROW(()) + inline OUString SAL_CALL getName() { return _name; } /** Dumps out element (and all sub elements). @@ -124,13 +120,11 @@ protected: XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL createInputStream( - ::rtl::ByteSequence const & rInData ) - SAL_THROW(()); + ::rtl::ByteSequence const & rInData ); XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( - ::rtl::ByteSequence * pOutData ) - SAL_THROW(()); + ::rtl::ByteSequence * pOutData ); } diff --git a/include/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx index c817e6d1edc4..92dd0f0c6765 100644 --- a/include/xmlscript/xmldlg_imexp.hxx +++ b/include/xmlscript/xmldlg_imexp.hxx @@ -38,8 +38,7 @@ XMLSCRIPT_DLLPUBLIC void SAL_CALL exportDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > const & xDialogModel, ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ) - SAL_THROW( (::com::sun::star::uno::Exception) ); + ::com::sun::star::frame::XModel > const & xDocument ); XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > SAL_CALL importDialogModel( @@ -48,8 +47,7 @@ SAL_CALL importDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ) - SAL_THROW( (::com::sun::star::uno::Exception) ); + ::com::sun::star::frame::XModel > const & xDocument ); // additional functions for convenience @@ -60,8 +58,7 @@ SAL_CALL exportDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ) - SAL_THROW( (::com::sun::star::uno::Exception) ); + ::com::sun::star::frame::XModel > const & xDocument ); XMLSCRIPT_DLLPUBLIC void SAL_CALL importDialogModel( ::com::sun::star::uno::Reference< @@ -71,8 +68,7 @@ XMLSCRIPT_DLLPUBLIC void SAL_CALL importDialogModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext, ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ) - SAL_THROW( (::com::sun::star::uno::Exception) ); + ::com::sun::star::frame::XModel > const & xDocument ); } diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx index 16a543da1df3..4f4f4780aa30 100644 --- a/include/xmlscript/xmllib_imexp.hxx +++ b/include/xmlscript/xmllib_imexp.hxx @@ -60,26 +60,22 @@ XMLSCRIPT_DLLPUBLIC void SAL_CALL exportLibraryContainer( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter > const & xOut, - const LibDescriptorArray* pLibArray ) - SAL_THROW( (::com::sun::star::uno::Exception) ); + const LibDescriptorArray* pLibArray ); XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > -SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ) - SAL_THROW( (::com::sun::star::uno::Exception) ); +SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ); XMLSCRIPT_DLLPUBLIC void SAL_CALL exportLibrary( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter > const & xOut, - const LibDescriptor& rLib ) - SAL_THROW( (::com::sun::star::uno::Exception) ); + const LibDescriptor& rLib ); XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > -SAL_CALL importLibrary( LibDescriptor& rLib ) - SAL_THROW( (::com::sun::star::uno::Exception) ); +SAL_CALL importLibrary( LibDescriptor& rLib ); } diff --git a/include/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx index 3015a14a96ae..74274a71b257 100644 --- a/include/xmlscript/xmlmod_imexp.hxx +++ b/include/xmlscript/xmlmod_imexp.hxx @@ -44,13 +44,11 @@ XMLSCRIPT_DLLPUBLIC void SAL_CALL exportScriptModule( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter > const & xOut, - const ModuleDescriptor& rMod ) - SAL_THROW( (::com::sun::star::uno::Exception) ); + const ModuleDescriptor& rMod ); XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > -SAL_CALL importScriptModule( ModuleDescriptor& rMod ) - SAL_THROW( (::com::sun::star::uno::Exception) ); +SAL_CALL importScriptModule( ModuleDescriptor& rMod ); } |