xmlscript: remove SAL_THROW macro

Change-Id: Ic830c23d8696fde323dcf67697248a84658be2bf

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 );
 
 }
 

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 );
 
 }
 

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 );
 
 }
 

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 );
 
 }
 

xmlscript/source/inc/unoservices.hxx

@@ -40,8 +40,7 @@ getSupportedServiceNames_DocumentHandlerImpl();
 OUString SAL_CALL getImplementationName_DocumentHandlerImpl();
 
 css::uno::Reference<css::uno::XInterface> SAL_CALL create_DocumentHandlerImpl(
-    css::uno::Reference<css::uno::XComponentContext> const & xContext)
-    SAL_THROW((css::uno::Exception));
+    css::uno::Reference<css::uno::XComponentContext> const & xContext);
 
 css::uno::Sequence<OUString> SAL_CALL
 getSupportedServiceNames_XMLBasicExporter();
@@ -49,8 +48,7 @@ getSupportedServiceNames_XMLBasicExporter();
 OUString SAL_CALL getImplementationName_XMLBasicExporter();
 
 css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicExporter(
-    css::uno::Reference<css::uno::XComponentContext> const & xContext)
-    SAL_THROW((css::uno::Exception));
+    css::uno::Reference<css::uno::XComponentContext> const & xContext);
 
 css::uno::Sequence<OUString> SAL_CALL
 getSupportedServiceNames_XMLOasisBasicExporter();
@@ -58,8 +56,7 @@ getSupportedServiceNames_XMLOasisBasicExporter();
 OUString SAL_CALL getImplementationName_XMLOasisBasicExporter();
 
 css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLOasisBasicExporter(
-    css::uno::Reference<css::uno::XComponentContext> const & xContext)
-    SAL_THROW((css::uno::Exception));
+    css::uno::Reference<css::uno::XComponentContext> const & xContext);
 
 css::uno::Sequence<OUString> SAL_CALL
 getSupportedServiceNames_XMLBasicImporter();
@@ -67,8 +64,7 @@ getSupportedServiceNames_XMLBasicImporter();
 OUString SAL_CALL getImplementationName_XMLBasicImporter();
 
 css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLBasicImporter(
-    css::uno::Reference<css::uno::XComponentContext> const & xContext)
-    SAL_THROW((css::uno::Exception));
+    css::uno::Reference<css::uno::XComponentContext> const & xContext);
 
 css::uno::Sequence<OUString> SAL_CALL
 getSupportedServiceNames_XMLOasisBasicImporter();
@@ -76,8 +72,7 @@ getSupportedServiceNames_XMLOasisBasicImporter();
 OUString SAL_CALL getImplementationName_XMLOasisBasicImporter();
 
 css::uno::Reference<css::uno::XInterface> SAL_CALL create_XMLOasisBasicImporter(
-    css::uno::Reference<css::uno::XComponentContext> const & xContext)
-        SAL_THROW((css::uno::Exception));
+    css::uno::Reference<css::uno::XComponentContext> const & xContext);
 
 }
 

xmlscript/source/inc/xml_import.hxx

@@ -52,8 +52,7 @@ namespace xmlscript
 SAL_CALL createDocumentHandler(
     ::com::sun::star::uno::Reference<
     ::com::sun::star::xml::input::XRoot > const & xRoot,
-    bool bSingleThreadedUse = true )
-    SAL_THROW(());
+    bool bSingleThreadedUse = true );
 
 }
 

xmlscript/source/xml_helper/xml_byteseq.cxx

@@ -39,7 +39,6 @@ class BSeqInputStream
 
 public:
     inline BSeqInputStream( ByteSequence const & rSeq )
-        SAL_THROW(())
         : _seq( rSeq )
         , _nPos( 0 )
         {}
@@ -105,7 +104,6 @@ class BSeqOutputStream
 
 public:
     inline BSeqOutputStream( ByteSequence * seq )
-        SAL_THROW(())
         : _seq( seq )
         {}
 
