diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess/documentdefinition.cxx')
-rw-r--r-- | dbaccess/source/core/dataaccess/documentdefinition.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 5e621fd9e948..718508eb29f2 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -183,9 +183,9 @@ namespace dbaccess osl_atomic_decrement( &m_refCount ); } - virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException); - virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException); - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException); + virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception); + virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception); }; void SAL_CALL OEmbedObjectHolder::disposing() @@ -196,7 +196,7 @@ namespace dbaccess m_pDefinition = NULL; } - void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException) + void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) { if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition ) { @@ -205,7 +205,7 @@ namespace dbaccess } } - void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException) + void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) { if ( !m_bInStateChange && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition ) { @@ -220,7 +220,7 @@ namespace dbaccess } } - void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) + void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { m_xBroadCaster = NULL; } @@ -234,20 +234,20 @@ namespace dbaccess public: OEmbeddedClientHelper(ODocumentDefinition* _pClient) :m_pClient(_pClient) {} - virtual void SAL_CALL saveObject( ) throw (ObjectSaveVetoException, Exception, RuntimeException) + virtual void SAL_CALL saveObject( ) throw (ObjectSaveVetoException, Exception, RuntimeException, std::exception) { } virtual void SAL_CALL onShowWindow( sal_Bool /*bVisible*/ ) throw (RuntimeException) { } // XComponentSupplier - virtual Reference< util::XCloseable > SAL_CALL getComponent( ) throw (RuntimeException) + virtual Reference< util::XCloseable > SAL_CALL getComponent( ) throw (RuntimeException, std::exception) { return Reference< css::util::XCloseable >(); } // XEmbeddedClient - virtual void SAL_CALL visibilityChanged( ::sal_Bool /*bVisible*/ ) throw (WrongStateException, RuntimeException) + virtual void SAL_CALL visibilityChanged( ::sal_Bool /*bVisible*/ ) throw (WrongStateException, RuntimeException, std::exception) { } inline void resetClient(ODocumentDefinition* _pClient) { m_pClient = _pClient; } @@ -323,11 +323,11 @@ namespace dbaccess OSL_ENSURE( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" ); } - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception); protected: }; - void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException) + void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception) { m_xClient.clear(); } @@ -345,10 +345,10 @@ namespace dbaccess inline OUString getName() const { return m_sName; } // XInteractionDocumentSave - virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException); + virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException, std::exception); }; - void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException) + void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException, std::exception) { m_sName = _sName; m_xParentContainer = _xParent; @@ -528,7 +528,7 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3 OPropertyStateContainer::getFastPropertyValue( o_rValue, i_nHandle ); } -Reference< XPropertySetInfo > SAL_CALL ODocumentDefinition::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL ODocumentDefinition::getPropertySetInfo( ) throw(RuntimeException, std::exception) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -962,7 +962,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons return makeAny( xModel ); } -Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException) +Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception) { Any aRet; @@ -1803,7 +1803,7 @@ Reference< util::XCloseable > ODocumentDefinition::impl_getComponent_throw( cons return xComp; } -Reference< util::XCloseable > ODocumentDefinition::getComponent() throw (RuntimeException) +Reference< util::XCloseable > ODocumentDefinition::getComponent() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getComponent_throw( true ); @@ -1879,17 +1879,17 @@ bool ODocumentDefinition::impl_close_throw() return bSuccess; } -Reference< XComponent > SAL_CALL ODocumentDefinition::open( ) throw (WrappedTargetException, RuntimeException) +Reference< XComponent > SAL_CALL ODocumentDefinition::open( ) throw (WrappedTargetException, RuntimeException, std::exception) { return impl_openUI_nolck_throw( false ); } -Reference< XComponent > SAL_CALL ODocumentDefinition::openDesign( ) throw (WrappedTargetException, RuntimeException) +Reference< XComponent > SAL_CALL ODocumentDefinition::openDesign( ) throw (WrappedTargetException, RuntimeException, std::exception) { return impl_openUI_nolck_throw( true ); } -void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, RuntimeException) +void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); try @@ -1904,7 +1904,7 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt } } -::sal_Bool SAL_CALL ODocumentDefinition::close( ) throw (WrappedTargetException, RuntimeException) +::sal_Bool SAL_CALL ODocumentDefinition::close( ) throw (WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1922,13 +1922,13 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt return bSuccess; } -OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException) +OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getHierarchicalName( false ); } -OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) +OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception) { OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); @@ -1937,7 +1937,7 @@ OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& return aBuffer.makeStringAndClear(); } -void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException, std::exception) { try { @@ -2089,7 +2089,7 @@ void ODocumentDefinition::updateDocumentTitle() xTitle->setTitle(sName); } -void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException) +void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) { (void) Source; (void) GetsOwnership; @@ -2104,11 +2104,11 @@ void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source } } -void SAL_CALL ODocumentDefinition::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) +void SAL_CALL ODocumentDefinition::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { } -void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) +void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { } |