diff options
author | Philipp Lohmann <pl@openoffice.org> | 2001-09-11 11:06:16 +0000 |
---|---|---|
committer | Philipp Lohmann <pl@openoffice.org> | 2001-09-11 11:06:16 +0000 |
commit | ede9d0ba85c53a2747897445f461244edbb65406 (patch) | |
tree | 0eb7dbf32f9b8e5582f5651abb5c337d78ef9262 | |
parent | 7395b164cb6541a9da2aee53f063510947d07e1f (diff) |
#92075# changes for new Solaris compiler
-rw-r--r-- | extensions/source/plugin/base/context.cxx | 18 | ||||
-rw-r--r-- | extensions/source/plugin/base/evtlstnr.cxx | 6 | ||||
-rw-r--r-- | extensions/source/plugin/base/manager.cxx | 8 | ||||
-rw-r--r-- | extensions/source/plugin/base/multiplx.cxx | 78 | ||||
-rw-r--r-- | extensions/source/plugin/base/plmodel.cxx | 38 | ||||
-rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 27 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/impl.hxx | 47 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/model.hxx | 34 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/multiplx.hxx | 50 |
9 files changed, 141 insertions, 165 deletions
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 063b707858b7..4109333c2f87 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -2,9 +2,9 @@ * * $RCSfile: context.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: pl $ $Date: 2001-05-14 09:43:44 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,9 +100,9 @@ public: virtual ~FileSink(); // ::com::sun::star::io::XOutputStream - virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ); - virtual void SAL_CALL flush(); - virtual void SAL_CALL closeOutput(); + virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(); + virtual void SAL_CALL flush() throw(); + virtual void SAL_CALL closeOutput() throw(); }; } @@ -128,7 +128,7 @@ public: virtual ::rtl::OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); }; -Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() +Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw() { return new XPluginContext_Impl( m_xSMgr ); } @@ -310,7 +310,7 @@ FileSink::~FileSink() aEntry.Kill(); } -void FileSink::closeOutput() +void FileSink::closeOutput() throw() { if( fp ) fclose( fp ); @@ -342,13 +342,13 @@ void FileSink::closeOutput() release(); } -void FileSink::writeBytes( const Sequence<sal_Int8>& Buffer ) +void FileSink::writeBytes( const Sequence<sal_Int8>& Buffer ) throw() { if( fp ) fwrite( Buffer.getConstArray(), 1, Buffer.getLength(), fp ); } -void FileSink::flush() +void FileSink::flush() throw() { if( fp ) fflush( fp ); diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx index 0579e7c09105..49474d4a5ca8 100644 --- a/extensions/source/plugin/base/evtlstnr.cxx +++ b/extensions/source/plugin/base/evtlstnr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: evtlstnr.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:16:51 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ PluginEventListener::~PluginEventListener() free( m_pNormalizedUrl ); } -void PluginEventListener::disposing( const ::com::sun::star::lang::EventObject& rEvt ) +void PluginEventListener::disposing( const ::com::sun::star::lang::EventObject& rEvt ) throw() { 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 0f8712cc819c..4128f4837100 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: manager.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pl $ $Date: 2001-05-14 09:43:44 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,10 +237,10 @@ 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< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const ::rtl::OUString& url ) +Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const ::rtl::OUString& url ) throw() { XPlugin_Impl* pImpl = new XPlugin_Impl( m_xSMgr ); - Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl; // festhalten... + Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl; pImpl->setPluginContext( acontext ); diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx index d2ba82df78d7..9b89a2cc6252 100644 --- a/extensions/source/plugin/base/multiplx.cxx +++ b/extensions/source/plugin/base/multiplx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: multiplx.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:16:51 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,7 +195,7 @@ void MRCListenerMultiplexerHelper::unadvise(const Type & type, const Reference< } // ::com::sun::star::lang::XEventListener -void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::EventObject& ) +void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::EventObject& ) throw() { ::osl::Guard< ::osl::Mutex > aGuard( aMutex ); // peer is disposed, clear the reference @@ -231,161 +231,133 @@ if( pCont ) \ } // ::com::sun::star::awt::XFocusListener -void MRCListenerMultiplexerHelper::focusGained(const ::com::sun::star::awt::FocusEvent& e) +void MRCListenerMultiplexerHelper::focusGained(const ::com::sun::star::awt::FocusEvent& e) throw() { -/* - OInterfaceContainerHelper * pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< ::com::sun::star::awt::XFocusListener >*)0) ); - if( pCont ) - { - OInterfaceIteratorHelper aIt( *pCont ); - ::com::sun::star::awt::FocusEvent aEvt = e; - // Reamark: The control is the event source not the peer. We must change - // the source of the event - xControl.queryHardRef( ((XInterface*)NULL)->getSmartUik(), aEvt.Source ); - //.is the control not destroyed - if( aEvt.Source.is() ) - { - if( aIt.hasMoreElements() ) - { - ::com::sun::star::awt::XFocusListener * pListener = (::com::sun::star::awt::XFocusListener *)aIt.next(); - TRY - { - pListener->focusGained( aEvt ); - } - CATCH( RuntimeException, e ) - { - // ignore all usr system exceptions from the listener - } - END_CATCH; - } - } - } -*/ 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) +void MRCListenerMultiplexerHelper::focusLost(const ::com::sun::star::awt::FocusEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::windowResized(const ::com::sun::star::awt::WindowEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::windowShown(const ::com::sun::star::lang::EventObject& e) throw() { 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) +void MRCListenerMultiplexerHelper::windowHidden(const ::com::sun::star::lang::EventObject& e) throw() { 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) +void MRCListenerMultiplexerHelper::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw() { 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) +void MRCListenerMultiplexerHelper::windowOpened(const ::com::sun::star::lang::EventObject& e) throw() { 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 ) +void MRCListenerMultiplexerHelper::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw() { 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 ) +void MRCListenerMultiplexerHelper::windowClosed( const ::com::sun::star::lang::EventObject& e ) throw() { 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 ) +void MRCListenerMultiplexerHelper::windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw() { 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 ) +void MRCListenerMultiplexerHelper::windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw() { 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 ) +void MRCListenerMultiplexerHelper::windowActivated( const ::com::sun::star::lang::EventObject& e ) throw() { 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 ) +void MRCListenerMultiplexerHelper::windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw() { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) } diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 702699f36ad1..b48463e90c44 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: plmodel.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:16:51 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< :: return xService; } -Any PluginModel::queryAggregation( const Type& type ) +Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) { Any aRet( ::cppu::queryInterface( type, static_cast< ::com::sun::star::lang::XComponent* >(this), @@ -88,14 +88,14 @@ Any PluginModel::queryAggregation( const Type& type ) // ::com::sun::star::lang::XServiceInfo -::rtl::OUString PluginModel::getImplementationName() throw( ) +::rtl::OUString PluginModel::getImplementationName() throw() { return getImplementationName_Static(); } // ::com::sun::star::lang::XServiceInfo -sal_Bool PluginModel::supportsService(const ::rtl::OUString& ServiceName) throw( ) +sal_Bool PluginModel::supportsService(const ::rtl::OUString& ServiceName) throw() { Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); const ::rtl::OUString * pArray = aSNL.getConstArray(); @@ -106,13 +106,13 @@ sal_Bool PluginModel::supportsService(const ::rtl::OUString& ServiceName) throw( } // ::com::sun::star::lang::XServiceInfo -Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames(void) throw( ) +Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames(void) throw() { return getSupportedServiceNames_Static(); } // XPluginManager_Impl -Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw( ) +Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { Sequence< ::rtl::OUString > aSNS( 1 ); aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); @@ -152,7 +152,7 @@ PluginModel::~PluginModel() { } -Reference< ::com::sun::star::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() +Reference< ::com::sun::star::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() throw() { static Reference< ::com::sun::star::beans::XPropertySetInfo > aInfo = createPropertySetInfo( *this ); @@ -165,9 +165,9 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > PluginModel::getProperty } sal_Bool PluginModel::convertFastPropertyValue( Any & rConvertedValue, - Any & rOldValue, - sal_Int32 nHandle, - const Any& rValue ) + Any & rOldValue, + sal_Int32 nHandle, + const Any& rValue ) throw() { if( rValue.getValueTypeClass() == typelib_TypeClass_STRING ) @@ -181,7 +181,7 @@ sal_Bool PluginModel::convertFastPropertyValue( Any & rConvertedValue, void PluginModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw( ::com::sun::star::lang::IllegalArgumentException ) + throw() { if( rValue.getValueTypeClass() == typelib_TypeClass_STRING ) @@ -192,25 +192,25 @@ void PluginModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, throw ::com::sun::star::lang::IllegalArgumentException(); } -void PluginModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const +void PluginModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw() { rValue <<= m_aCreationURL; } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) +void PluginModel::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw() { m_aDisposeListeners.push_back( l ); } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) +void PluginModel::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw() { m_aDisposeListeners.remove( l ); } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::dispose(void) +void PluginModel::dispose(void) throw() { // send disposing events ::com::sun::star::lang::EventObject aEvt; @@ -227,17 +227,17 @@ void PluginModel::dispose(void) // ::com::sun::star::io::XPersistObject -::rtl::OUString PluginModel::getServiceName() +::rtl::OUString PluginModel::getServiceName() throw() { return ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); } -void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) +void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() { OutStream->writeUTF( m_aCreationURL ); } -void PluginModel::read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream) +void PluginModel::read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream) throw() { m_aCreationURL = InStream->readUTF(); } diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 83e25a39fb2f..eb71a751ddf1 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xplugin.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kso $ $Date: 2001-06-15 06:56:52 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,13 +117,12 @@ void PluginDisposer::onShot() //================================================================================================== -Any XPlugin_Impl::queryInterface( const Type& type ) - +Any XPlugin_Impl::queryInterface( const Type& type ) throw( RuntimeException ) { return OWeakAggObject::queryInterface( type ); } -Any XPlugin_Impl::queryAggregation( const Type& type ) +Any XPlugin_Impl::queryAggregation( const Type& type ) throw( RuntimeException ) { Any aRet( ::cppu::queryInterface( type, static_cast< ::com::sun::star::plugin::XPlugin* >(this) ) ); if( ! aRet.hasValue() ) @@ -266,7 +265,7 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, pThis ) return 0; } -void XPlugin_Impl::dispose() +void XPlugin_Impl::dispose() throw() { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -516,9 +515,9 @@ PluginStream* XPlugin_Impl::getStreamFromNPStream( NPStream* stream ) } sal_Bool XPlugin_Impl::provideNewStream(const ::rtl::OUString& mimetype, - const Reference< ::com::sun::star::io::XActiveDataSource > & stream, - const ::rtl::OUString& url, sal_Int32 length, - sal_Int32 lastmodified, sal_Bool isfile) + const Reference< ::com::sun::star::io::XActiveDataSource > & stream, + const ::rtl::OUString& url, sal_Int32 length, + sal_Int32 lastmodified, sal_Bool isfile) throw() { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -651,11 +650,11 @@ sal_Bool XPlugin_Impl::provideNewStream(const ::rtl::OUString& mimetype, return bRet; } -void XPlugin_Impl::disposing( const ::com::sun::star::lang::EventObject& rSource ) +void XPlugin_Impl::disposing( const ::com::sun::star::lang::EventObject& rSource ) throw() { } -void XPlugin_Impl::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) +void XPlugin_Impl::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw() { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -830,7 +829,7 @@ void PluginInputStream::setMode( sal_uInt32 nMode ) } } -void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) +void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) throw() { ::osl::Guard< ::osl::Mutex > aGuard( m_pPlugin->getMutex() ); @@ -885,7 +884,7 @@ void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) m_pPlugin->getNPWindow()); } -void PluginInputStream::closeOutput() +void PluginInputStream::closeOutput() throw() { ::osl::Guard< ::osl::Mutex > aGuard( m_pPlugin->getMutex() ); @@ -906,7 +905,7 @@ sal_uInt32 PluginInputStream::read( sal_uInt32 offset, sal_Int8* buffer, sal_uIn return nBytes; } -void PluginInputStream::flush(void) +void PluginInputStream::flush(void) throw() { } diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index f530a4d6ca19..ccc59d825aa7 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: impl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: pl $ $Date: 2000-12-07 19:29:03 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -293,15 +293,18 @@ public: // static const Reference< ::com::sun::star::reflection::XIdlClass > & staticGetIdlClass(); // XInterface - virtual Any SAL_CALL queryInterface( const Type& ); - virtual void SAL_CALL acquire() { OWeakAggObject::acquire(); } - virtual void SAL_CALL release() { OWeakAggObject::release(); } + virtual Any SAL_CALL queryInterface( const Type& ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL acquire() throw( ::com::sun::star::uno::RuntimeException ) + { OWeakAggObject::acquire(); } + virtual void SAL_CALL release() throw( ::com::sun::star::uno::RuntimeException ) + { OWeakAggObject::release(); } // OWeakAggObject - virtual Any SAL_CALL queryAggregation( const Type& ); + virtual Any SAL_CALL queryAggregation( const Type& ) + throw( ::com::sun::star::uno::RuntimeException ); // PluginContol_Impl - virtual void SAL_CALL dispose(); + virtual void SAL_CALL dispose() throw(); virtual void SAL_CALL createPeer( const Reference< ::com::sun::star::awt::XToolkit > & xToolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & Parent) throw( RuntimeException ); virtual sal_Bool SAL_CALL setModel( const Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException ); @@ -311,11 +314,11 @@ public: virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException ); // ::com::sun::star::plugin::XPlugin - virtual sal_Bool SAL_CALL provideNewStream(const ::rtl::OUString& mimetype, const Reference< ::com::sun::star::io::XActiveDataSource > & stream, const ::rtl::OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile); + virtual sal_Bool SAL_CALL provideNewStream(const ::rtl::OUString& mimetype, const Reference< ::com::sun::star::io::XActiveDataSource > & stream, const ::rtl::OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(); // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ); - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw(); }; class PluginManager @@ -353,16 +356,16 @@ public: static XPlugin_Impl* getFirstXPlugin(); static XPlugin_Impl* getPluginImplementation( const Reference< ::com::sun::star::plugin::XPlugin >& plugin ); - virtual Reference< ::com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext(); + virtual Reference< ::com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw(); // has to be implemented per system - virtual Sequence< ::com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw( ); + virtual Sequence< ::com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw(); virtual Reference< ::com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ); - virtual Reference< ::com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const ::rtl::OUString& url ); + virtual Reference< ::com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const ::rtl::OUString& url ) throw(); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(); virtual ::rtl::OUString SAL_CALL getImplementationName() throw(); Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); @@ -429,19 +432,19 @@ public: void load(); // XOutputStream - virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ); - virtual void SAL_CALL flush(); - virtual void SAL_CALL closeOutput(); + virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(); + virtual void SAL_CALL flush() throw(); + virtual void SAL_CALL closeOutput() throw(); // XConnectable - virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPredecessor ) + virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPredecessor ) throw() { m_xPredecessor = xPredecessor; } - virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() + virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw() { return m_xPredecessor; } - virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSuccessor ) + virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSuccessor ) throw() { m_xSuccessor = xSuccessor; } - virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() + virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw() { return m_xSuccessor; } }; @@ -480,7 +483,7 @@ public: void* getNotifyData() { return m_pNotifyData; } // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(); }; #endif diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index da1f03bbb917..3f8ada07d282 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -2,9 +2,9 @@ * * $RCSfile: model.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: svesik $ $Date: 2000-11-23 21:45:30 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,12 +138,14 @@ class PluginModel : public BroadcasterHelperHolder, const ::rtl::OUString& getCreationURL() { return m_aCreationURL; } // XInterface - virtual Any SAL_CALL queryInterface( const Type& rType ) + virtual Any SAL_CALL queryInterface( const Type& rType ) throw( ::com::sun::star::uno::RuntimeException ) { return OWeakAggObject::queryInterface( rType ); } - virtual void SAL_CALL acquire() { OWeakAggObject::acquire(); } - virtual void SAL_CALL release() { OWeakAggObject::release(); } + virtual void SAL_CALL acquire() throw( ::com::sun::star::uno::RuntimeException ) + { OWeakAggObject::acquire(); } + virtual void SAL_CALL release() throw( ::com::sun::star::uno::RuntimeException ) + { OWeakAggObject::release(); } - virtual Any SAL_CALL queryAggregation( const Type& ); + virtual Any SAL_CALL queryAggregation( const Type& ) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XTypeProvider @@ -165,22 +167,22 @@ class PluginModel : public BroadcasterHelperHolder, virtual sal_Bool SAL_CALL convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, - const Any& rValue ); + const Any& rValue ) throw(); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw( ::com::sun::star::lang::IllegalArgumentException ); - virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const; - virtual Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(); + throw(); + virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw(); + virtual Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName(); - virtual void SAL_CALL write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream); - virtual void SAL_CALL read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(); + virtual void SAL_CALL write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw(); + virtual void SAL_CALL read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream) throw(); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ); - virtual void SAL_CALL removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ); - virtual void SAL_CALL dispose(); + virtual void SAL_CALL addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(); + virtual void SAL_CALL removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(); + virtual void SAL_CALL dispose() throw(); }; Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx index 890bbff168e3..b35ad9f12f75 100644 --- a/extensions/source/plugin/inc/plugin/multiplx.hxx +++ b/extensions/source/plugin/inc/plugin/multiplx.hxx @@ -2,9 +2,9 @@ * * $RCSfile: multiplx.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:16:51 $ + * last change: $Author: pl $ $Date: 2001-09-11 12:06:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -189,36 +189,36 @@ public: void unadvise(const Type& type, const Reference< XInterface > & listener); // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source); + void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(); // ::com::sun::star::awt::XFocusListener - void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e); - void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e); + void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(); + void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(); // ::com::sun::star::awt::XWindowListener - void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& e); - void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& e); - void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& e); - void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& e); + void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(); + void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(); + void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& e) throw(); + void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& e) throw(); // ::com::sun::star::awt::XKeyListener - void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ); - void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ); + void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(); + void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(); // ::com::sun::star::awt::XMouseListener - void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e); - void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e); - void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e); - void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e); + void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(); + void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(); + void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(); + void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(); // ::com::sun::star::awt::XMouseMotionListener - void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& e); - void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& e); + void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(); + void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(); // ::com::sun::star::awt::XPaintListener - void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& e); + void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(); // ::com::sun::star::awt::XTopWindowListener - void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ); - void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ); - void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ); - void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ); - void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ); - void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ); - void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ); + void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(); + void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(); + void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(); + void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(); + void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(); + void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(); + void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(); protected: /** * Remove the listener with the uik rUik from the peer rPeer. |