@@ -139,13 +137,11 @@ void BSeqOutputStream::closeOutput()
 }
 
 Reference< io::XInputStream > SAL_CALL createInputStream( ByteSequence const & rInData )
-    SAL_THROW(())
 {
     return new BSeqInputStream( rInData );
 }
 
 Reference< io::XOutputStream > SAL_CALL createOutputStream( ByteSequence * pOutData )
-    SAL_THROW(())
 {
     return new BSeqOutputStream( pOutData );
 }

xmlscript/source/xml_helper/xml_element.cxx

@@ -26,20 +26,17 @@ namespace xmlscript
 {
 
 void XMLElement::addAttribute( OUString const & rAttrName, OUString const & rValue )
-    SAL_THROW(())
 {
     _attrNames.push_back( rAttrName );
     _attrValues.push_back( rValue );
 }
 
 void XMLElement::addSubElement( Reference< xml::sax::XAttributeList > const & xElem )
-    SAL_THROW(())
 {
     _subElems.push_back( xElem );
 }
 
 Reference< xml::sax::XAttributeList > XMLElement::getSubElement( sal_Int32 nIndex )
-    SAL_THROW(())
 {
     return _subElems[ (size_t)nIndex ];
 }

xmlscript/source/xml_helper/xml_impctx.cxx

@@ -63,7 +63,7 @@ struct PrefixEntry
 {
     ::std::vector< sal_Int32 > m_Uids;
 
-    inline PrefixEntry() SAL_THROW(())
+    inline PrefixEntry()
         { m_Uids.reserve( 4 ); }
 };
 
@@ -797,7 +797,6 @@ OUString ExtendedAttributes::getValueByUidName(
 Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler(
     Reference< xml::input::XRoot > const & xRoot,
     bool bSingleThreadedUse )
-    SAL_THROW(())
 {
     SAL_WARN_IF( !xRoot.is(), "xmlscript.xmlhelper", "xRoot is NULL" );
     if (xRoot.is())
@@ -810,7 +809,6 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL createDocumentHandler(
 
 Reference< XInterface > SAL_CALL create_DocumentHandlerImpl(
     SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
-    SAL_THROW( (Exception) )
 {
     return static_cast< ::cppu::OWeakObject * >(
         new DocumentHandlerImpl(

xmlscript/source/xmldlg_imexp/exp_share.hxx

@@ -56,7 +56,7 @@ struct Style
 
     OUString _id;
 
-    Style( short all_ ) SAL_THROW(())
+    Style( short all_ )
         : _backgroundColor(0)
         , _textColor(0)
         , _textLineColor(0)
@@ -78,9 +78,9 @@ class StyleBag
     ::std::vector< Style * > _styles;
 
 public:
-    ~StyleBag() SAL_THROW(());
+    ~StyleBag() ;
 
-    OUString getStyleId( Style const & rStyle ) SAL_THROW(());
+    OUString getStyleId( Style const & rStyle );
 
     void dump( css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >
                const & xOut );
@@ -98,7 +98,6 @@ public:
         css::uno::Reference< css::beans::XPropertySet > const & xProps,
         css::uno::Reference< css::beans::XPropertyState > const & xPropState,
         OUString const & name, css::uno::Reference< css::frame::XModel > const & xDocument )
-        SAL_THROW(())
         : XMLElement( name )
         , _xProps( xProps )
         , _xPropState( xPropState )
@@ -106,7 +105,6 @@ public:
         {}
     inline ElementDescriptor(
         OUString const & name )
-        SAL_THROW(())
         : XMLElement( name )
         {}
 
@@ -172,61 +170,34 @@ public:
         css::uno::Reference< css::beans::XPropertySet >
         const & xFormatProperties );
 
-    void readEvents() SAL_THROW( (css::uno::Exception) );
-    void readDialogModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readBullitinBoard( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readMultiPageModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readFrameModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readPageModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readButtonModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readEditModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readCheckBoxModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readRadioButtonModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readComboBoxModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readCurrencyFieldModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readDateFieldModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readFileControlModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readTreeControlModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readFixedTextModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readGroupBoxModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readImageControlModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readListBoxModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readNumericFieldModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readPatternFieldModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readFormattedFieldModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readTimeFieldModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readFixedLineModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readProgressBarModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readScrollBarModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readSpinButtonModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
-    void readFixedHyperLinkModel( StyleBag * all_styles )
-        SAL_THROW( (css::uno::Exception) );
+    void readEvents();
+    void readDialogModel( StyleBag * all_styles );
+    void readBullitinBoard( StyleBag * all_styles );
+    void readMultiPageModel( StyleBag * all_styles );
+    void readFrameModel( StyleBag * all_styles );
+    void readPageModel( StyleBag * all_styles );
+    void readButtonModel( StyleBag * all_styles );
+    void readEditModel( StyleBag * all_styles );
+    void readCheckBoxModel( StyleBag * all_styles );
+    void readRadioButtonModel( StyleBag * all_styles );
+    void readComboBoxModel( StyleBag * all_styles );
+    void readCurrencyFieldModel( StyleBag * all_styles );
+    void readDateFieldModel( StyleBag * all_styles );
+    void readFileControlModel( StyleBag * all_styles );
+    void readTreeControlModel( StyleBag * all_styles );
+    void readFixedTextModel( StyleBag * all_styles );
+    void readGroupBoxModel( StyleBag * all_styles );
+    void readImageControlModel( StyleBag * all_styles );
+    void readListBoxModel( StyleBag * all_styles );
+    void readNumericFieldModel( StyleBag * all_styles );
+    void readPatternFieldModel( StyleBag * all_styles );
+    void readFormattedFieldModel( StyleBag * all_styles );
+    void readTimeFieldModel( StyleBag * all_styles );
+    void readFixedLineModel( StyleBag * all_styles );
+    void readProgressBarModel( StyleBag * all_styles );
+    void readScrollBarModel( StyleBag * all_styles );
+    void readSpinButtonModel( StyleBag * all_styles );
+    void readFixedHyperLinkModel( StyleBag * all_styles );
 };
 
 template<typename T>

xmlscript/source/xmldlg_imexp/imp_share.hxx

@@ -44,7 +44,7 @@
 namespace xmlscript
 {
 
-inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(())
+inline sal_Int32 toInt32( OUString const & rStr )
 {
     sal_Int32 nVal;
     if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x')
@@ -135,14 +135,12 @@ public:
 
     void addStyle(
         OUString const & rStyleId,
-        css::uno::Reference< css::xml::input::XElement > const & xStyle )
-        SAL_THROW(());
+        css::uno::Reference< css::xml::input::XElement > const & xStyle );
     css::uno::Reference< css::xml::input::XElement > getStyle(
-        OUString const & rStyleId ) const
-        SAL_THROW(());
+        OUString const & rStyleId ) const;
 
     inline css::uno::Reference< css::uno::XComponentContext >
-    const & getComponentContext() SAL_THROW(()) { return _xContext; }
+    const & getComponentContext()  { return _xContext; }
     css::uno::Reference< css::util::XNumberFormatsSupplier >
     const & getNumberFormatsSupplier();
 
@@ -153,7 +151,6 @@ public:
         ::boost::shared_ptr< ::std::vector< OUString > >& pStyleNames,
         ::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles,
         css::uno::Reference<css::frame::XModel> const & xDoc )
-        SAL_THROW(())
         : _xContext( xContext )
         , _pStyleNames( pStyleNames )
         , _pStyles( pStyles )
@@ -175,8 +172,7 @@ public:
         , XMLNS_DIALOGS_UID( rOther.XMLNS_DIALOGS_UID )
         , XMLNS_SCRIPT_UID( rOther.XMLNS_SCRIPT_UID ) {}
 
-    virtual ~DialogImport()
-        SAL_THROW(());
+    virtual ~DialogImport();
 
     inline css::uno::Reference< css::frame::XModel > getDocOwner() { return _xDoc; }
 
@@ -215,10 +211,8 @@ public:
     ElementBase(
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
-        ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(());
-    virtual ~ElementBase()
-        SAL_THROW(());
+        ElementBase * pParent, DialogImport * pImport );
+    virtual ~ElementBase();
 
     // XElement
     virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
@@ -260,7 +254,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ElementBase( pImport->XMLNS_DIALOGS_UID,
                        rLocalName, xAttributes, pParent, pImport )
         {}
@@ -314,7 +307,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ElementBase( pImport->XMLNS_DIALOGS_UID,
                        rLocalName, xAttributes, pParent, pImport )
         , _backgroundColor(0)
@@ -351,7 +343,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ElementBase( pImport->XMLNS_DIALOGS_UID,
                        rLocalName, xAttributes, pParent, pImport )
         {}
@@ -376,13 +367,12 @@ protected:
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
 public:
     ::std::vector<css::uno::Reference< css::xml::input::XElement> > *getEvents()
-        SAL_THROW(()) { return &_events; }
+         { return &_events; }
 
     ControlElement(
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
-        ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(());
+        ElementBase * pParent, DialogImport * pImport );
 };
 
 class ImportContext
@@ -524,7 +514,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -540,7 +529,6 @@ public:
         sal_Int32 nUid, OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ElementBase( nUid, rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -558,8 +546,7 @@ public:
     BulletinBoardElement(
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
-        ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(());
+        ElementBase * pParent, DialogImport * pImport );
 };
 
 class ButtonElement
@@ -578,7 +565,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -599,7 +585,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -621,7 +606,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -643,7 +627,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -662,7 +645,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -684,7 +666,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -707,7 +688,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : BulletinBoardElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -728,7 +708,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -748,7 +727,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -769,7 +747,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -790,7 +767,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -811,7 +787,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -832,7 +807,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -853,7 +827,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -874,7 +847,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -895,7 +867,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -916,7 +887,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -937,7 +907,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -958,7 +927,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -979,7 +947,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -1000,7 +967,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -1021,7 +987,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -1042,7 +1007,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {
             m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoMultiPageModel" ), css::uno::UNO_QUERY );
@@ -1068,7 +1032,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 private:
@@ -1091,7 +1054,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {
             m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoPageModel" ), css::uno::UNO_QUERY );
@@ -1116,7 +1078,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         ElementBase * pParent, DialogImport * pImport )
-        SAL_THROW(())
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
 };

xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx

@@ -59,7 +59,6 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
     Reference< container::XNameContainer > const & xDialogModel,
     Reference< XComponentContext > const & xContext,
     Reference< XModel > const & xDocument )
-    SAL_THROW( (Exception) )
 {
     Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create(xContext);
 
@@ -77,7 +76,6 @@ void SAL_CALL importDialogModel(
     Reference< container::XNameContainer > const & xDialogModel,
     Reference< XComponentContext > const & xContext,
     Reference< XModel > const & xDocument )
-    SAL_THROW( (Exception) )
 {
     Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext );
 

xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx

@@ -162,7 +162,6 @@ void ElementDescriptor::readPageModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readButtonModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
@@ -223,7 +222,6 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 | 0x40 );
@@ -280,7 +278,6 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -334,7 +331,6 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -396,7 +392,6 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles  )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 | 0x40 );
@@ -447,7 +442,6 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles  )
 }
 
 void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x2 | 0x8 | 0x20 );
@@ -477,7 +471,6 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readFixedTextModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -508,7 +501,6 @@ void ElementDescriptor::readFixedTextModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -541,7 +533,6 @@ void ElementDescriptor::readFixedHyperLinkModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readEditModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -584,7 +575,6 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x4 );
@@ -606,7 +596,6 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readFileControlModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -635,7 +624,6 @@ void ElementDescriptor::readFileControlModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readTreeControlModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -663,7 +651,6 @@ void ElementDescriptor::readTreeControlModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readCurrencyFieldModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -704,7 +691,6 @@ void ElementDescriptor::readCurrencyFieldModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readDateFieldModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -744,7 +730,6 @@ void ElementDescriptor::readDateFieldModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readNumericFieldModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -783,7 +768,6 @@ void ElementDescriptor::readNumericFieldModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readTimeFieldModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -821,7 +805,6 @@ void ElementDescriptor::readTimeFieldModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readPatternFieldModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -854,7 +837,6 @@ void ElementDescriptor::readPatternFieldModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x2 | 0x4 | 0x8 | 0x20 );
@@ -920,7 +902,6 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x4 );
@@ -949,7 +930,6 @@ void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readFixedLineModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x2 | 0x8 | 0x20 );
@@ -970,8 +950,8 @@ void ElementDescriptor::readFixedLineModel( StyleBag * all_styles )
     readOrientationAttr( "Orientation", XMLNS_DIALOGS_PREFIX ":align" );
     readEvents();
 }
