diff options
Diffstat (limited to 'framework/source/tabwin')
-rw-r--r-- | framework/source/tabwin/tabwindow.cxx | 52 | ||||
-rw-r--r-- | framework/source/tabwin/tabwinfactory.cxx | 4 |
2 files changed, 28 insertions, 28 deletions
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 21061fe1a0b1..1469e1a53d1b 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -271,7 +271,7 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) -throw (css::uno::Exception, css::uno::RuntimeException) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { const OUString aTopWindowArgName( "TopWindow" ); const OUString aSizeArgName( "Size" ); @@ -426,7 +426,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) // XComponent -void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException) +void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::exception) { // Send message to all listener and forget her references. css::uno::Reference< css::lang::XComponent > xThis( @@ -466,7 +466,7 @@ void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -479,7 +479,7 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -495,7 +495,7 @@ throw (css::uno::RuntimeException) // XEventListener void SAL_CALL TabWindow::disposing( const css::lang::EventObject& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { } @@ -503,18 +503,18 @@ throw( css::uno::RuntimeException ) // XWindowListener void SAL_CALL TabWindow::windowResized( const css::awt::WindowEvent& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { implts_LayoutWindows(); } void SAL_CALL TabWindow::windowMoved( const css::awt::WindowEvent& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { } void SAL_CALL TabWindow::windowShown( const css::lang::EventObject& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -532,7 +532,7 @@ throw( css::uno::RuntimeException ) } void SAL_CALL TabWindow::windowHidden( const css::lang::EventObject& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -552,12 +552,12 @@ throw( css::uno::RuntimeException ) // XTopWindowListener void SAL_CALL TabWindow::windowOpened( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowClosing( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { css::uno::Reference< css::lang::XComponent > xComponent( (OWeakObject *)this, css::uno::UNO_QUERY ); if ( xComponent.is() ) @@ -565,27 +565,27 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::windowClosed( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowMinimized( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowNormalized( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowActivated( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowDeactivated( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } @@ -594,7 +594,7 @@ throw (css::uno::RuntimeException) ::sal_Int32 SAL_CALL TabWindow::insertTab() -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -617,7 +617,7 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::removeTab( ::sal_Int32 ID ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -650,7 +650,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } void SAL_CALL TabWindow::setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -696,7 +696,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindow::getTabProps( ::sal_Int32 ID ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -731,7 +731,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } void SAL_CALL TabWindow::activateTab( ::sal_Int32 ID ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -764,7 +764,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } ::sal_Int32 SAL_CALL TabWindow::getActiveTabID() -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -788,7 +788,7 @@ throw (css::uno::RuntimeException) void SAL_CALL TabWindow::addTabListener( const css::uno::Reference< css::awt::XTabListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -802,7 +802,7 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::removeTabListener( const css::uno::Reference< css::awt::XTabListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -855,7 +855,7 @@ throw( css::lang::IllegalArgumentException ) void SAL_CALL TabWindow::setFastPropertyValue_NoBroadcast( sal_Int32, const css::uno::Any&) -throw( css::uno::Exception ) +throw( css::uno::Exception, std::exception ) { } @@ -900,7 +900,7 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , } css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL TabWindow::getPropertySetInfo() -throw ( css::uno::RuntimeException ) +throw ( css::uno::RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index 90297d3d876d..48eeffd979ea 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -66,7 +66,7 @@ TabWinFactory::~TabWinFactory() css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& xContext ) -throw ( css::uno::Exception, css::uno::RuntimeException ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { css::uno::Sequence< css::uno::Any > aArgs; @@ -75,7 +75,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& ) -throw ( css::uno::Exception, css::uno::RuntimeException ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { const OUString aTopWindowArgName( "TopWindow"); |