diff options
Diffstat (limited to 'embeddedobj/source/general/docholder.cxx')
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 506ec44b6a4b..d06a690c437a 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -568,7 +568,6 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl() void DocumentHolder::FindConnectPoints( const uno::Reference< container::XIndexAccess >& xMenu, sal_Int32 nConnectPoints[2] ) - throw ( uno::Exception ) { nConnectPoints[0] = -1; nConnectPoints[1] = -1; @@ -601,7 +600,6 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( const OUString& aContModuleName, const uno::Reference< container::XIndexAccess >& xOwnMenu, const uno::Reference< frame::XDispatchProvider >& xOwnDisp ) - throw ( uno::Exception ) { // TODO/LATER: use dispatch providers on merge @@ -1096,7 +1094,6 @@ awt::Rectangle DocumentHolder::AddBorderToArea( const awt::Rectangle& aRect ) void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource ) - throw (uno::RuntimeException, std::exception) { if ( m_xComponent.is() && m_xComponent == aSource.Source ) { @@ -1118,7 +1115,6 @@ void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource ) void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sal_Bool /*bGetsOwnership*/ ) - throw (util::CloseVetoException, uno::RuntimeException, std::exception) { if ( m_xComponent.is() && m_xComponent == aSource.Source && !m_bAllowClosing ) throw util::CloseVetoException("To close an embedded document, close the document holder (document definition), not the document itself.", static_cast< ::cppu::OWeakObject*>(this)); @@ -1126,7 +1122,6 @@ void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sa void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource ) - throw (uno::RuntimeException, std::exception) { if ( m_xComponent.is() && m_xComponent == aSource.Source ) { @@ -1148,7 +1143,6 @@ void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource ) void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& ) - throw (frame::TerminationVetoException, uno::RuntimeException, std::exception) { if ( m_bWaitForClose ) throw frame::TerminationVetoException(); @@ -1156,7 +1150,6 @@ void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& ) void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource ) - throw (uno::RuntimeException, std::exception) { OSL_ENSURE( !m_xComponent.is(), "Just a disaster..." ); @@ -1168,7 +1161,6 @@ void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSourc void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent ) - throw ( uno::RuntimeException, std::exception ) { // if the component does not support document::XEventBroadcaster // the modify notifications are used as workaround, but only for running state @@ -1178,7 +1170,6 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent ) void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event ) - throw ( uno::RuntimeException, std::exception ) { if( m_pEmbedObj && Event.Source == m_xComponent ) { @@ -1195,7 +1186,6 @@ void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event ) void SAL_CALL DocumentHolder::borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject, const frame::BorderWidths& aNewSize ) - throw ( uno::RuntimeException, std::exception ) { // TODO: may require mutex introduction ??? if ( m_pEmbedObj && m_xFrame.is() && aObject == m_xFrame->getController() ) @@ -1214,7 +1204,6 @@ void SAL_CALL DocumentHolder::borderWidthsChanged( const uno::Reference< uno::XI void SAL_CALL DocumentHolder::requestPositioning( const awt::Rectangle& aRect ) - throw (uno::RuntimeException, std::exception) { // TODO: may require mutex introduction ??? if ( m_pEmbedObj ) @@ -1228,7 +1217,6 @@ void SAL_CALL DocumentHolder::requestPositioning( const awt::Rectangle& aRect ) awt::Rectangle SAL_CALL DocumentHolder::calcAdjustedRectangle( const awt::Rectangle& aRect ) - throw (uno::RuntimeException, std::exception) { // Solar mutex should be locked already since this is a call from HatchWindow with focus awt::Rectangle aResult( aRect ); @@ -1254,7 +1242,7 @@ awt::Rectangle SAL_CALL DocumentHolder::calcAdjustedRectangle( const awt::Rectan return aResult; } -void SAL_CALL DocumentHolder::activated( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL DocumentHolder::activated( ) { if ( (m_pEmbedObj->getStatus(embed::Aspects::MSOLE_CONTENT)&embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) || svt::EmbeddedObjectRef::IsGLChart(m_pEmbedObj) ) @@ -1292,7 +1280,7 @@ void DocumentHolder::ResizeHatchWindow() xHatchWindow->setHatchBorderSize( awt::Size( HATCH_BORDER_WIDTH, HATCH_BORDER_WIDTH ) ); } -void SAL_CALL DocumentHolder::deactivated( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL DocumentHolder::deactivated( ) { // deactivation is too unspecific to be useful; usually we only trigger code from activation // so UIDeactivation is actively triggered by the container |