+
 void ElementDescriptor::readProgressBarModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x4 | 0x10 );
@@ -993,8 +973,8 @@ void ElementDescriptor::readProgressBarModel( StyleBag * all_styles )
     readLongAttr( "ProgressValueMax", XMLNS_DIALOGS_PREFIX ":value-max" );
     readEvents();
 }
+
 void ElementDescriptor::readScrollBarModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect styles
     Style aStyle( 0x1 | 0x4 );
@@ -1023,8 +1003,8 @@ void ElementDescriptor::readScrollBarModel( StyleBag * all_styles )
     readDataAwareAttr( XMLNS_DIALOGS_PREFIX ":linked-cell" );
     readEvents();
 }
+
 void ElementDescriptor::readDialogModel( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect elements
     addAttribute( "xmlns:" XMLNS_DIALOGS_PREFIX, XMLNS_DIALOGS_URI );
@@ -1062,7 +1042,6 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles )
 }
 
 void ElementDescriptor::readBullitinBoard( StyleBag * all_styles )
-    SAL_THROW( (Exception) )
 {
     // collect elements
     ::std::vector< ElementDescriptor* > all_elements;

xmlscript/source/xmldlg_imexp/xmldlg_export.cxx

@@ -1108,7 +1108,6 @@ struct StringTriple
 extern StringTriple const * const g_pEventTranslations;
 
 void ElementDescriptor::readEvents()
-    SAL_THROW( (Exception) )
 {
     Reference< script::XScriptEventsSupplier > xSupplier( _xProps, UNO_QUERY );
     if (xSupplier.is())
@@ -1229,8 +1228,8 @@ inline bool equalFont( Style const & style1, Style const & style2 )
         style1._fontEmphasisMark == style2._fontEmphasisMark
         );
 }
