diff options
Diffstat (limited to 'extensions/source/plugin/base')
| -rw-r--r-- | extensions/source/plugin/base/context.cxx | 46 | ||||
| -rw-r--r-- | extensions/source/plugin/base/evtlstnr.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/base/manager.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/plugin/base/multiplx.cxx | 46 | ||||
| -rw-r--r-- | extensions/source/plugin/base/plctrl.cxx | 54 | ||||
| -rw-r--r-- | extensions/source/plugin/base/plmodel.cxx | 18 | ||||
| -rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 24 |
7 files changed, 98 insertions, 98 deletions
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 2edf862b6090..8ad3ceebe9ca 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -77,9 +77,9 @@ public: virtual ~FileSink(); // ::com::sun::star::io::XOutputStream - virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(); - virtual void SAL_CALL flush() throw(); - virtual void SAL_CALL closeOutput() throw(); + virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(std::exception); + virtual void SAL_CALL flush() throw(std::exception); + virtual void SAL_CALL closeOutput() throw(std::exception); }; } @@ -95,17 +95,17 @@ public: virtual ~XPluginContext_Impl(); - virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); }; -Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw() +Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw(std::exception) { return new XPluginContext_Impl( m_xContext ); } @@ -121,13 +121,13 @@ XPluginContext_Impl::~XPluginContext_Impl() } OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException ) + throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { return OUString(); } -void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) +void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); @@ -178,7 +178,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu } void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException ) + throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { getURL( plugin, url, target ); if( listener.is() ) @@ -186,18 +186,18 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin } OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) - throw( ::com::sun::star::plugin::PluginException, RuntimeException ) + throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { return OUString("Mozilla 3.0"); } void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) - throw( ::com::sun::star::plugin::PluginException, RuntimeException ) + throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { } void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) - throw( ::com::sun::star::plugin::PluginException, RuntimeException ) + throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { Sequence< sal_Int8 > aBuf; @@ -255,7 +255,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl } void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException ) + throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { postURL( plugin, url, target, buf, file ); if( listener.is() ) @@ -263,7 +263,7 @@ void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugi } void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException ) + throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) { FileSink* pNewSink = new FileSink( m_xContext, plugin, mimetype, target, source ); pNewSink->acquire(); @@ -295,7 +295,7 @@ FileSink::~FileSink() osl::File::remove( m_aFileName ); } -void FileSink::closeOutput() throw() +void FileSink::closeOutput() throw(std::exception) { if( fp ) fclose( fp ); @@ -332,7 +332,7 @@ void FileSink::closeOutput() throw() release(); } -void FileSink::writeBytes( const Sequence<sal_Int8>& Buffer ) throw() +void FileSink::writeBytes( const Sequence<sal_Int8>& Buffer ) throw(std::exception) { if( fp ) { @@ -342,7 +342,7 @@ void FileSink::writeBytes( const Sequence<sal_Int8>& Buffer ) throw() } } -void FileSink::flush() throw() +void FileSink::flush() throw(std::exception) { if( fp ) fflush( fp ); diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx index 34a30ccb9b3c..1552a9b87285 100644 --- a/extensions/source/plugin/base/evtlstnr.cxx +++ b/extensions/source/plugin/base/evtlstnr.cxx @@ -63,7 +63,7 @@ PluginEventListener::~PluginEventListener() free( m_pNormalizedUrl ); } -void PluginEventListener::disposing( const ::com::sun::star::lang::EventObject& /*rEvt*/ ) throw() +void PluginEventListener::disposing( const ::com::sun::star::lang::EventObject& /*rEvt*/ ) throw(std::exception) { m_pPlugin->getPluginComm()-> NPP_URLNotify( m_pPlugin->getNPPInstance(), diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 770da5ad37cc..f0c55cfdefff 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -173,7 +173,7 @@ XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< ::c return NULL; } -Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw() +Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw(std::exception) { Sequence<com::sun::star::plugin::PluginDescription> aRet; @@ -188,7 +188,7 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug } Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) - throw( RuntimeException,::com::sun::star::plugin::PluginException ) + throw( RuntimeException,::com::sun::star::plugin::PluginException, std::exception ) { XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); pImpl->setPluginContext( acontext ); @@ -203,7 +203,7 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin return pImpl; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw() +Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw(std::exception) { XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl; diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx index f5c1a8507b7d..ddc92b955701 100644 --- a/extensions/source/plugin/base/multiplx.cxx +++ b/extensions/source/plugin/base/multiplx.cxx @@ -163,7 +163,7 @@ void MRCListenerMultiplexerHelper::unadvise(const Type & type, const Reference< } // ::com::sun::star::lang::XEventListener -void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::EventObject& ) throw() +void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::EventObject& ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( aMutex ); // peer is disposed, clear the reference @@ -199,133 +199,133 @@ if( pCont ) \ } // ::com::sun::star::awt::XFocusListener -void MRCListenerMultiplexerHelper::focusGained(const ::com::sun::star::awt::FocusEvent& e) throw() +void MRCListenerMultiplexerHelper::focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XFocusListener, focusGained, ::com::sun::star::awt::FocusEvent ) } // ::com::sun::star::awt::XFocusListener -void MRCListenerMultiplexerHelper::focusLost(const ::com::sun::star::awt::FocusEvent& e) throw() +void MRCListenerMultiplexerHelper::focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XFocusListener, focusLost, ::com::sun::star::awt::FocusEvent ) } // ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowResized(const ::com::sun::star::awt::WindowEvent& e) throw() +void MRCListenerMultiplexerHelper::windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowResized, ::com::sun::star::awt::WindowEvent ) } // ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw() +void MRCListenerMultiplexerHelper::windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowMoved, ::com::sun::star::awt::WindowEvent ) } // ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowShown(const ::com::sun::star::lang::EventObject& e) throw() +void MRCListenerMultiplexerHelper::windowShown(const ::com::sun::star::lang::EventObject& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowShown, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowHidden(const ::com::sun::star::lang::EventObject& e) throw() +void MRCListenerMultiplexerHelper::windowHidden(const ::com::sun::star::lang::EventObject& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowHidden, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XKeyListener -void MRCListenerMultiplexerHelper::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw() +void MRCListenerMultiplexerHelper::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XKeyListener, keyPressed, ::com::sun::star::awt::KeyEvent ) } // ::com::sun::star::awt::XKeyListener -void MRCListenerMultiplexerHelper::keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw() +void MRCListenerMultiplexerHelper::keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XKeyListener, keyReleased, ::com::sun::star::awt::KeyEvent ) } // ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw() +void MRCListenerMultiplexerHelper::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XMouseListener, mousePressed, ::com::sun::star::awt::MouseEvent ) } // ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw() +void MRCListenerMultiplexerHelper::mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseReleased, ::com::sun::star::awt::MouseEvent ) } // ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw() +void MRCListenerMultiplexerHelper::mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseEntered, ::com::sun::star::awt::MouseEvent ) } // ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw() +void MRCListenerMultiplexerHelper::mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseExited, ::com::sun::star::awt::MouseEvent ) } // ::com::sun::star::awt::XMouseMotionListener -void MRCListenerMultiplexerHelper::mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw() +void MRCListenerMultiplexerHelper::mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XMouseMotionListener, mouseDragged, ::com::sun::star::awt::MouseEvent ) } // ::com::sun::star::awt::XMouseMotionListener -void MRCListenerMultiplexerHelper::mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw() +void MRCListenerMultiplexerHelper::mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XMouseMotionListener, mouseMoved, ::com::sun::star::awt::MouseEvent ) } // ::com::sun::star::awt::XPaintListener -void MRCListenerMultiplexerHelper::windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw() +void MRCListenerMultiplexerHelper::windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XPaintListener, windowPaint, ::com::sun::star::awt::PaintEvent ) } // ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowOpened(const ::com::sun::star::lang::EventObject& e) throw() +void MRCListenerMultiplexerHelper::windowOpened(const ::com::sun::star::lang::EventObject& e) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowOpened, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw() +void MRCListenerMultiplexerHelper::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowClosing, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowClosed( const ::com::sun::star::lang::EventObject& e ) throw() +void MRCListenerMultiplexerHelper::windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowClosed, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw() +void MRCListenerMultiplexerHelper::windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowMinimized, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw() +void MRCListenerMultiplexerHelper::windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowNormalized, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowActivated( const ::com::sun::star::lang::EventObject& e ) throw() +void MRCListenerMultiplexerHelper::windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowActivated, ::com::sun::star::lang::EventObject ) } // ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw() +void MRCListenerMultiplexerHelper::windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) } diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index 04d03bbce4cf..56085ed6beb4 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -66,21 +66,21 @@ MRCListenerMultiplexerHelper* PluginControl_Impl::getMultiplexer() //================================================================================================== void PluginControl_Impl::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { _aDisposeListeners.push_back( l ); } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- void PluginControl_Impl::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { _aDisposeListeners.remove( l ); } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- void PluginControl_Impl::dispose(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // send disposing events ::com::sun::star::lang::EventObject aEvt; @@ -95,7 +95,7 @@ void PluginControl_Impl::dispose(void) //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { _nX = nX_ >=0 ? nX_ : 0; _nY = nY_ >=0 ? nY_ : 0; @@ -109,14 +109,14 @@ void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWi //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- ::com::sun::star::awt::Rectangle PluginControl_Impl::getPosSize(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return _xPeerWindow->getPosSize(); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setVisible( sal_Bool bVisible ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { _bVisible = bVisible; if (_xPeerWindow.is()) @@ -125,7 +125,7 @@ void PluginControl_Impl::setVisible( sal_Bool bVisible ) //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setEnable( sal_Bool bEnable ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { _bEnable = bEnable; if (_xPeerWindow.is()) @@ -133,7 +133,7 @@ void PluginControl_Impl::setEnable( sal_Bool bEnable ) } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::setFocus(void) throw( RuntimeException ) +void PluginControl_Impl::setFocus(void) throw( RuntimeException, std::exception ) { if (_xPeerWindow.is()) _xPeerWindow->setFocus(); @@ -156,7 +156,7 @@ void PluginControl_Impl::releasePeer() //---- ::com::sun::star::awt::XControl ------------------------------------------------------------------------------------ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XToolkit > & /*xToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer > & xParentPeer ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (_xPeer.is()) { @@ -196,7 +196,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo //---- ::com::sun::star::awt::XControl ------------------------------------------------------------------------------------ void PluginControl_Impl::setDesignMode( sal_Bool bOn ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { _bInDesignMode = bOn; if (_xPeerWindow.is()) @@ -205,84 +205,84 @@ void PluginControl_Impl::setDesignMode( sal_Bool bOn ) //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::addPaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XPaintListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::removePaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XPaintListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::addWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XWindowListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::removeWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XWindowListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::addFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XFocusListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::removeFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XFocusListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::addKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XKeyListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::removeKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XKeyListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::addMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::removeMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->advise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseMotionListener >*)0), l ); } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::removeMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { getMultiplexer()->unadvise( ::getCppuType((const Reference< ::com::sun::star::awt::XMouseMotionListener >*)0), l ); } @@ -290,33 +290,33 @@ void PluginControl_Impl::removeMouseMotionListener( const Reference< ::com::sun: //---- ::com::sun::star::awt::XView --------------------------------------------------------------------------------------- void PluginControl_Impl::draw( sal_Int32 /*x*/, sal_Int32 /*y*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // has to be done by further implementation of control } //---- ::com::sun::star::awt::XView --------------------------------------------------------------------------------------- void PluginControl_Impl::setZoom( float /*ZoomX*/, float /*ZoomY*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // has to be done by further implementation of control } //---- ::com::sun::star::lang::XEventListener ------------------------------------------------------------------------------ void PluginControl_Impl::disposing( const ::com::sun::star::lang::EventObject & /*rSource*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { } //---- ::com::sun::star::awt::XFocusListener ------------------------------------------------------------------------------ void PluginControl_Impl::focusGained( const ::com::sun::star::awt::FocusEvent & /*rEvt*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (_xPeerWindow.is()) _xPeerWindow->setFocus(); } //---- ::com::sun::star::awt::XFocusListener ------------------------------------------------------------------------------ void PluginControl_Impl::focusLost( const ::com::sun::star::awt::FocusEvent & /*rEvt*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { } diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 5628c92197bc..a42ffce99c12 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -38,7 +38,7 @@ Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< :: return xService; } -Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) +Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException, std::exception ) { Any aRet( ::cppu::queryInterface( type, static_cast< ::com::sun::star::lang::XComponent* >(this), @@ -100,7 +100,7 @@ PluginModel::~PluginModel() { } -Reference< ::com::sun::star::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() throw() +Reference< ::com::sun::star::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() throw(std::exception) { static Reference< ::com::sun::star::beans::XPropertySetInfo > aInfo = createPropertySetInfo( *this ); @@ -134,7 +134,7 @@ sal_Bool PluginModel::convertFastPropertyValue( Any & rConvertedValue, void PluginModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw(::com::sun::star::uno::Exception) + throw(::com::sun::star::uno::Exception, std::exception) { if( rValue.getValueTypeClass() == TypeClass_STRING ) // FIXME wrong type! @@ -157,19 +157,19 @@ void PluginModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const t } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw() +void PluginModel::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(std::exception) { m_aDisposeListeners.push_back( l ); } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw() +void PluginModel::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(std::exception) { m_aDisposeListeners.remove( l ); } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::dispose(void) throw() +void PluginModel::dispose(void) throw(std::exception) { // send disposing events ::com::sun::star::lang::EventObject aEvt; @@ -186,17 +186,17 @@ void PluginModel::dispose(void) throw() // ::com::sun::star::io::XPersistObject -OUString PluginModel::getServiceName() throw() +OUString PluginModel::getServiceName() throw(std::exception) { return OUString("com.sun.star.plugin.PluginModel"); } -void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() +void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw(std::exception) { OutStream->writeUTF( m_aCreationURL ); } -void PluginModel::read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream) throw() +void PluginModel::read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream) throw(std::exception) { m_aCreationURL = InStream->readUTF(); } diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 931ecc060bc4..2e1809539307 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -95,12 +95,12 @@ void PluginDisposer::onShot() release(); } -Any XPlugin_Impl::queryInterface( const Type& type ) throw( RuntimeException ) +Any XPlugin_Impl::queryInterface( const Type& type ) throw( RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( type ); } -Any XPlugin_Impl::queryAggregation( const Type& type ) throw( RuntimeException ) +Any XPlugin_Impl::queryAggregation( const Type& type ) throw( RuntimeException, std::exception ) { Any aRet( cppu::queryInterface( type, static_cast< XPlugin* >(this) ) ); if( ! aRet.hasValue() ) @@ -229,7 +229,7 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ ) return 0; } -void XPlugin_Impl::dispose() throw() +void XPlugin_Impl::dispose() throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -469,7 +469,7 @@ OUString XPlugin_Impl::getCreationURL() sal_Bool XPlugin_Impl::setModel( const uno::Reference< com::sun::star::awt::XControlModel > & Model ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); @@ -488,7 +488,7 @@ sal_Bool XPlugin_Impl::setModel( const uno::Reference< com::sun::star::awt::XCon } void XPlugin_Impl::createPeer( const uno::Reference< com::sun::star::awt::XToolkit > & xToolkit, const uno::Reference< com::sun::star::awt::XWindowPeer > & Parent ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); @@ -643,7 +643,7 @@ PluginStream* XPlugin_Impl::getStreamFromNPStream( NPStream* stream ) sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, const uno::Reference< com::sun::star::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, - sal_Int32 lastmodified, sal_Bool isfile) throw() + sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -831,11 +831,11 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, return bRet; } -void XPlugin_Impl::disposing( const com::sun::star::lang::EventObject& /*rSource*/ ) throw() +void XPlugin_Impl::disposing( const com::sun::star::lang::EventObject& /*rSource*/ ) throw(std::exception) { } -void XPlugin_Impl::propertyChange( const com::sun::star::beans::PropertyChangeEvent& rEvent ) throw() +void XPlugin_Impl::propertyChange( const com::sun::star::beans::PropertyChangeEvent& rEvent ) throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -860,7 +860,7 @@ void XPlugin_Impl::setPluginContext( const uno::Reference< XPluginContext > & rC } void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); @@ -1062,7 +1062,7 @@ void PluginInputStream::setMode( sal_Int32 nMode ) } } -void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) throw() +void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) throw(std::exception) { Guard< Mutex > aGuard( m_pPlugin->getMutex() ); @@ -1111,7 +1111,7 @@ void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) throw() } } -void PluginInputStream::closeOutput() throw() +void PluginInputStream::closeOutput() throw(std::exception) { Guard< Mutex > aGuard( m_pPlugin->getMutex() ); @@ -1130,7 +1130,7 @@ sal_uInt32 PluginInputStream::read( sal_uInt32 offset, sal_Int8* buffer, sal_uIn return m_aFileStream.Read( buffer, size ); } -void PluginInputStream::flush(void) throw() +void PluginInputStream::flush(void) throw(std::exception) { } |