diff options
Diffstat (limited to 'dbaccess/source/ui/browser/genericcontroller.cxx')
| -rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 72 |
1 files changed, 34 insertions, 38 deletions
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index a997b5f7029d..f8c6113a5479 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -260,7 +260,7 @@ void OGenericUnoController::impl_initialize() { } -void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArguments ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -339,14 +339,14 @@ void OGenericUnoController::stopFrameListening( const Reference< XFrame >& _rxFr _rxFrame->removeFrameActionListener( this ); } -void OGenericUnoController::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) +void OGenericUnoController::disposing(const EventObject& Source) { // our frame ? if ( Source.Source == getFrame() ) stopFrameListening( getFrame() ); } -void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeException, std::exception ) +void OGenericUnoController::modified(const EventObject& aEvent) { ::osl::MutexGuard aGuard( getMutex() ); if ( !isDataSourceReadOnly() ) @@ -361,30 +361,30 @@ void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeEx InvalidateFeature(ID_BROWSER_UNDO); } -Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow() throw (RuntimeException, std::exception) +Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow() { SolarMutexGuard g; return VCLUnoHelper::GetInterface( getView() ); } -Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar() throw (RuntimeException, std::exception) +Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar() { return nullptr; } -OUString SAL_CALL OGenericUnoController::getViewControllerName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL OGenericUnoController::getViewControllerName() { return OUString( "Default" ); } -Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments() throw (RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments() { // currently we do not support any creation args, so anything passed to XModel2::createViewController would be // lost, so we can equally return an empty sequence here return Sequence< PropertyValue >(); } -void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) throw( RuntimeException, std::exception ) +void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -627,7 +627,7 @@ void OGenericUnoController::InvalidateAll_Impl() } } -Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) +Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) { Reference< XDispatch > xReturn; @@ -654,7 +654,7 @@ Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, co return xReturn; } -Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const Sequence< DispatchDescriptor >& aDescripts) throw( RuntimeException, std::exception ) +Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const Sequence< DispatchDescriptor >& aDescripts) { Sequence< Reference< XDispatch > > aReturn; sal_Int32 nLen = aDescripts.getLength(); @@ -674,27 +674,27 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const return aReturn; } -Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider() throw( RuntimeException, std::exception ) +Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider() { return m_xSlaveDispatcher; } -void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) throw( RuntimeException, std::exception ) +void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) { m_xSlaveDispatcher = _xNewProvider; } -Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider() throw( RuntimeException, std::exception ) +Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider() { return m_xMasterDispatcher; } -void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) throw( RuntimeException, std::exception ) +void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) { m_xMasterDispatcher = _xNewProvider; } -void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs) throw(RuntimeException, std::exception) +void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs) { SolarMutexGuard aSolarGuard; // The SolarMutex is not locked anymore when the framework calls into @@ -706,7 +706,7 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV executeChecked(_aURL,aArgs); } -void OGenericUnoController::addStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException, std::exception) +void OGenericUnoController::addStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) { // parse the URL now and here, this saves later parsing in each notification round URL aParsedURL( _rURL ); @@ -721,7 +721,7 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener > // force the new state to be broadcast to the new listener } -void OGenericUnoController::removeStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException, std::exception) +void OGenericUnoController::removeStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) { Dispatch::iterator iterSearch = m_arrStatusListener.begin(); @@ -814,19 +814,19 @@ void OGenericUnoController::disposing() m_aInitParameters.clear(); } -void SAL_CALL OGenericUnoController::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::addEventListener( const Reference< XEventListener >& xListener ) { // disambiguate OGenericUnoController_Base::WeakComponentImplHelperBase::addEventListener( xListener ); } -void SAL_CALL OGenericUnoController::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::removeEventListener( const Reference< XEventListener >& xListener ) { // disambiguate OGenericUnoController_Base::WeakComponentImplHelperBase::removeEventListener( xListener ); } -void OGenericUnoController::frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) +void OGenericUnoController::frameAction(const FrameActionEvent& aEvent) { ::osl::MutexGuard aGuard( getMutex() ); if ( aEvent.Frame == m_aCurrentFrame.getFrame() ) @@ -926,7 +926,7 @@ bool OGenericUnoController::isUserDefinedFeature( const OUString& _rFeatureURL ) return ( pos != m_aSupportedFeatures.end() ) && isUserDefinedFeature( pos->second.nFeatureId ); } -sal_Bool SAL_CALL OGenericUnoController::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OGenericUnoController::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } @@ -1043,27 +1043,27 @@ IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask, void*, void) } } -Any SAL_CALL OGenericUnoController::getViewData() throw( RuntimeException, std::exception ) +Any SAL_CALL OGenericUnoController::getViewData() { return Any(); } -void SAL_CALL OGenericUnoController::restoreViewData(const Any& /*Data*/) throw( RuntimeException, std::exception ) +void SAL_CALL OGenericUnoController::restoreViewData(const Any& /*Data*/) { } -Reference< XModel > SAL_CALL OGenericUnoController::getModel() throw( RuntimeException, std::exception ) +Reference< XModel > SAL_CALL OGenericUnoController::getModel() { return Reference< XModel >(); } -Reference< XFrame > SAL_CALL OGenericUnoController::getFrame() throw( RuntimeException, std::exception ) +Reference< XFrame > SAL_CALL OGenericUnoController::getFrame() { ::osl::MutexGuard aGuard( getMutex() ); return m_aCurrentFrame.getFrame(); } -sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) { SAL_WARN("dbaccess.ui", "OGenericUnoController::attachModel: not supported!" ); return false; @@ -1296,7 +1296,6 @@ Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw() // XTitle OUString SAL_CALL OGenericUnoController::getTitle() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); if ( m_bExternalTitle ) @@ -1306,7 +1305,6 @@ OUString SAL_CALL OGenericUnoController::getTitle() // XTitle void SAL_CALL OGenericUnoController::setTitle(const OUString& sTitle) - throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -1316,7 +1314,6 @@ void SAL_CALL OGenericUnoController::setTitle(const OUString& sTitle) // XTitleChangeBroadcaster void SAL_CALL OGenericUnoController::addTitleChangeListener(const Reference< XTitleChangeListener >& xListener) - throw (RuntimeException, std::exception) { Reference< XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper_throw(), UNO_QUERY); if (xBroadcaster.is ()) @@ -1324,7 +1321,6 @@ void SAL_CALL OGenericUnoController::addTitleChangeListener(const Reference< XTi } void SAL_CALL OGenericUnoController::removeTitleChangeListener(const Reference< XTitleChangeListener >& xListener) - throw (RuntimeException, std::exception) { Reference< XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper_throw(), UNO_QUERY); if (xBroadcaster.is ()) @@ -1332,24 +1328,24 @@ void SAL_CALL OGenericUnoController::removeTitleChangeListener(const Reference< } // XUserInputInterception -void SAL_CALL OGenericUnoController::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) { if ( _rxHandler.is() ) m_pData->m_aUserInputInterception.addKeyHandler( _rxHandler ); } -void SAL_CALL OGenericUnoController::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) { m_pData->m_aUserInputInterception.removeKeyHandler( _rxHandler ); } -void SAL_CALL OGenericUnoController::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) { if ( _rxHandler.is() ) m_pData->m_aUserInputInterception.addMouseClickHandler( _rxHandler ); } -void SAL_CALL OGenericUnoController::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) { m_pData->m_aUserInputInterception.removeMouseClickHandler( _rxHandler ); } @@ -1402,7 +1398,7 @@ bool OGenericUnoController::isDataSourceReadOnly() const return false; } -Reference< XController > OGenericUnoController::getXController() throw( RuntimeException ) +Reference< XController > OGenericUnoController::getXController() { return this; } @@ -1431,7 +1427,7 @@ bool OGenericUnoController::isCommandEnabled( const OUString& _rCompleteCommandU return bIsEnabled; } -Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroups() throw (RuntimeException, std::exception) +Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroups() { CommandHashMap aCmdHashMap; for ( SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin(); @@ -1454,7 +1450,7 @@ namespace }; } -Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (RuntimeException, std::exception) +Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) { ::std::list< DispatchInformation > aInformationList; DispatchInformation aDispatchInfo; @@ -1491,7 +1487,7 @@ void OGenericUnoController::fillSupportedFeatures() #endif } -void SAL_CALL OGenericUnoController::dispose() throw(css::uno::RuntimeException, std::exception) +void SAL_CALL OGenericUnoController::dispose() { SolarMutexGuard aSolarGuard; OGenericUnoController_Base::dispose(); |