+
 OUString StyleBag::getStyleId( Style const & rStyle )
-    SAL_THROW(())
 {
     if (! rStyle._set) // nothin set
     {
@@ -1307,13 +1306,15 @@ OUString StyleBag::getStyleId( Style const & rStyle )
     _styles.push_back( pStyle );
     return pStyle->_id;
 }
-StyleBag::~StyleBag() SAL_THROW(())
+
+StyleBag::~StyleBag()
 {
     for ( size_t nPos = 0; nPos < _styles.size(); ++nPos )
     {
         delete _styles[ nPos ];
     }
 }
+
 void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOut )
 {
     if (! _styles.empty())
@@ -1336,7 +1337,6 @@ void SAL_CALL exportDialogModel(
     Reference< xml::sax::XExtendedDocumentHandler > const & xOut,
     Reference< container::XNameContainer > const & xDialogModel,
     Reference< frame::XModel > const & xDocument )
-    SAL_THROW( (Exception) )
 {
     StyleBag all_styles;
     // window

xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx

@@ -1756,7 +1756,6 @@ BulletinBoardElement::BulletinBoardElement(
     OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes,
     ElementBase * pParent, DialogImport * pImport )
-    SAL_THROW(())
     : ControlElement( rLocalName, xAttributes, pParent, pImport )
 {
     OUString aValue( _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, "left" ) );

xmlscript/source/xmldlg_imexp/xmldlg_import.cxx

@@ -73,7 +73,6 @@ ControlElement::ControlElement(
     OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes,
     ElementBase * pParent, DialogImport * pImport )
-    SAL_THROW(())
     : ElementBase(
         pImport->XMLNS_DIALOGS_UID, rLocalName, xAttributes, pParent, pImport )
 {
@@ -1659,7 +1658,6 @@ ElementBase::ElementBase(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes,
     ElementBase * pParent, DialogImport * pImport )
-    SAL_THROW(())
     : _pImport( pImport )
     , _pParent( pParent )
     , _nUid( nUid )
@@ -1673,8 +1671,8 @@ ElementBase::ElementBase(
         _pParent->acquire();
     }
 }
+
 ElementBase::~ElementBase()
-    SAL_THROW(())
 {
     _pImport->release();
 
@@ -1741,7 +1739,6 @@ Reference< xml::input::XElement > DialogImport::startRootElement(
 }
 
 DialogImport::~DialogImport()
-    SAL_THROW(())
 {
 #if OSL_DEBUG_LEVEL > 1
     SAL_INFO("xmlscript.xmldlg", "DialogImport::~DialogImport()." );
@@ -1766,7 +1763,6 @@ Reference< util::XNumberFormatsSupplier > const & DialogImport::getNumberFormats
 void DialogImport::addStyle(
     OUString const & rStyleId,
     Reference< xml::input::XElement > const & xStyle )
-    SAL_THROW(())
 {
     (*_pStyleNames).push_back( rStyleId );
     (*_pStyles).push_back( xStyle );
@@ -1774,7 +1770,6 @@ void DialogImport::addStyle(
 
 Reference< xml::input::XElement > DialogImport::getStyle(
     OUString const & rStyleId ) const
-    SAL_THROW(())
 {
     for ( size_t nPos = 0; nPos < (*_pStyleNames).size(); ++nPos )
     {
@@ -1790,7 +1785,6 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
     Reference< container::XNameContainer > const & xDialogModel,
     Reference< XComponentContext > const & xContext,
     Reference< XModel > const & xDocument )
-    SAL_THROW( (Exception) )
 {
     // single set of styles and stylenames apply to all containees
     :: boost::shared_ptr< ::std::vector< OUString > > pStyleNames( new ::std::vector< OUString > );

xmlscript/source/xmlflat_imexp/xmlbas_export.cxx

@@ -451,14 +451,12 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
 
     Reference< XInterface > SAL_CALL create_XMLBasicExporter(
         Reference< XComponentContext > const & xContext )
-        SAL_THROW(())
     {
         return static_cast< lang::XTypeProvider * >( new XMLBasicExporter( xContext ) );
     }
 
     Reference< XInterface > SAL_CALL create_XMLOasisBasicExporter(
         Reference< XComponentContext > const & xContext )
-        SAL_THROW(())
     {
         return static_cast< lang::XTypeProvider * >( new XMLOasisBasicExporter( xContext ) );
     }

xmlscript/source/xmlflat_imexp/xmlbas_import.cxx

@@ -730,14 +730,12 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     Reference< XInterface > SAL_CALL create_XMLBasicImporter(
         Reference< XComponentContext > const & xContext )
-        SAL_THROW(())
     {
         return static_cast< lang::XTypeProvider * >( new XMLBasicImporter( xContext ) );
     }
 
     Reference< XInterface > SAL_CALL create_XMLOasisBasicImporter(
         Reference< XComponentContext > const & xContext )
-        SAL_THROW(())
     {
         return static_cast< lang::XTypeProvider * >( new XMLOasisBasicImporter( xContext ) );
     }

xmlscript/source/xmllib_imexp/imp_share.hxx

@@ -37,7 +37,7 @@
 
 namespace xmlscript
 {
-inline sal_Int32 toInt32( OUString const & rStr ) SAL_THROW(())
+inline sal_Int32 toInt32( OUString const & rStr )
 {
     sal_Int32 nVal;
     if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x')
@@ -114,7 +114,7 @@ struct LibraryImport
     sal_Int32 XMLNS_XLINK_UID;
 
 public:
-    LibraryImport( LibDescriptorArray* pLibArray ) SAL_THROW(())
+    LibraryImport( LibDescriptorArray* pLibArray )
         : mpLibArray(pLibArray)
         , mpLibDesc(NULL)
         , XMLNS_LIBRARY_UID(0)
@@ -123,7 +123,7 @@ public:
     }
 
     // Single library mode
-    LibraryImport(LibDescriptor* pLibDesc) SAL_THROW(())
+    LibraryImport(LibDescriptor* pLibDesc)
         : mpLibArray(NULL)
         , mpLibDesc(pLibDesc)
         , XMLNS_LIBRARY_UID(0)
@@ -131,8 +131,7 @@ public:
     {
     }
 
-    virtual ~LibraryImport()
-        SAL_THROW(());
+    virtual ~LibraryImport();
 
     // XRoot
     virtual void SAL_CALL startDocument(
@@ -166,10 +165,8 @@ public:
     LibElementBase(
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
-        LibElementBase * pParent, LibraryImport * pImport )
-        SAL_THROW(());
-    virtual ~LibElementBase()
-        SAL_THROW(());
+        LibElementBase * pParent, LibraryImport * pImport );
+    virtual ~LibElementBase();
 
     // XElement
     virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent()
@@ -215,7 +212,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         LibElementBase * pParent, LibraryImport * pImport )
-        SAL_THROW(())
         : LibElementBase( rLocalName, xAttributes, pParent, pImport )
         {}
 };
@@ -238,7 +234,6 @@ public:
         OUString const & rLocalName,
         css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
         LibElementBase * pParent, LibraryImport * pImport )
-        SAL_THROW(())
         : LibElementBase( rLocalName, xAttributes, pParent, pImport )
     {}
 };

xmlscript/source/xmllib_imexp/xmllib_export.cxx

@@ -33,7 +33,6 @@ void
 SAL_CALL exportLibraryContainer(
     Reference< xml::sax::XWriter > const & xOut,
     const LibDescriptorArray* pLibArray )
-        SAL_THROW( (Exception) )
 {
     xOut->startDocument();
 
@@ -94,7 +93,6 @@ 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) )
 {
     xOut->startDocument();
 

xmlscript/source/xmllib_imexp/xmllib_import.cxx

@@ -84,7 +84,6 @@ LibElementBase::LibElementBase(
     OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes,
     LibElementBase * pParent, LibraryImport * pImport )
-    SAL_THROW(())
     : _pImport( pImport )
     , _pParent( pParent )
     , _aLocalName( rLocalName )
@@ -99,7 +98,6 @@ LibElementBase::LibElementBase(
 }
 
 LibElementBase::~LibElementBase()
-    SAL_THROW(())
 {
     _pImport->release();
 
@@ -173,7 +171,6 @@ Reference< xml::input::XElement > LibraryImport::startRootElement(
 }
 
 LibraryImport::~LibraryImport()
-    SAL_THROW(())
 {
 #if OSL_DEBUG_LEVEL > 1
     SAL_INFO("xmlscript.xmllib", "LibraryImport::~LibraryImport()." );
@@ -266,7 +263,6 @@ void LibraryElement::endElement()
 
 Reference< ::com::sun::star::xml::sax::XDocumentHandler >
 SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
-        SAL_THROW( (Exception) )
 {
     return ::xmlscript::createDocumentHandler(
         static_cast< xml::input::XRoot * >( new LibraryImport( pLibArray ) ) );
@@ -274,7 +270,6 @@ SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray )
 
 ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >
 SAL_CALL importLibrary( LibDescriptor& rLib )
-        SAL_THROW( (::com::sun::star::uno::Exception) )
 {
     return ::xmlscript::createDocumentHandler(
         static_cast< xml::input::XRoot * >( new LibraryImport( &rLib ) ) );

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()

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();
 

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 ) ) );