diff options
Diffstat (limited to 'sfx2/source/view/sfxbasecontroller.cxx')
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 102 |
1 files changed, 45 insertions, 57 deletions
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index c68a851adb4f..8c273a78e69e 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -213,16 +213,16 @@ public: --m_refCount; } - virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL end() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL reset() throw(RuntimeException, std::exception) override; + virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) override; + virtual void SAL_CALL end() override; + virtual void SAL_CALL setText(const OUString& aText) override; + virtual void SAL_CALL setValue(sal_Int32 nValue) override; + virtual void SAL_CALL reset() override; - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; }; -void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) +void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -241,7 +241,7 @@ void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) } } -void SAL_CALL SfxStatusIndicator::end() throw(RuntimeException, std::exception) +void SAL_CALL SfxStatusIndicator::end() { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -256,7 +256,7 @@ void SAL_CALL SfxStatusIndicator::end() throw(RuntimeException, std::exception) } } -void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeException, std::exception) +void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -271,7 +271,7 @@ void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeEx } } -void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeException, std::exception) +void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -290,7 +290,7 @@ void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeExce } } -void SAL_CALL SfxStatusIndicator::reset() throw(RuntimeException, std::exception) +void SAL_CALL SfxStatusIndicator::reset() { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -305,7 +305,7 @@ void SAL_CALL SfxStatusIndicator::reset() throw(RuntimeException, std::exception } } -void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) +void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ ) { SolarMutexGuard aGuard; xOwner = nullptr; @@ -321,8 +321,8 @@ class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper< fra public: explicit IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) ; - virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) throw (RuntimeException, std::exception) override ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ; + virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) override ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override ; private: @@ -335,10 +335,9 @@ class IMPL_SfxBaseController_CloseListenerHelper : public ::cppu::WeakImplHelper public: explicit IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) ; - virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw (RuntimeException, util::CloseVetoException, std::exception) override ; - virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ; + virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) override ; + virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) override ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override ; private: @@ -351,12 +350,11 @@ IMPL_SfxBaseController_CloseListenerHelper::IMPL_SfxBaseController_CloseListener { } -void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) { } void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw (RuntimeException, util::CloseVetoException, std::exception) { SolarMutexGuard aGuard; SfxViewShell* pShell = m_pController->GetViewShell_Impl(); @@ -380,7 +378,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la } } -void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const lang::EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const lang::EventObject& /*aEvent*/ ) { } @@ -430,7 +428,7 @@ IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper( { } -void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::FrameActionEvent& aEvent ) throw( RuntimeException, std::exception ) +void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::FrameActionEvent& aEvent ) { SolarMutexGuard aGuard; if ( @@ -455,7 +453,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F // IMPL_SfxBaseController_ListenerHelper -> XEventListener -void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) { SolarMutexGuard aGuard; if ( m_pController && m_pController->getFrame().is() ) @@ -480,7 +478,7 @@ SfxBaseController::~SfxBaseController() // SfxBaseController -> XController2 -Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException, std::exception) +Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell ) @@ -489,7 +487,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run return Reference< XWindow >( GetViewFrame_Impl().GetFrame().GetWindow().GetComponentInterface(), UNO_QUERY_THROW ); } -OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException, std::exception) +OUString SAL_CALL SfxBaseController::getViewControllerName() { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() ) @@ -506,7 +504,7 @@ OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeExcep return sViewName; } -Sequence< PropertyValue > SAL_CALL SfxBaseController::getCreationArguments() throw (RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL SfxBaseController::getCreationArguments() { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() ) @@ -530,7 +528,7 @@ SfxViewFrame& SfxBaseController::GetViewFrame_Impl() const } -Reference<XSidebarProvider> SAL_CALL SfxBaseController::getSidebar() throw (RuntimeException, std::exception) +Reference<XSidebarProvider> SAL_CALL SfxBaseController::getSidebar() { SfxViewFrame& rViewFrame = GetViewFrame_Impl(); SfxFrame& rFrame = rViewFrame.GetFrame(); @@ -543,7 +541,7 @@ Reference<XSidebarProvider> SAL_CALL SfxBaseController::getSidebar() throw (Runt // SfxBaseController -> XController2 -> XController -void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) throw( RuntimeException, std::exception ) +void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) { Reference< frame::XFrame > xTemp( getFrame() ) ; @@ -581,7 +579,7 @@ void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& // SfxBaseController -> XController -sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) { if ( m_pData->m_pViewShell && xModel.is() && xModel != m_pData->m_pViewShell->GetObjectShell()->GetModel() ) { @@ -600,7 +598,7 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel // SfxBaseController -> XController -sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) { SolarMutexGuard aGuard; @@ -658,7 +656,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime // SfxBaseController -> XController -uno::Any SfxBaseController::getViewData() throw( RuntimeException, std::exception ) +uno::Any SfxBaseController::getViewData() { uno::Any aAny; OUString sData; @@ -676,7 +674,7 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException, std::exceptio // SfxBaseController -> XController -void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw( RuntimeException, std::exception ) +void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) { SolarMutexGuard aGuard; if ( m_pData->m_pViewShell ) @@ -691,7 +689,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw // SfxBaseController -> XController -Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( RuntimeException, std::exception ) +Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() { SolarMutexGuard aGuard; return m_pData->m_xFrame; @@ -701,7 +699,7 @@ Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( Runtime // SfxBaseController -> XController -Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( RuntimeException, std::exception ) +Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() { SolarMutexGuard aGuard; return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : Reference < frame::XModel > () ; @@ -713,7 +711,7 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const util::URL& aURL , const OUString& sTargetFrameName, - sal_Int32 eSearchFlags ) throw( RuntimeException, std::exception ) + sal_Int32 eSearchFlags ) { SolarMutexGuard aGuard; Reference< frame::XDispatch > xDisp; @@ -869,7 +867,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const // SfxBaseController -> XDispatchProvider -uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( RuntimeException, std::exception ) +uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) { // Create return list - which must have same size then the given descriptor // It's not allowed to pack it! @@ -891,7 +889,6 @@ uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::query frame::BorderWidths SAL_CALL SfxBaseController::getBorder() - throw ( RuntimeException, std::exception ) { frame::BorderWidths aResult; @@ -909,21 +906,18 @@ frame::BorderWidths SAL_CALL SfxBaseController::getBorder() } void SAL_CALL SfxBaseController::addBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener ) - throw ( RuntimeException, std::exception ) { m_pData->m_aListenerContainer.addInterface( cppu::UnoType<frame::XBorderResizeListener>::get(), xListener ); } void SAL_CALL SfxBaseController::removeBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener ) - throw ( RuntimeException, std::exception ) { m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<frame::XBorderResizeListener>::get(), xListener ); } awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectangle& aPreliminaryRectangle ) - throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( m_pData->m_pViewShell ) @@ -964,7 +958,7 @@ void SfxBaseController::BorderWidthsChanged_Impl() // SfxBaseController -> XComponent -void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL SfxBaseController::dispose() { SolarMutexGuard aGuard; Reference< XController > xTmp( this ); @@ -1035,7 +1029,7 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::excepti // SfxBaseController -> XComponent -void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception ) +void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) { m_pData->m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } @@ -1044,7 +1038,7 @@ void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEvent // SfxBaseController -> XComponent -void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception ) +void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) { m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } @@ -1075,7 +1069,7 @@ SfxViewShell* SfxBaseController::GetViewShell_Impl() const return m_pData->m_pViewShell; } -Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator( ) throw (RuntimeException, std::exception) +Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator( ) { SolarMutexGuard aGuard; if ( m_pData->m_pViewShell && !m_pData->m_xIndicator.is() ) @@ -1083,7 +1077,7 @@ Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicat return m_pData->m_xIndicator; } -void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException, std::exception ) +void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) { m_pData->m_aInterceptorContainer.addInterface( xInterceptor ); @@ -1093,7 +1087,7 @@ void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference m_pData->m_pViewShell->AddContextMenuInterceptor_Impl( xInterceptor ); } -void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException, std::exception ) +void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) { m_pData->m_aInterceptorContainer.removeInterface( xInterceptor ); @@ -1103,32 +1097,31 @@ void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< m_pData->m_pViewShell->RemoveContextMenuInterceptor_Impl( xInterceptor ); } -void SAL_CALL SfxBaseController::addKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException, std::exception) +void SAL_CALL SfxBaseController::addKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.addKeyHandler( xHandler ); } -void SAL_CALL SfxBaseController::removeKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException, std::exception) +void SAL_CALL SfxBaseController::removeKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.removeKeyHandler( xHandler ); } -void SAL_CALL SfxBaseController::addMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException, std::exception) +void SAL_CALL SfxBaseController::addMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.addMouseClickHandler( xHandler ); } -void SAL_CALL SfxBaseController::removeMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException, std::exception) +void SAL_CALL SfxBaseController::removeMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.removeMouseClickHandler( xHandler ); } uno::Sequence< sal_Int16 > SAL_CALL SfxBaseController::getSupportedCommandGroups() -throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1160,7 +1153,6 @@ throw (RuntimeException, std::exception) } uno::Sequence< frame::DispatchInformation > SAL_CALL SfxBaseController::getConfigurableDispatchInformation( sal_Int16 nCmdGroup ) -throw (RuntimeException, std::exception) { std::list< frame::DispatchInformation > aCmdList; @@ -1493,7 +1485,6 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () // frame::XTitle OUString SAL_CALL SfxBaseController::getTitle() - throw (RuntimeException, std::exception) { return impl_getTitleHelper()->getTitle (); } @@ -1501,7 +1492,6 @@ OUString SAL_CALL SfxBaseController::getTitle() // frame::XTitle void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) - throw (RuntimeException, std::exception) { impl_getTitleHelper()->setTitle (sTitle); } @@ -1509,7 +1499,6 @@ void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) // frame::XTitleChangeBroadcaster void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener) - throw (RuntimeException, std::exception) { Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper(), uno::UNO_QUERY); if (xBroadcaster.is ()) @@ -1519,14 +1508,13 @@ void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame:: // frame::XTitleChangeBroadcaster void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener) - throw (RuntimeException, std::exception) { Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper(), uno::UNO_QUERY); if (xBroadcaster.is ()) xBroadcaster->removeTitleChangeListener (xListener); } -void SfxBaseController::initialize( const css::uno::Sequence< css::uno::Any >& /*aArguments*/ ) throw (css::uno::RuntimeException, std::exception) +void SfxBaseController::initialize( const css::uno::Sequence< css::uno::Any >& /*aArguments*/ ) { } |