summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /desktop/source
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/app/check_ext_deps.cxx22
-rw-r--r--desktop/source/app/desktopcontext.cxx2
-rw-r--r--desktop/source/app/desktopcontext.hxx3
-rw-r--r--desktop/source/app/dispatchwatcher.cxx3
-rw-r--r--desktop/source/app/dispatchwatcher.hxx5
-rw-r--r--desktop/source/app/officeipcthread.cxx7
-rw-r--r--desktop/source/app/officeipcthread.hxx18
-rw-r--r--desktop/source/deployment/dp_log.cxx10
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.hxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx26
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.hxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx13
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.hxx12
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx22
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx4
-rw-r--r--desktop/source/deployment/gui/license_dialog.hxx5
-rw-r--r--desktop/source/deployment/inc/dp_interact.h2
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.cxx11
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.hxx27
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx65
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.hxx106
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx12
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx48
-rw-r--r--desktop/source/deployment/manager/dp_manager.h94
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx3
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx19
-rw-r--r--desktop/source/deployment/misc/dp_interact.cxx10
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx10
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx10
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx81
-rw-r--r--desktop/source/deployment/registry/dp_registry.cxx23
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx10
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx17
-rw-r--r--desktop/source/deployment/registry/inc/dp_backend.h141
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx116
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx14
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx9
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx25
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx22
-rw-r--r--desktop/source/lib/init.cxx4
-rw-r--r--desktop/source/lib/lokclipboard.cxx7
-rw-r--r--desktop/source/lib/lokclipboard.hxx17
-rw-r--r--desktop/source/lib/lokinteractionhandler.cxx11
-rw-r--r--desktop/source/lib/lokinteractionhandler.hxx18
-rw-r--r--desktop/source/migration/services/basicmigration.cxx8
-rw-r--r--desktop/source/migration/services/basicmigration.hxx16
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx122
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx15
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx31
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx8
-rw-r--r--desktop/source/migration/services/wordbookmigration.hxx16
-rw-r--r--desktop/source/offacc/acceptor.cxx5
-rw-r--r--desktop/source/offacc/acceptor.hxx15
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx8
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx25
-rw-r--r--desktop/source/splash/splash.cxx28
-rw-r--r--desktop/source/splash/unxsplash.cxx11
-rw-r--r--desktop/source/splash/unxsplash.hxx23
61 files changed, 345 insertions, 1086 deletions
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index af195b29ecac..f7798d8a55cb 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -85,21 +85,18 @@ public:
// XCommandEnvironment
virtual uno::Reference<task::XInteractionHandler > SAL_CALL
- getInteractionHandler() throw (uno::RuntimeException, std::exception) override;
+ getInteractionHandler() override;
virtual uno::Reference<ucb::XProgressHandler >
- SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) override;
+ SAL_CALL getProgressHandler() override;
// XInteractionHandler
virtual void SAL_CALL handle(
- uno::Reference<task::XInteractionRequest > const & xRequest )
- throw (uno::RuntimeException, std::exception) override;
+ uno::Reference<task::XInteractionRequest > const & xRequest ) override;
// XProgressHandler
- virtual void SAL_CALL push( uno::Any const & Status )
- throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL update( uno::Any const & Status )
- throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL pop() throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL push( uno::Any const & Status ) override;
+ virtual void SAL_CALL update( uno::Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
@@ -120,14 +117,12 @@ SilentCommandEnv::~SilentCommandEnv()
Reference<task::XInteractionHandler> SilentCommandEnv::getInteractionHandler()
- throw (uno::RuntimeException, std::exception)
{
return this;
}
Reference<ucb::XProgressHandler> SilentCommandEnv::getProgressHandler()
- throw (uno::RuntimeException, std::exception)
{
return this;
}
@@ -135,7 +130,6 @@ Reference<ucb::XProgressHandler> SilentCommandEnv::getProgressHandler()
// XInteractionHandler
void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest )
- throw (uno::RuntimeException, std::exception)
{
deployment::LicenseException licExc;
@@ -184,7 +178,6 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe
// XProgressHandler
void SilentCommandEnv::push( uno::Any const & rStatus )
- throw (uno::RuntimeException, std::exception)
{
OUString sText;
mnLevel += 1;
@@ -200,7 +193,6 @@ void SilentCommandEnv::push( uno::Any const & rStatus )
void SilentCommandEnv::update( uno::Any const & rStatus )
- throw (uno::RuntimeException, std::exception)
{
OUString sText;
if ( rStatus.hasValue() && ( rStatus >>= sText) )
@@ -210,7 +202,7 @@ void SilentCommandEnv::update( uno::Any const & rStatus )
}
-void SilentCommandEnv::pop() throw (uno::RuntimeException, std::exception)
+void SilentCommandEnv::pop()
{
mnLevel -= 1;
}
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index f587f9781b9f..2f2e1d4c4af4 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -36,7 +36,7 @@ DesktopContext::DesktopContext( const Reference< XCurrentContext > & ctx )
{
}
-Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (RuntimeException, std::exception)
+Any SAL_CALL DesktopContext::getValueByName( const OUString& Name)
{
Any retVal;
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index fda7774c051a..0781993b7af5 100644
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
@@ -31,8 +31,7 @@ namespace desktop
explicit DesktopContext( const css::uno::Reference< css::uno::XCurrentContext > & ctx);
// XCurrentContext
- virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) override;
private:
css::uno::Reference< css::uno::XCurrentContext > m_xNextContext;
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 3bbb191da359..ef19db69bdd2 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -720,12 +720,11 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
void SAL_CALL DispatchWatcher::disposing( const css::lang::EventObject& )
- throw(css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& )
{
osl::ClearableMutexGuard aGuard(m_mutex);
sal_Int16 nCount = --m_nRequestCount;
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 79f0858ee145..45f66201c83b 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -70,11 +70,10 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
virtual ~DispatchWatcher() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// XDispachResultListener
- virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) override;
// execute new dispatch request
bool executeDispatchRequests( const std::vector<DispatchRequest>& aDispatches, bool bNoTerminate );
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 8b85258bf46e..0bda37217561 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -318,19 +318,17 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign
// XServiceInfo
OUString SAL_CALL RequestHandlerController::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( "com.sun.star.comp.RequestHandlerController" );
}
sal_Bool RequestHandlerController::supportsService(
- OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
+ OUString const & ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL RequestHandlerController::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > aSeq( 0 );
return aSeq;
@@ -338,13 +336,11 @@ throw ( RuntimeException, std::exception )
// XEventListener
void SAL_CALL RequestHandlerController::disposing( const EventObject& )
-throw( RuntimeException, std::exception )
{
}
// XTerminateListener
void SAL_CALL RequestHandlerController::queryTermination( const EventObject& )
-throw( TerminationVetoException, RuntimeException, std::exception )
{
// Desktop ask about pending request through our office ipc pipe. We have to
// be sure that no pending request is waiting because framework is not able to
@@ -357,7 +353,6 @@ throw( TerminationVetoException, RuntimeException, std::exception )
}
void SAL_CALL RequestHandlerController::notifyTermination( const EventObject& )
-throw( RuntimeException, std::exception )
{
}
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 7c9372ca1558..d9d70050ded6 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -137,22 +137,16 @@ class RequestHandlerController : public ::cppu::WeakImplHelper<
RequestHandlerController() {}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw ( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// XTerminateListener
- virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent )
- throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) override;
+ virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override;
};
}
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 74a53eb3f4c8..d88defcc9897 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -57,9 +57,9 @@ public:
Reference<XComponentContext> const & xContext );
// XProgressHandler
- virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL pop() throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL push( Any const & Status ) override;
+ virtual void SAL_CALL update( Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
@@ -146,7 +146,6 @@ void ProgressLogImpl::log_write( OString const & text )
// XProgressHandler
void ProgressLogImpl::push( Any const & Status )
- throw (RuntimeException, std::exception)
{
update( Status );
OSL_ASSERT( m_log_level >= 0 );
@@ -155,7 +154,6 @@ void ProgressLogImpl::push( Any const & Status )
void ProgressLogImpl::update( Any const & Status )
- throw (RuntimeException, std::exception)
{
if (! Status.hasValue())
return;
@@ -179,7 +177,7 @@ void ProgressLogImpl::update( Any const & Status )
}
-void ProgressLogImpl::pop() throw (RuntimeException, std::exception)
+void ProgressLogImpl::pop()
{
OSL_ASSERT( m_log_level > 0 );
--m_log_level;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e81ff2c6734e..b6ae76a39e96 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1452,12 +1452,12 @@ UpdateRequiredDialogService::UpdateRequiredDialogService( uno::Sequence< uno::An
// XExecutableDialog
-void UpdateRequiredDialogService::setTitle( OUString const & ) throw ( uno::RuntimeException, std::exception )
+void UpdateRequiredDialogService::setTitle( OUString const & )
{
}
-sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException, std::exception )
+sal_Int16 UpdateRequiredDialogService::execute()
{
::rtl::Reference< ::dp_gui::TheExtensionManager > xManager( TheExtensionManager::get(
m_xComponentContext) );
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 8019edc9d330..5b9a8cc403e3 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -265,8 +265,8 @@ public:
css::uno::Reference< css::uno::XComponentContext> const & xComponentContext );
// XExecutableDialog
- virtual void SAL_CALL setTitle( OUString const & title ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Int16 SAL_CALL execute() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setTitle( OUString const & title ) override;
+ virtual sal_Int16 SAL_CALL execute() override;
};
} // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 623e5edbb728..fbdd34bba1d2 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -129,7 +129,7 @@ class ProgressCmdEnv
void updateProgress();
/// @throws uno::RuntimeException
- void update_( uno::Any const & Status ) throw ( uno::RuntimeException );
+ void update_( uno::Any const & Status );
public:
/** When param bAskWhenInstalling = true, then the user is asked if he
@@ -158,21 +158,16 @@ public:
inline void setWarnUser( bool bNewVal ) { m_bWarnUser = bNewVal; }
// XCommandEnvironment
- virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
- throw ( uno::RuntimeException, std::exception ) override;
- virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler()
- throw ( uno::RuntimeException, std::exception ) override;
+ virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
+ virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() override;
// XInteractionHandler
- virtual void SAL_CALL handle( uno::Reference< task::XInteractionRequest > const & xRequest )
- throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL handle( uno::Reference< task::XInteractionRequest > const & xRequest ) override;
// XProgressHandler
- virtual void SAL_CALL push( uno::Any const & Status )
- throw ( uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL update( uno::Any const & Status )
- throw ( uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL pop() throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL push( uno::Any const & Status ) override;
+ virtual void SAL_CALL update( uno::Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
@@ -310,14 +305,12 @@ void ProgressCmdEnv::updateProgress()
// XCommandEnvironment
uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler()
- throw ( uno::RuntimeException, std::exception )
{
return this;
}
uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler()
- throw ( uno::RuntimeException, std::exception )
{
return this;
}
@@ -326,7 +319,6 @@ uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler()
// XInteractionHandler
void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & xRequest )
- throw ( uno::RuntimeException, std::exception )
{
uno::Any request( xRequest->getRequest() );
OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -534,14 +526,12 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
// XProgressHandler
void ProgressCmdEnv::push( uno::Any const & rStatus )
- throw( uno::RuntimeException, std::exception )
{
update_( rStatus );
}
void ProgressCmdEnv::update_( uno::Any const & rStatus )
- throw( uno::RuntimeException )
{
OUString text;
if ( rStatus.hasValue() && !( rStatus >>= text) )
@@ -561,14 +551,12 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
void ProgressCmdEnv::update( uno::Any const & rStatus )
- throw( uno::RuntimeException, std::exception )
{
update_( rStatus );
}
void ProgressCmdEnv::pop()
- throw( uno::RuntimeException, std::exception )
{
update_( uno::Any() ); // no message
}
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e162a5b87428..037c6f3c2e37 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -154,7 +154,6 @@ void Entry_Impl::checkDependencies()
// ExtensionRemovedListener
void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )
- throw ( uno::RuntimeException, std::exception )
{
uno::Reference< deployment::XPackage > xPackage( rEvt.Source, uno::UNO_QUERY );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index d28e248cce1e..e2a77abd3376 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -100,8 +100,7 @@ public:
// XEventListener
- virtual void SAL_CALL disposing(css::lang::EventObject const& evt)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(css::lang::EventObject const& evt) override;
};
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index a2e2b596a792..3deb997c43cf 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -151,15 +151,12 @@ public:
Reference<XComponentContext> const & xComponentContext );
// XAsynchronousExecutableDialog
- virtual void SAL_CALL setDialogTitle( OUString const & aTitle )
- throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDialogTitle( OUString const & aTitle ) override;
virtual void SAL_CALL startExecuteModal(
- Reference< ui::dialogs::XDialogClosedListener > const & xListener )
- throw (RuntimeException, std::exception) override;
+ Reference< ui::dialogs::XDialogClosedListener > const & xListener ) override;
// XJobExecutor
- virtual void SAL_CALL trigger( OUString const & event )
- throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL trigger( OUString const & event ) override;
};
@@ -186,7 +183,6 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args,
// XAsynchronousExecutableDialog
void ServiceImpl::setDialogTitle( OUString const & title )
- throw (RuntimeException, std::exception)
{
if ( dp_gui::TheExtensionManager::s_ExtMgr.is() )
{
@@ -204,7 +200,6 @@ void ServiceImpl::setDialogTitle( OUString const & title )
void ServiceImpl::startExecuteModal(
Reference< ui::dialogs::XDialogClosedListener > const & xListener )
- throw (RuntimeException, std::exception)
{
bool bCloseDialog = true; // only used if m_bShowUpdateOnly is true
::std::unique_ptr<Application> app;
@@ -289,7 +284,7 @@ void ServiceImpl::startExecuteModal(
// XJobExecutor
-void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException, std::exception)
+void ServiceImpl::trigger( OUString const &rEvent )
{
if ( rEvent == "SHOW_UPDATE_DIALOG" )
m_bShowUpdateOnly = true;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 3b1f0cb6dbc3..c2daf59e0227 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -412,7 +412,6 @@ bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPa
// XEventListener
void TheExtensionManager::disposing( lang::EventObject const & rEvt )
- throw ( uno::RuntimeException, std::exception )
{
bool shutDown = (rEvt.Source == m_xDesktop);
@@ -437,7 +436,6 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt )
// XTerminateListener
void TheExtensionManager::queryTermination( ::lang::EventObject const & )
- throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception )
{
DialogHelper *pDialogHelper = getDialogHelper();
@@ -459,7 +457,6 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & )
void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt )
- throw ( uno::RuntimeException, std::exception )
{
disposing( rEvt );
}
@@ -467,7 +464,6 @@ void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt )
// XModifyListener
void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
- throw ( uno::RuntimeException, std::exception )
{
m_bModified = true;
getDialogHelper()->prepareChecking();
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 794d9258c6f0..2a2f067ecb76 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -115,18 +115,14 @@ public:
OUString const & view = OUString() );
// XEventListener
- virtual void SAL_CALL disposing( css::lang::EventObject const & evt )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) override;
// XTerminateListener
- virtual void SAL_CALL queryTermination( css::lang::EventObject const & evt )
- throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL notifyTermination( css::lang::EventObject const & evt )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL queryTermination( css::lang::EventObject const & evt ) override;
+ virtual void SAL_CALL notifyTermination( css::lang::EventObject const & evt ) override;
// XModifyListener
- virtual void SAL_CALL modified( css::lang::EventObject const & evt )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified( css::lang::EventObject const & evt ) override;
};
} // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 4670e3b8f472..f6047d23eace 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -126,21 +126,18 @@ public:
// XCommandEnvironment
virtual cssu::Reference<css::task::XInteractionHandler > SAL_CALL
- getInteractionHandler() throw (cssu::RuntimeException, std::exception) override;
+ getInteractionHandler() override;
virtual cssu::Reference<css::ucb::XProgressHandler >
- SAL_CALL getProgressHandler() throw (cssu::RuntimeException, std::exception) override;
+ SAL_CALL getProgressHandler() override;
// XInteractionHandler
virtual void SAL_CALL handle(
- cssu::Reference<css::task::XInteractionRequest > const & xRequest )
- throw (cssu::RuntimeException, std::exception) override;
+ cssu::Reference<css::task::XInteractionRequest > const & xRequest ) override;
// XProgressHandler
- virtual void SAL_CALL push( cssu::Any const & Status )
- throw (cssu::RuntimeException, std::exception) override;
- virtual void SAL_CALL update( cssu::Any const & Status )
- throw (cssu::RuntimeException, std::exception) override;
- virtual void SAL_CALL pop() throw (cssu::RuntimeException, std::exception) override;
+ virtual void SAL_CALL push( cssu::Any const & Status ) override;
+ virtual void SAL_CALL update( cssu::Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
@@ -632,13 +629,11 @@ UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > c
// XCommandEnvironment
cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler()
-throw (cssu::RuntimeException, std::exception)
{
return this;
}
cssu::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler()
-throw (cssu::RuntimeException, std::exception)
{
return this;
}
@@ -646,7 +641,6 @@ throw (cssu::RuntimeException, std::exception)
// XInteractionHandler
void UpdateCommandEnv::handle(
cssu::Reference< css::task::XInteractionRequest> const & xRequest )
- throw (cssu::RuntimeException, std::exception)
{
cssu::Any request( xRequest->getRequest() );
OSL_ASSERT( request.getValueTypeClass() == cssu::TypeClass_EXCEPTION );
@@ -695,16 +689,14 @@ void UpdateCommandEnv::handle(
// XProgressHandler
void UpdateCommandEnv::push( cssu::Any const & /*Status*/ )
-throw (cssu::RuntimeException, std::exception)
{
}
void UpdateCommandEnv::update( cssu::Any const & /*Status */)
-throw (cssu::RuntimeException, std::exception)
{
}
-void UpdateCommandEnv::pop() throw (cssu::RuntimeException, std::exception)
+void UpdateCommandEnv::pop()
{
}
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 142c85d6881e..52ddc8e11875 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -293,13 +293,13 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args,
// XExecutableDialog
-void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException, std::exception)
+void LicenseDialog::setTitle( OUString const & )
{
}
-sal_Int16 LicenseDialog::execute() throw (RuntimeException, std::exception)
+sal_Int16 LicenseDialog::execute()
{
return vcl::solarthread::syncExecute(
std::bind(&LicenseDialog::solar_execute, this));
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 11eab9de7bf0..85be01aac2e8 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -41,9 +41,8 @@ public:
css::uno::Reference<css::uno::XComponentContext> const & xComponentContext );
// XExecutableDialog
- virtual void SAL_CALL setTitle( OUString const & title )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTitle( OUString const & title ) override;
+ virtual sal_Int16 SAL_CALL execute() override;
};
}
#endif
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 22a287f66461..2cabec56d41a 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -118,7 +118,7 @@ public:
inline bool isAborted() const { return m_aborted; }
// XAbortChannel
- virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL sendAbort() override;
class SAL_DLLPRIVATE Chain
{
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 1f7aa09079dd..cd93931e6de0 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -56,21 +56,18 @@ BaseCommandEnv::~BaseCommandEnv()
// XCommandEnvironment
Reference<task::XInteractionHandler> BaseCommandEnv::getInteractionHandler()
-throw (uno::RuntimeException, std::exception)
{
return this;
}
Reference<ucb::XProgressHandler> BaseCommandEnv::getProgressHandler()
-throw (uno::RuntimeException, std::exception)
{
return this;
}
void BaseCommandEnv::handle(
Reference< task::XInteractionRequest> const & /*xRequest*/ )
- throw (uno::RuntimeException, std::exception)
{
}
@@ -120,16 +117,14 @@ void BaseCommandEnv::handle_(bool approve, bool abort,
// XProgressHandler
void BaseCommandEnv::push( uno::Any const & /*Status*/ )
-throw (uno::RuntimeException, std::exception)
{
}
void BaseCommandEnv::update( uno::Any const & /*Status */)
-throw (uno::RuntimeException, std::exception)
{
}
-void BaseCommandEnv::pop() throw (uno::RuntimeException, std::exception)
+void BaseCommandEnv::pop()
{
}
@@ -146,7 +141,6 @@ TmpRepositoryCommandEnv::TmpRepositoryCommandEnv(
// XInteractionHandler
void TmpRepositoryCommandEnv::handle(
Reference< task::XInteractionRequest> const & xRequest )
- throw (uno::RuntimeException, std::exception)
{
uno::Any request( xRequest->getRequest() );
OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -180,7 +174,6 @@ LicenseCommandEnv::LicenseCommandEnv(
// XInteractionHandler
void LicenseCommandEnv::handle(
Reference< task::XInteractionRequest> const & xRequest )
- throw (uno::RuntimeException, std::exception)
{
uno::Any request( xRequest->getRequest() );
OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -216,7 +209,6 @@ NoLicenseCommandEnv::NoLicenseCommandEnv(
// XInteractionHandler
void NoLicenseCommandEnv::handle(
Reference< task::XInteractionRequest> const & xRequest )
- throw (uno::RuntimeException, std::exception)
{
uno::Any request( xRequest->getRequest() );
OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -239,7 +231,6 @@ SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv()
void SilentCheckPrerequisitesCommandEnv::handle(
Reference< task::XInteractionRequest> const & xRequest )
- throw (uno::RuntimeException, std::exception)
{
uno::Any request( xRequest->getRequest() );
OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 5f4ab2429dcb..a9f810b3c728 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -47,21 +47,18 @@ public:
// XCommandEnvironment
virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL
- getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
+ getInteractionHandler() override;
virtual css::uno::Reference<css::ucb::XProgressHandler >
- SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getProgressHandler() override;
// XInteractionHandler
virtual void SAL_CALL handle(
- css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
// XProgressHandler
- virtual void SAL_CALL push( css::uno::Any const & Status )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL update( css::uno::Any const & Status )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL push( css::uno::Any const & Status ) override;
+ virtual void SAL_CALL update( css::uno::Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
class TmpRepositoryCommandEnv : public BaseCommandEnv
@@ -72,8 +69,7 @@ public:
// XInteractionHandler
virtual void SAL_CALL handle(
- css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
};
@@ -94,8 +90,7 @@ public:
// XInteractionHandler
virtual void SAL_CALL handle(
- css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
};
@@ -111,8 +106,7 @@ public:
// XInteractionHandler
virtual void SAL_CALL handle(
- css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
};
@@ -130,8 +124,7 @@ public:
SilentCheckPrerequisitesCommandEnv();
// XInteractionHandler
virtual void SAL_CALL handle(
- css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
// Set to true if a PlatformException or a DependencyException were handled.
css::uno::Any m_Exception;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 14ee844b3f6e..fc4832d8fe2c 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -199,14 +199,12 @@ Reference<css::deployment::XPackageManager> ExtensionManager::getBakRepository(
}
Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
- throw (uno::RuntimeException, std::exception)
{
return new dp_misc::AbortChannel;
}
css::uno::Reference<css::deployment::XPackageManager>
ExtensionManager::getPackageManager(OUString const & repository)
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
{
Reference<css::deployment::XPackageManager> xPackageManager;
if (repository == "user")
@@ -311,11 +309,6 @@ ExtensionManager::getExtensionsWithSameIdentifier(
OUString const & identifier,
OUString const & fileName,
Reference< ucb::XCommandEnvironment> const & xCmdEnv )
- throw (
- css::deployment::DeploymentException,
- ucb::CommandFailedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
try
{
@@ -508,7 +501,6 @@ Reference<css::deployment::XPackage> ExtensionManager::backupExtension(
//call to one of the repositories.
uno::Sequence< Reference<css::deployment::XPackageTypeInfo> >
ExtensionManager::getSupportedPackageTypes()
- throw (uno::RuntimeException, std::exception)
{
return getUserRepository()->getSupportedPackageTypes();
}
@@ -524,11 +516,6 @@ bool ExtensionManager::doChecksForAddExtension(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv,
Reference<css::deployment::XPackage> & out_existingExtension )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException)
{
try
{
@@ -619,11 +606,6 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension(
OUString const & repository,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
Reference<css::deployment::XPackage> xNewExtension;
//Determine the repository to use
@@ -829,11 +811,6 @@ void ExtensionManager::removeExtension(
OUString const & repository,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
uno::Any excOccurred1;
Reference<css::deployment::XPackage> xExtensionBackup;
@@ -929,11 +906,6 @@ void ExtensionManager::enableExtension(
Reference<css::deployment::XPackage> const & extension,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
::osl::MutexGuard guard(getMutex());
bool bUserDisabled = false;
@@ -994,11 +966,6 @@ sal_Int32 ExtensionManager::checkPrerequisitesAndEnable(
Reference<css::deployment::XPackage> const & extension,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
try
{
@@ -1043,11 +1010,6 @@ void ExtensionManager::disableExtension(
Reference<css::deployment::XPackage> const & extension,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
::osl::MutexGuard guard(getMutex());
uno::Any excOccurred;
@@ -1106,11 +1068,6 @@ uno::Sequence< Reference<css::deployment::XPackage> >
OUString const & repository,
Reference<task::XAbortChannel> const &xAbort,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
return getPackageManager(repository)->getDeployedPackages(
xAbort, xCmdEnv);
@@ -1122,10 +1079,6 @@ Reference<css::deployment::XPackage>
OUString const & identifier,
OUString const & filename,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
return getPackageManager(repository)->getDeployedPackage(
identifier, filename, xCmdEnv);
@@ -1135,11 +1088,6 @@ uno::Sequence< uno::Sequence<Reference<css::deployment::XPackage> > >
ExtensionManager::getAllExtensions(
Reference<task::XAbortChannel> const & xAbort,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
try
{
@@ -1203,9 +1151,6 @@ void ExtensionManager::reinstallDeployedExtensions(
sal_Bool force, OUString const & repository,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException, ucb::CommandAbortedException,
- lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
try
{
@@ -1282,11 +1227,6 @@ void ExtensionManager::reinstallDeployedExtensions(
sal_Bool ExtensionManager::synchronize(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
try
{
@@ -1423,8 +1363,6 @@ uno::Sequence<Reference<css::deployment::XPackage> > SAL_CALL
ExtensionManager::getExtensionsWithUnacceptedLicenses(
OUString const & repository,
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
- throw (css::deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
Reference<css::deployment::XPackageManager>
xPackageManager = getPackageManager(repository);
@@ -1433,7 +1371,6 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses(
}
sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository)
- throw (uno::RuntimeException, std::exception)
{
return getPackageManager(repository)->isReadOnly();
}
@@ -1451,7 +1388,6 @@ sdecl::ServiceDecl const serviceDecl(
void ExtensionManager::addModifyListener(
Reference<util::XModifyListener> const & xListener )
- throw (uno::RuntimeException, std::exception)
{
check();
rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -1460,7 +1396,6 @@ void ExtensionManager::addModifyListener(
void ExtensionManager::removeModifyListener(
Reference<util::XModifyListener> const & xListener )
- throw (uno::RuntimeException, std::exception)
{
check();
rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 40d217700638..9b113ce105fe 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -54,148 +54,86 @@ public:
// XModifyBroadcaster
virtual void SAL_CALL addModifyListener(
- css::uno::Reference<css::util::XModifyListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
virtual void SAL_CALL removeModifyListener(
- css::uno::Reference<css::util::XModifyListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
//XExtensionManager
virtual css::uno::Sequence<
css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes()
- throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
- createAbortChannel() throw (css::uno::RuntimeException, std::exception) override;
+ createAbortChannel() override;
virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addExtension(
OUString const & url,
css::uno::Sequence<css::beans::NamedValue> const & properties,
OUString const & repository,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual void SAL_CALL removeExtension(
OUString const & identifier,
OUString const & filename,
OUString const & repository,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual void SAL_CALL enableExtension(
css::uno::Reference<css::deployment::XPackage> const & extension,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual void SAL_CALL disableExtension(
css::uno::Reference<css::deployment::XPackage> const & extension,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual sal_Int32 SAL_CALL checkPrerequisitesAndEnable(
css::uno::Reference<css::deployment::XPackage> const & extension,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
SAL_CALL getDeployedExtensions(
OUString const & repository,
css::uno::Reference<css::task::XAbortChannel> const &,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual css::uno::Reference< css::deployment::XPackage>
SAL_CALL getDeployedExtension(
OUString const & repository,
OUString const & identifier,
OUString const & filename,
- css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (
- css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> >
SAL_CALL getExtensionsWithSameIdentifier(
OUString const & identifier,
OUString const & filename,
- css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (
- css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual css::uno::Sequence< css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > >
SAL_CALL getAllExtensions(
css::uno::Reference<css::task::XAbortChannel> const &,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual void SAL_CALL reinstallDeployedExtensions(
sal_Bool force, OUString const & repository,
css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (
- css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual sal_Bool SAL_CALL synchronize(
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
getExtensionsWithUnacceptedLicenses(
OUString const & repository,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
- throw (css::deployment::DeploymentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) override;
- virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository) override;
private:
@@ -267,8 +205,7 @@ private:
/// @throws css::lang::IllegalArgumentException
/// @throws css::uno::RuntimeException
css::uno::Reference<css::deployment::XPackageManager>
- getPackageManager(OUString const & repository)
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ getPackageManager(OUString const & repository);
/// @throws css::deployment::DeploymentException
/// @throws css::ucb::CommandFailedException
@@ -281,12 +218,7 @@ private:
css::uno::Reference<css::deployment::XPackage> const & xTmpExtension,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
- css::uno::Reference<css::deployment::XPackage> & out_existingExtension )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException);
+ css::uno::Reference<css::deployment::XPackage> & out_existingExtension );
};
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index af648647ae78..8634ecca4886 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -66,12 +66,9 @@ class PackageInformationProvider :
explicit PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext);
// XPackageInformationProvider
- virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId )
- throw ( uno::RuntimeException, std::exception ) override;
- virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId )
- throw ( uno::RuntimeException, std::exception ) override;
- virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList()
- throw ( uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId ) override;
+ virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId ) override;
+ virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList() override;
private:
@@ -127,7 +124,6 @@ OUString PackageInformationProvider::getPackageLocation(
OUString SAL_CALL
PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
- throw ( uno::RuntimeException, std::exception )
{
OUString aLocationURL = getPackageLocation( "user", _sExtensionId );
@@ -158,7 +154,6 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
uno::Sequence< uno::Sequence< OUString > > SAL_CALL
PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
- throw ( uno::RuntimeException, std::exception )
{
uno::Sequence< uno::Sequence< OUString > > aList;
@@ -269,7 +264,6 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList()
- throw ( uno::RuntimeException, std::exception )
{
const uno::Reference<deployment::XExtensionManager> mgr =
deployment::ExtensionManager::get(mxContext);
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 70a441d26748..c47aad7bbbb8 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -463,7 +463,7 @@ void PackageManagerImpl::disposing()
// XComponent
-void PackageManagerImpl::dispose() throw (RuntimeException, std::exception)
+void PackageManagerImpl::dispose()
{
//Do not call check here. We must not throw an exception here if the object
//is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -472,7 +472,7 @@ void PackageManagerImpl::dispose() throw (RuntimeException, std::exception)
void PackageManagerImpl::addEventListener(
- Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+ Reference<lang::XEventListener> const & xListener )
{
//Do not call check here. We must not throw an exception here if the object
//is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -481,7 +481,7 @@ void PackageManagerImpl::addEventListener(
void PackageManagerImpl::removeEventListener(
- Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+ Reference<lang::XEventListener> const & xListener )
{
//Do not call check here. We must not throw an exception here if the object
//is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -490,7 +490,7 @@ void PackageManagerImpl::removeEventListener(
// XPackageManager
-OUString PackageManagerImpl::getContext() throw (RuntimeException, std::exception)
+OUString PackageManagerImpl::getContext()
{
check();
return m_context;
@@ -498,7 +498,7 @@ OUString PackageManagerImpl::getContext() throw (RuntimeException, std::exceptio
Sequence< Reference<deployment::XPackageTypeInfo> >
-PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+PackageManagerImpl::getSupportedPackageTypes()
{
OSL_ASSERT( m_xRegistry.is() );
return m_xRegistry->getSupportedPackageTypes();
@@ -506,7 +506,6 @@ PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException, std::exc
Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
- throw (RuntimeException, std::exception)
{
check();
return new AbortChannel;
@@ -516,7 +515,6 @@ Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
void PackageManagerImpl::addModifyListener(
Reference<util::XModifyListener> const & xListener )
- throw (RuntimeException, std::exception)
{
check();
rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -525,7 +523,6 @@ void PackageManagerImpl::addModifyListener(
void PackageManagerImpl::removeModifyListener(
Reference<util::XModifyListener> const & xListener )
- throw (RuntimeException, std::exception)
{
check();
rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -671,9 +668,6 @@ Reference<deployment::XPackage> PackageManagerImpl::importExtension(
Reference<deployment::XPackage> const & extension,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<XCommandEnvironment> const & xCmdEnv_ )
- throw (deployment::DeploymentException, CommandFailedException,
- CommandAbortedException, lang::IllegalArgumentException,
- RuntimeException, std::exception)
{
return addPackage(extension->getURL(), Sequence<beans::NamedValue>(),
OUString(), xAbortChannel, xCmdEnv_);
@@ -688,9 +682,6 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
OUString const & mediaType_,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<XCommandEnvironment> const & xCmdEnv_ )
- throw (deployment::DeploymentException, CommandFailedException,
- CommandAbortedException, lang::IllegalArgumentException,
- RuntimeException, std::exception)
{
check();
if (m_readOnly)
@@ -842,9 +833,6 @@ void PackageManagerImpl::removePackage(
OUString const & id, OUString const & fileName,
Reference<task::XAbortChannel> const & /*xAbortChannel*/,
Reference<XCommandEnvironment> const & xCmdEnv_ )
- throw (deployment::DeploymentException, CommandFailedException,
- CommandAbortedException, lang::IllegalArgumentException,
- RuntimeException, std::exception)
{
check();
@@ -1034,8 +1022,6 @@ PackageManagerImpl::getDeployedPackages_(
Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
OUString const & id, OUString const & fileName,
Reference<XCommandEnvironment> const & xCmdEnv_ )
- throw (deployment::DeploymentException, CommandFailedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
check();
Reference<XCommandEnvironment> xCmdEnv;
@@ -1078,9 +1064,6 @@ Sequence< Reference<deployment::XPackage> >
PackageManagerImpl::getDeployedPackages(
Reference<task::XAbortChannel> const &,
Reference<XCommandEnvironment> const & xCmdEnv_ )
- throw (deployment::DeploymentException, CommandFailedException,
- CommandAbortedException, lang::IllegalArgumentException,
- RuntimeException, std::exception)
{
check();
Reference<XCommandEnvironment> xCmdEnv;
@@ -1124,9 +1107,6 @@ PackageManagerImpl::getDeployedPackages(
void PackageManagerImpl::reinstallDeployedPackages(
sal_Bool force, Reference<task::XAbortChannel> const & /*xAbortChannel*/,
Reference<XCommandEnvironment> const & xCmdEnv_ )
- throw (deployment::DeploymentException,
- CommandFailedException, CommandAbortedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
check();
if (!force && office_is_running())
@@ -1181,7 +1161,6 @@ void PackageManagerImpl::reinstallDeployedPackages(
sal_Bool SAL_CALL PackageManagerImpl::isReadOnly( )
- throw (css::uno::RuntimeException, std::exception)
{
return m_readOnly;
}
@@ -1415,11 +1394,6 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
sal_Bool PackageManagerImpl::synchronize(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
- throw (css::deployment::DeploymentException,
- css::ucb::ContentCreationException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception)
{
check();
bool bModified = false;
@@ -1434,7 +1408,6 @@ sal_Bool PackageManagerImpl::synchronize(
Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWithUnacceptedLicenses(
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
- throw (deployment::DeploymentException, RuntimeException, std::exception)
{
::std::vector<Reference<deployment::XPackage> > vec;
@@ -1496,11 +1469,6 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
css::uno::Reference<css::deployment::XPackage> const & extension,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception)
{
try
{
@@ -1575,7 +1543,6 @@ PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl(
Reference<task::XInteractionHandler>
PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
- throw (RuntimeException, std::exception)
{
return m_xUserInteractionHandler;
}
@@ -1583,7 +1550,6 @@ PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
Reference<XProgressHandler>
PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
- throw (RuntimeException, std::exception)
{
return this;
}
@@ -1591,7 +1557,6 @@ PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
// XProgressHandler
void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
- throw (RuntimeException, std::exception)
{
if (m_xLogFile.is())
m_xLogFile->push( Status );
@@ -1601,7 +1566,6 @@ void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
- throw (RuntimeException, std::exception)
{
if (m_xLogFile.is())
m_xLogFile->update( Status );
@@ -1610,7 +1574,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
}
-void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException, std::exception)
+void PackageManagerImpl::CmdEnvWrapperImpl::pop()
{
if (m_xLogFile.is())
m_xLogFile->pop();
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 841eb0b9d90f..cafd630e12c3 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -105,16 +105,14 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
// XCommandEnvironment
virtual css::uno::Reference<css::task::XInteractionHandler> SAL_CALL
- getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
+ getInteractionHandler() override;
virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL
- getProgressHandler() throw (css::uno::RuntimeException, std::exception) override;
+ getProgressHandler() override;
// XProgressHandler
- virtual void SAL_CALL push( css::uno::Any const & Status )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL update( css::uno::Any const & Status )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL push( css::uno::Any const & Status ) override;
+ virtual void SAL_CALL update( css::uno::Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
protected:
@@ -137,63 +135,43 @@ public:
const & xComponentContext, OUString const & context );
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener(
- css::uno::Reference<css::lang::XEventListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
virtual void SAL_CALL removeEventListener(
- css::uno::Reference<css::lang::XEventListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
// XModifyBroadcaster
virtual void SAL_CALL addModifyListener(
- css::uno::Reference<css::util::XModifyListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
virtual void SAL_CALL removeModifyListener(
- css::uno::Reference<css::util::XModifyListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
// XPackageManager
- virtual OUString SAL_CALL getContext()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getContext() override;
virtual css::uno::Sequence<
css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
- createAbortChannel() throw (css::uno::RuntimeException, std::exception) override;
+ createAbortChannel() override;
virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage(
OUString const & url,
css::uno::Sequence<css::beans::NamedValue> const & properties,
OUString const & mediaType,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL importExtension(
css::uno::Reference<css::deployment::XPackage> const & extension,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual void SAL_CALL removePackage(
OUString const & id, OUString const & fileName,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
OUString getDeployPath( ActivePackages::Data const & data );
css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_(
@@ -206,10 +184,7 @@ public:
virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL
getDeployedPackage(
OUString const & id, OUString const & fileName,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
getDeployedPackages_(
@@ -217,50 +192,27 @@ public:
virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
SAL_CALL getDeployedPackages(
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual void SAL_CALL reinstallDeployedPackages(
sal_Bool force,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
- virtual ::sal_Bool SAL_CALL isReadOnly( )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Bool SAL_CALL isReadOnly( ) override;
virtual ::sal_Bool SAL_CALL synchronize(
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::ContentCreationException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
getExtensionsWithUnacceptedLicenses(
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
- throw (css::deployment::DeploymentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) override;
virtual sal_Int32 SAL_CALL checkPrerequisites(
css::uno::Reference<css::deployment::XPackage> const & extension,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
};
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index db2b5f85350e..ab1cc4466f66 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -61,7 +61,7 @@ public:
// XPackageManagerFactory
virtual Reference<deployment::XPackageManager> SAL_CALL getPackageManager(
- OUString const & context ) throw (RuntimeException, std::exception) override;
+ OUString const & context ) override;
};
@@ -114,7 +114,6 @@ void PackageManagerFactoryImpl::disposing()
Reference<deployment::XPackageManager>
PackageManagerFactoryImpl::getPackageManager( OUString const & context )
- throw (RuntimeException, std::exception)
{
Reference< deployment::XPackageManager > xRet;
::osl::ResettableMutexGuard guard( getMutex() );
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 48ae7154fddd..848fd3dc6603 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -65,20 +65,19 @@ public:
EmptyNodeList(const EmptyNodeList&) = delete;
const EmptyNodeList& operator=(const EmptyNodeList&) = delete;
- virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getLength() override;
virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
- item(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
+ item(::sal_Int32 index) override;
};
EmptyNodeList::EmptyNodeList() {}
-::sal_Int32 EmptyNodeList::getLength() throw (css::uno::RuntimeException, std::exception) {
+::sal_Int32 EmptyNodeList::getLength() {
return 0;
}
css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32)
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException("bad EmptyNodeList com.sun.star.xml.dom.XNodeList.item call",
static_cast< ::cppu::OWeakObject * >(this));
@@ -146,14 +145,13 @@ public:
bool exist() { return m_bExist;}
// XCommandEnvironment
virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL
- getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
+ getInteractionHandler() override;
virtual css::uno::Reference<css::ucb::XProgressHandler >
- SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getProgressHandler() override;
// XInteractionHandler
virtual void SAL_CALL handle(
- css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
};
ExtensionDescription::ExtensionDescription(
@@ -247,13 +245,13 @@ FileDoesNotExistFilter::FileDoesNotExistFilter(
// XCommandEnvironment
Reference<css::task::XInteractionHandler >
- FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException, std::exception)
+ FileDoesNotExistFilter::getInteractionHandler()
{
return static_cast<css::task::XInteractionHandler*>(this);
}
Reference<css::ucb::XProgressHandler >
- FileDoesNotExistFilter::getProgressHandler() throw (css::uno::RuntimeException, std::exception)
+ FileDoesNotExistFilter::getProgressHandler()
{
return m_xCommandEnv.is()
? m_xCommandEnv->getProgressHandler()
@@ -265,7 +263,6 @@ Reference<css::ucb::XProgressHandler >
//of FileDoesNotExistFilter, then we do nothing
void FileDoesNotExistFilter::handle(
Reference<css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Any request( xRequest->getRequest() );
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index f6c35e80468e..cfcc5ba4903e 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -52,11 +52,10 @@ public:
// XInterface
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
- virtual Any SAL_CALL queryInterface( Type const & type )
- throw (RuntimeException, std::exception) override;
+ virtual Any SAL_CALL queryInterface( Type const & type ) override;
// XInteractionContinuation
- virtual void SAL_CALL select() throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL select() override;
};
// XInterface
@@ -74,7 +73,6 @@ void InteractionContinuationImpl::release() throw ()
Any InteractionContinuationImpl::queryInterface( Type const & type )
- throw (RuntimeException, std::exception)
{
if (type.isAssignableFrom( m_type )) {
Reference<task::XInteractionContinuation> xThis(this);
@@ -86,7 +84,7 @@ Any InteractionContinuationImpl::queryInterface( Type const & type )
// XInteractionContinuation
-void InteractionContinuationImpl::select() throw (RuntimeException, std::exception)
+void InteractionContinuationImpl::select()
{
*m_pselect = true;
}
@@ -127,7 +125,7 @@ bool interactContinuation( Any const & request,
// XAbortChannel
-void AbortChannel::sendAbort() throw (RuntimeException, std::exception)
+void AbortChannel::sendAbort()
{
m_aborted = true;
if (m_xNext.is())
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index a6ddce438442..d00143157765 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -321,11 +321,9 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
using PackageRegistryBackend::disposing;
@@ -585,14 +583,12 @@ void BackendImpl::revokeEntryFromDb(OUString const & url)
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
{
return m_typeInfos;
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
if (m_backendDb.get())
m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index dcd30b46c497..21bc2e49d976 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -150,10 +150,8 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
using PackageRegistryBackend::disposing;
};
@@ -284,13 +282,11 @@ bool BackendImpl::activateEntry(OUString const & url)
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
{
return m_typeInfos;
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
if (m_backendDb.get())
m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 122706966069..2c2ee723f43d 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -58,7 +58,6 @@ PackageRegistryBackend::~PackageRegistryBackend()
void PackageRegistryBackend::disposing( lang::EventObject const & event )
- throw (RuntimeException, std::exception)
{
Reference<deployment::XPackage> xPackage(
event.Source, UNO_QUERY_THROW );
@@ -139,10 +138,6 @@ void PackageRegistryBackend::disposing()
Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
OUString const & url, OUString const & mediaType, sal_Bool bRemoved,
OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException,
- deployment::InvalidRemovedParameterException,
- ucb::CommandFailedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
::osl::ResettableMutexGuard guard( getMutex() );
check();
@@ -354,7 +349,7 @@ void Package::check() const
// XComponent
-void Package::dispose() throw (RuntimeException, std::exception)
+void Package::dispose()
{
//Do not call check here. We must not throw an exception here if the object
//is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -363,7 +358,7 @@ void Package::dispose() throw (RuntimeException, std::exception)
void Package::addEventListener(
- Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+ Reference<lang::XEventListener> const & xListener )
{
//Do not call check here. We must not throw an exception here if the object
//is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -372,7 +367,7 @@ void Package::addEventListener(
void Package::removeEventListener(
- Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+ Reference<lang::XEventListener> const & xListener )
{
//Do not call check here. We must not throw an exception here if the object
//is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -383,7 +378,6 @@ void Package::removeEventListener(
void Package::addModifyListener(
Reference<util::XModifyListener> const & xListener )
- throw (RuntimeException, std::exception)
{
check();
rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -392,7 +386,6 @@ void Package::addModifyListener(
void Package::removeModifyListener(
Reference<util::XModifyListener> const & xListener )
- throw (RuntimeException, std::exception)
{
check();
rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -411,14 +404,13 @@ void Package::checkAborted(
// XPackage
Reference<task::XAbortChannel> Package::createAbortChannel()
- throw (RuntimeException, std::exception)
{
check();
return new AbortChannel;
}
-sal_Bool Package::isBundle() throw (RuntimeException, std::exception)
+sal_Bool Package::isBundle()
{
return false; // default
}
@@ -428,11 +420,6 @@ sal_Bool Package::isBundle() throw (RuntimeException, std::exception)
const css::uno::Reference< css::task::XAbortChannel >&,
const css::uno::Reference< css::ucb::XCommandEnvironment >&,
sal_Bool)
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -442,10 +429,6 @@ sal_Bool Package::isBundle() throw (RuntimeException, std::exception)
sal_Bool Package::checkDependencies(
const css::uno::Reference< css::ucb::XCommandEnvironment >& )
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::ucb::CommandFailedException,
- css::uno::RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -456,20 +439,17 @@ sal_Bool Package::checkDependencies(
Sequence< Reference<deployment::XPackage> > Package::getBundle(
Reference<task::XAbortChannel> const &,
Reference<XCommandEnvironment> const & )
- throw (deployment::DeploymentException,
- CommandFailedException, CommandAbortedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
return Sequence< Reference<deployment::XPackage> >();
}
-OUString Package::getName() throw (RuntimeException, std::exception)
+OUString Package::getName()
{
return m_name;
}
-beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException, std::exception)
+beans::Optional<OUString> Package::getIdentifier()
{
if (m_bRemoved)
return beans::Optional<OUString>(true, m_identifier);
@@ -478,9 +458,7 @@ beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException, std:
}
-OUString Package::getVersion() throw (
- deployment::ExtensionRemovedException,
- RuntimeException, std::exception)
+OUString Package::getVersion()
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -488,14 +466,13 @@ OUString Package::getVersion() throw (
}
-OUString Package::getURL() throw (RuntimeException, std::exception)
+OUString Package::getURL()
{
return m_url;
}
-OUString Package::getDisplayName() throw (
- deployment::ExtensionRemovedException, RuntimeException, std::exception)
+OUString Package::getDisplayName()
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -503,8 +480,7 @@ OUString Package::getDisplayName() throw (
}
-OUString Package::getDescription() throw (
- deployment::ExtensionRemovedException,RuntimeException, std::exception)
+OUString Package::getDescription()
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -512,10 +488,7 @@ OUString Package::getDescription() throw (
}
-OUString Package::getLicenseText()throw (
- deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- RuntimeException, std::exception)
+OUString Package::getLicenseText()
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -523,8 +496,7 @@ OUString Package::getLicenseText()throw (
}
-Sequence<OUString> Package::getUpdateInformationURLs() throw (
- deployment::ExtensionRemovedException, RuntimeException, std::exception)
+Sequence<OUString> Package::getUpdateInformationURLs()
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -532,8 +504,7 @@ Sequence<OUString> Package::getUpdateInformationURLs() throw (
}
-css::beans::StringPair Package::getPublisherInfo() throw (
- deployment::ExtensionRemovedException, RuntimeException, std::exception)
+css::beans::StringPair Package::getPublisherInfo()
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -543,7 +514,6 @@ css::beans::StringPair Package::getPublisherInfo() throw (
uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContrast*/ )
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception )
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -554,7 +524,6 @@ uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContr
Reference<deployment::XPackageTypeInfo> Package::getPackageType()
- throw (RuntimeException, std::exception)
{
return m_xPackageType;
}
@@ -562,9 +531,6 @@ Reference<deployment::XPackageTypeInfo> Package::getPackageType()
void Package::exportTo(
OUString const & destFolderURL, OUString const & newTitle,
sal_Int32 nameClashAction, Reference<XCommandEnvironment> const & xCmdEnv )
- throw (deployment::ExtensionRemovedException,
- CommandFailedException, CommandAbortedException, ContentCreationException,
- RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -610,8 +576,6 @@ void Package::fireModified()
beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException,
- CommandFailedException, CommandAbortedException, RuntimeException, std::exception)
{
try {
::osl::ResettableMutexGuard guard( getMutex() );
@@ -722,10 +686,6 @@ void Package::registerPackage(
sal_Bool startup,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- CommandFailedException, CommandAbortedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -737,9 +697,6 @@ void Package::revokePackage(
sal_Bool startup,
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException,
- CommandFailedException, CommandAbortedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
processPackage_impl( false /* revoke */, startup, xAbortChannel, xCmdEnv );
@@ -761,16 +718,12 @@ PackageRegistryBackend * Package::getMyBackend() const
}
OUString Package::getRepositoryName()
- throw (RuntimeException, std::exception)
{
PackageRegistryBackend * backEnd = getMyBackend();
return backEnd->getContext();
}
beans::Optional< OUString > Package::getRegistrationDataURL()
- throw (deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -778,7 +731,6 @@ beans::Optional< OUString > Package::getRegistrationDataURL()
}
sal_Bool Package::isRemoved()
- throw (RuntimeException, std::exception)
{
return m_bRemoved;
}
@@ -789,32 +741,29 @@ Package::TypeInfo::~TypeInfo()
// XPackageTypeInfo
-OUString Package::TypeInfo::getMediaType() throw (RuntimeException, std::exception)
+OUString Package::TypeInfo::getMediaType()
{
return m_mediaType;
}
OUString Package::TypeInfo::getDescription()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
{
return getShortDescription();
}
OUString Package::TypeInfo::getShortDescription()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
{
return m_shortDescr;
}
-OUString Package::TypeInfo::getFileFilter() throw (RuntimeException, std::exception)
+OUString Package::TypeInfo::getFileFilter()
{
return m_fileFilter;
}
Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool /*smallIcon*/ )
- throw (RuntimeException, std::exception)
{
return Any();
}
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index d1b77a020af9..7edf53fd2860 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -105,21 +105,15 @@ public:
Reference<XComponentContext> const & xComponentContext );
// XUpdatable
- virtual void SAL_CALL update() throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL update() override;
// XPackageRegistry
virtual Reference<deployment::XPackage> SAL_CALL bindPackage(
OUString const & url, OUString const & mediaType, sal_Bool bRemoved,
- OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException,
- deployment::InvalidRemovedParameterException,
- CommandFailedException,
- lang::IllegalArgumentException, RuntimeException, std::exception) override;
+ OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) override;
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
};
@@ -172,8 +166,6 @@ OUString normalizeMediaType( OUString const & mediaType )
void PackageRegistryImpl::packageRemoved(
OUString const & url, OUString const & mediaType)
- throw (css::deployment::DeploymentException,
- css::uno::RuntimeException, std::exception)
{
const t_string2registry::const_iterator i =
m_mediaType2backend.find(mediaType);
@@ -437,7 +429,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create(
// XUpdatable: broadcast to backends
-void PackageRegistryImpl::update() throw (RuntimeException, std::exception)
+void PackageRegistryImpl::update()
{
check();
t_registryset::const_iterator iPos( m_allBackends.begin() );
@@ -454,9 +446,6 @@ void PackageRegistryImpl::update() throw (RuntimeException, std::exception)
Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
OUString const & url, OUString const & mediaType_, sal_Bool bRemoved,
OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException,
- CommandFailedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
check();
OUString mediaType(mediaType_);
@@ -539,7 +528,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
Sequence< Reference<deployment::XPackageTypeInfo> >
-PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+PackageRegistryImpl::getSupportedPackageTypes()
{
return comphelper::containerToSequence(m_typesInfos);
}
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 118210452ec5..50a14b9b9428 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -93,10 +93,8 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
};
@@ -139,15 +137,13 @@ bool BackendImpl::hasActiveEntry(OUString const & url)
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
{
return Sequence<Reference<deployment::XPackageTypeInfo> >(
& m_xExecutableTypeInfo, 1);
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
if (m_backendDb.get())
m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 4b5f78e8393d..6c29f8a43c84 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -84,9 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
bool extensionContainsCompiledHelp();
//XPackage
- virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL()
- throw (deployment::DeploymentException, deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() override;
};
friend class PackageImpl;
@@ -118,10 +116,8 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
};
@@ -156,14 +152,12 @@ BackendImpl::BackendImpl(
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
{
return m_typeInfos;
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
if (m_backendDb.get())
m_backendDb->removeEntry(url);
@@ -343,9 +337,6 @@ void BackendImpl::PackageImpl::processPackage_(
}
beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
- throw (deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index deba0dda93f2..ad717500c181 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -116,144 +116,78 @@ public:
m_shortDescr(shortDescr)
{}
// XPackageTypeInfo
- virtual OUString SAL_CALL getMediaType()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDescription()
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getShortDescription()
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getFileFilter()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getMediaType() override;
+ virtual OUString SAL_CALL getDescription() override;
+ virtual OUString SAL_CALL getShortDescription() override;
+ virtual OUString SAL_CALL getFileFilter() override;
virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast,
- sal_Bool smallIcon )
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool smallIcon ) override;
};
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener(
- css::uno::Reference<css::lang::XEventListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
virtual void SAL_CALL removeEventListener(
- css::uno::Reference<css::lang::XEventListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
// XModifyBroadcaster
virtual void SAL_CALL addModifyListener(
- css::uno::Reference<css::util::XModifyListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
virtual void SAL_CALL removeModifyListener(
- css::uno::Reference<css::util::XModifyListener> const & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
// XPackage
virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
- createAbortChannel() throw (css::uno::RuntimeException, std::exception) override;
+ createAbortChannel() override;
virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> >
SAL_CALL isRegistered(
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual ::sal_Int32 SAL_CALL checkPrerequisites(
const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel,
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv,
- sal_Bool noLicenseChecking)
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool noLicenseChecking) override;
virtual ::sal_Bool SAL_CALL checkDependencies(
- const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::ucb::CommandFailedException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) override;
virtual void SAL_CALL registerPackage(
sal_Bool startup,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual void SAL_CALL revokePackage(
sal_Bool startup,
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isBundle()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
+ virtual sal_Bool SAL_CALL isBundle() override;
virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
SAL_CALL getBundle(
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::beans::Optional< OUString > SAL_CALL getIdentifier()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getVersion()
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getURL()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDisplayName()
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDescription()
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getLicenseText()
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
+ virtual OUString SAL_CALL getName() override;
+ virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() override;
+ virtual OUString SAL_CALL getVersion() override;
+ virtual OUString SAL_CALL getURL() override;
+ virtual OUString SAL_CALL getDisplayName() override;
+ virtual OUString SAL_CALL getDescription() override;
+ virtual OUString SAL_CALL getLicenseText() override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getUpdateInformationURLs()
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::beans::StringPair SAL_CALL getPublisherInfo()
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
+ getUpdateInformationURLs() override;
+ virtual css::beans::StringPair SAL_CALL getPublisherInfo() override;
virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL
- getIcon( sal_Bool bHighContrast )
- throw (css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
+ getIcon( sal_Bool bHighContrast ) override;
virtual css::uno::Reference<css::deployment::XPackageTypeInfo> SAL_CALL
- getPackageType() throw (css::uno::RuntimeException, std::exception) override;
+ getPackageType() override;
virtual void SAL_CALL exportTo(
OUString const & destFolderURL,
OUString const & newTitle,
sal_Int32 nameClashAction,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::ExtensionRemovedException,
- css::ucb::CommandFailedException, css::ucb::CommandAbortedException,
- css::ucb::ContentCreationException, css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getRepositoryName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL()
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isRemoved()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
+ virtual OUString SAL_CALL getRepositoryName() override;
+ virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() override;
+ virtual sal_Bool SAL_CALL isRemoved() override;
};
@@ -344,18 +278,13 @@ public:
const OUString& getContext() const {return m_context; }
// XEventListener
- virtual void SAL_CALL disposing( css::lang::EventObject const & evt )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) override;
// XPackageRegistry
virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage(
OUString const & url, OUString const & mediaType,
sal_Bool bRemoved, OUString const & identifier,
- css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
- throw (css::deployment::DeploymentException,
- css::deployment::InvalidRemovedParameterException,
- css::ucb::CommandFailedException,
- css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
// virtual void SAL_CALL packageRemoved(
// OUString const & url, OUString const & mediaType)
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 174b4978ee18..08ba82f8cc8f 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -135,11 +135,7 @@ class BackendImpl : public ImplBaseT
/// @throws RuntimeException
bool checkLicense(
Reference< ucb::XCommandEnvironment > const & xCmdEnv,
- DescriptionInfoset const & description, bool bNoLicenseChecking)
- throw (deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- RuntimeException);
+ DescriptionInfoset const & description, bool bNoLicenseChecking);
// @throws DeploymentException
OUString getTextFromURL(
const Reference< ucb::XCommandEnvironment >& xCmdEnv,
@@ -173,69 +169,40 @@ class BackendImpl : public ImplBaseT
OUString const & identifier);
// XPackage
- virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isBundle() override;
virtual Sequence< Reference<deployment::XPackage> > SAL_CALL getBundle(
Reference<task::XAbortChannel> const & xAbortChannel,
- Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- lang::IllegalArgumentException, RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDescription()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
-
- virtual OUString SAL_CALL getLicenseText()
- throw (deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- RuntimeException, std::exception) override;
+ Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override;
+ virtual OUString SAL_CALL getDescription() override;
+
+ virtual OUString SAL_CALL getLicenseText() override;
virtual void SAL_CALL exportTo(
OUString const & destFolderURL, OUString const & newTitle,
sal_Int32 nameClashAction,
- Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (deployment::ExtensionRemovedException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- ucb::ContentCreationException,
- RuntimeException, std::exception) override;
+ Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override;
virtual ::sal_Int32 SAL_CALL checkPrerequisites(
const Reference< task::XAbortChannel >& xAbortChannel,
const Reference< ucb::XCommandEnvironment >& xCmdEnv,
- sal_Bool noLicenseChecking)
- throw (deployment::ExtensionRemovedException,
- deployment::DeploymentException,
- ucb::CommandFailedException,
- ucb::CommandAbortedException,
- RuntimeException, std::exception) override;
+ sal_Bool noLicenseChecking) override;
virtual sal_Bool SAL_CALL checkDependencies(
- const Reference< ucb::XCommandEnvironment >& xCmdEnv )
- throw (deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- ucb::CommandFailedException,
- RuntimeException, std::exception) override;
+ const Reference< ucb::XCommandEnvironment >& xCmdEnv ) override;
- virtual beans::Optional<OUString> SAL_CALL getIdentifier()
- throw (RuntimeException, std::exception) override;
+ virtual beans::Optional<OUString> SAL_CALL getIdentifier() override;
- virtual OUString SAL_CALL getVersion()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getVersion() override;
- virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+ virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs() override;
- virtual beans::StringPair SAL_CALL getPublisherInfo()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+ virtual beans::StringPair SAL_CALL getPublisherInfo() override;
- virtual OUString SAL_CALL getDisplayName()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDisplayName() override;
virtual Reference< graphic::XGraphic > SAL_CALL
- getIcon( sal_Bool bHighContrast )
- throw (deployment::ExtensionRemovedException,
- RuntimeException, std::exception) override;
+ getIcon( sal_Bool bHighContrast ) override;
};
friend class PackageImpl;
@@ -265,18 +232,14 @@ public:
Reference<deployment::XPackageRegistry> const & xRootRegistry );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( OUString const& name )
- throw (RuntimeException, std::exception) override;
- virtual Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( OUString const& name ) override;
+ virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
using ImplBaseT::disposing;
};
@@ -332,19 +295,17 @@ void BackendImpl::disposing()
}
// XServiceInfo
-OUString BackendImpl::getImplementationName() throw (RuntimeException, std::exception)
+OUString BackendImpl::getImplementationName()
{
return OUString("com.sun.star.comp.deployment.bundle.PackageRegistryBackend");
}
sal_Bool BackendImpl::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
Sequence<OUString> BackendImpl::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return { OUString(BACKEND_SERVICE_NAME) };
}
@@ -352,14 +313,12 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames()
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
{
return m_typeInfos;
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
//Notify the backend responsible for processing the different media
//types that this extension was removed.
@@ -659,10 +618,6 @@ bool BackendImpl::PackageImpl::checkDependencies(
bool BackendImpl::PackageImpl::checkLicense(
css::uno::Reference< css::ucb::XCommandEnvironment > const & xCmdEnv,
DescriptionInfoset const & info, bool alreadyInstalled)
- throw (css::deployment::DeploymentException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException)
{
try
{
@@ -731,11 +686,6 @@ bool BackendImpl::PackageImpl::checkLicense(
const css::uno::Reference< css::task::XAbortChannel >&,
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv,
sal_Bool alreadyInstalled)
- throw (css::deployment::DeploymentException,
- css::deployment::ExtensionRemovedException,
- css::ucb::CommandFailedException,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -760,10 +710,6 @@ bool BackendImpl::PackageImpl::checkLicense(
sal_Bool BackendImpl::PackageImpl::checkDependencies(
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv )
- throw (deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- ucb::CommandFailedException,
- RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -775,7 +721,6 @@ sal_Bool BackendImpl::PackageImpl::checkDependencies(
}
beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier()
- throw (RuntimeException, std::exception)
{
OUString identifier;
if (m_bRemoved)
@@ -789,7 +734,6 @@ beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier()
}
OUString BackendImpl::PackageImpl::getVersion()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -797,7 +741,6 @@ OUString BackendImpl::PackageImpl::getVersion()
}
Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -805,7 +748,6 @@ Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs()
}
beans::StringPair BackendImpl::PackageImpl::getPublisherInfo()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -816,7 +758,6 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo()
uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool bHighContrast )
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception )
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -976,7 +917,6 @@ void BackendImpl::PackageImpl::processPackage_(
OUString BackendImpl::PackageImpl::getDescription()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -1004,9 +944,6 @@ OUString BackendImpl::PackageImpl::getDescription()
OUString BackendImpl::PackageImpl::getLicenseText()
- throw (deployment::DeploymentException,
- deployment::ExtensionRemovedException,
- RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -1033,9 +970,6 @@ OUString BackendImpl::PackageImpl::getLicenseText()
void BackendImpl::PackageImpl::exportTo(
OUString const & destFolderURL, OUString const & newTitle,
sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (deployment::ExtensionRemovedException,
- ucb::CommandFailedException, ucb::CommandAbortedException,
- ucb::ContentCreationException, RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
@@ -1230,7 +1164,7 @@ void BackendImpl::PackageImpl::exportTo(
}
-sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException, std::exception)
+sal_Bool BackendImpl::PackageImpl::isBundle()
{
return true;
}
@@ -1239,9 +1173,6 @@ sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException, std::exce
Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
- throw (deployment::DeploymentException,
- ucb::CommandFailedException, ucb::CommandAbortedException,
- lang::IllegalArgumentException, RuntimeException, std::exception)
{
Sequence< Reference<deployment::XPackage> > * pBundle = m_pBundle;
if (pBundle == nullptr)
@@ -1634,7 +1565,6 @@ void BackendImpl::PackageImpl::scanLegacyBundle(
}
OUString BackendImpl::PackageImpl::getDisplayName()
- throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index c236af97fc9a..0f98bdded730 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -100,14 +100,12 @@ public:
Reference<XComponentContext> const & xComponentContext );
// XUpdatable
- virtual void SAL_CALL update() throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL update() override;
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
};
@@ -184,7 +182,7 @@ bool BackendImpl::hasActiveEntry(OUString const & url)
// XUpdatable
-void BackendImpl::update() throw (RuntimeException, std::exception)
+void BackendImpl::update()
{
// Nothing to do here after fixing i70283!?
}
@@ -192,7 +190,7 @@ void BackendImpl::update() throw (RuntimeException, std::exception)
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
{
return m_typeInfos;
}
@@ -203,8 +201,6 @@ void BackendImpl::revokeEntryFromDb(OUString const & url)
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
if (m_backendDb.get())
m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 4b283fc61838..1c86b0983b95 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -36,49 +36,41 @@ namespace sfwk
// XDocumentHandler
void SAL_CALL
ParcelDescDocHandler::startDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
m_bIsParsed = false;
}
void SAL_CALL
ParcelDescDocHandler::endDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
m_bIsParsed = true;
}
void SAL_CALL
ParcelDescDocHandler::characters( const OUString & )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
ParcelDescDocHandler::ignorableWhitespace( const OUString & )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
ParcelDescDocHandler::processingInstruction(
const OUString &, const OUString & )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
ParcelDescDocHandler::setDocumentLocator(
const Reference< xml::sax::XLocator >& )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL
ParcelDescDocHandler::startElement( const OUString& aName,
const Reference< xml::sax::XAttributeList > & xAttribs )
- throw ( xml::sax::SAXException,
- RuntimeException, std::exception )
{
dp_misc::TRACE("ParcelDescDocHandler::startElement() for " +
@@ -100,7 +92,6 @@ ParcelDescDocHandler::startElement( const OUString& aName,
}
void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName )
- throw ( xml::sax::SAXException, RuntimeException, std::exception )
{
if ( skipIndex )
{
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index d637116fefae..620e01b24c3c 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -48,33 +48,24 @@ public:
const OUString& getParcelLanguage() { return m_sLang; }
bool isParsed() { return m_bIsParsed; }
// XDocumentHandler
- virtual void SAL_CALL startDocument()
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL startDocument() override;
- virtual void SAL_CALL endDocument()
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL endDocument() override;
virtual void SAL_CALL startElement( const OUString& aName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs )
- throw ( css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) override;
- virtual void SAL_CALL endElement( const OUString & aName )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL endElement( const OUString & aName ) override;
- virtual void SAL_CALL characters( const OUString & aChars )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL characters( const OUString & aChars ) override;
- virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) override;
virtual void SAL_CALL processingInstruction(
- const OUString & aTarget, const OUString & aData )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ const OUString & aTarget, const OUString & aData ) override;
virtual void SAL_CALL setDocumentLocator(
- const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
- throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
};
}
}
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index adf1f93e6cf4..8893e487522f 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -78,12 +78,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
OUString const & url, OUString const & libType, bool bRemoved,
OUString const & identifier);
// XPackage
- virtual OUString SAL_CALL getDescription()
- throw (deployment::ExtensionRemovedException,
- RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getLicenseText()
- throw (deployment::ExtensionRemovedException,
- RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDescription() override;
+ virtual OUString SAL_CALL getLicenseText() override;
};
friend class PackageImpl;
@@ -103,10 +99,8 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
- getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception) override;
+ getSupportedPackageTypes() override;
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
};
BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
@@ -124,8 +118,6 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
}
OUString BackendImpl::PackageImpl::getDescription()
- throw (deployment::ExtensionRemovedException,
- RuntimeException, std::exception)
{
if (m_descr.isEmpty())
return Package::getDescription();
@@ -134,8 +126,6 @@ OUString BackendImpl::PackageImpl::getDescription()
}
OUString BackendImpl::PackageImpl::getLicenseText()
- throw (deployment::ExtensionRemovedException,
- RuntimeException, std::exception)
{
return Package::getDescription();
}
@@ -185,14 +175,12 @@ BackendImpl::BackendImpl(
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
{
return Sequence< Reference<deployment::XPackageTypeInfo> >(&m_xTypeInfo, 1);
}
void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*mediaType*/)
- throw (deployment::DeploymentException,
- uno::RuntimeException, std::exception)
{
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 40fd4e54b34b..4d2dc02a6a0a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1901,7 +1901,7 @@ public:
assert(mpCallback);
}
- virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) override
{
boost::property_tree::ptree aTree;
aTree.put("commandName", maCommand.getStr());
@@ -1920,7 +1920,7 @@ public:
mpCallback->queue(LOK_CALLBACK_UNO_COMMAND_RESULT, aPayload.getStr());
}
- virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override {}
+ virtual void SAL_CALL disposing(const css::lang::EventObject&) override {}
};
static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pCommand, const char* pArguments, bool bNotifyWhenFinished)
diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index deab34f47445..d218e691c72a 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -13,19 +13,17 @@
using namespace com::sun::star;
uno::Reference<datatransfer::XTransferable> SAL_CALL LOKClipboard::getContents()
-throw (uno::RuntimeException, std::exception)
{
return m_xTransferable;
}
void SAL_CALL LOKClipboard::setContents(const uno::Reference<datatransfer::XTransferable>& xTransferable,
const uno::Reference<datatransfer::clipboard::XClipboardOwner>& /*xClipboardOwner*/)
-throw (uno::RuntimeException, std::exception)
{
m_xTransferable = xTransferable;
}
-OUString SAL_CALL LOKClipboard::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL LOKClipboard::getName()
{
return OUString();
}
@@ -37,7 +35,6 @@ LOKTransferable::LOKTransferable(const char* pMimeType, const char* pData, std::
}
uno::Any SAL_CALL LOKTransferable::getTransferData(const datatransfer::DataFlavor& rFlavor)
-throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception)
{
uno::Any aRet;
if (rFlavor.DataType == cppu::UnoType<OUString>::get())
@@ -70,13 +67,11 @@ std::vector<datatransfer::DataFlavor> LOKTransferable::getTransferDataFlavorsAsV
}
uno::Sequence<datatransfer::DataFlavor> SAL_CALL LOKTransferable::getTransferDataFlavors()
-throw(uno::RuntimeException, std::exception)
{
return comphelper::containerToSequence(getTransferDataFlavorsAsVector());
}
sal_Bool SAL_CALL LOKTransferable::isDataFlavorSupported(const datatransfer::DataFlavor& rFlavor)
-throw(uno::RuntimeException, std::exception)
{
const std::vector<datatransfer::DataFlavor> aFlavors = getTransferDataFlavorsAsVector();
return std::find_if(aFlavors.begin(), aFlavors.end(), [&rFlavor](const datatransfer::DataFlavor& i)
diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx
index 59b8cdf00ebf..d72da4066447 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -21,14 +21,12 @@ class LOKClipboard : public cppu::WeakImplHelper<css::datatransfer::clipboard::X
css::uno::Reference<css::datatransfer::XTransferable> m_xTransferable;
public:
- virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getContents()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getContents() override;
virtual void SAL_CALL setContents(const css::uno::Reference<css::datatransfer::XTransferable>& xTransferable,
- const css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner>& xClipboardOwner)
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner>& xClipboardOwner) override;
- virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName() override;
};
/// Represents the contents of LOKClipboard.
@@ -43,14 +41,11 @@ class LOKTransferable : public cppu::WeakImplHelper<css::datatransfer::XTransfer
public:
LOKTransferable(const char* pMimeType, const char* pData, std::size_t nSize);
- virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor)
- throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override;
- virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() override;
- virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor) override;
};
#endif
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx
index 58d4052324d7..a491cb8457b4 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -64,17 +64,17 @@ LOKInteractionHandler::~LOKInteractionHandler()
{
}
-OUString SAL_CALL LOKInteractionHandler::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL LOKInteractionHandler::getImplementationName()
{
return OUString("com.sun.star.comp.uui.LOKInteractionHandler");
}
-sal_Bool SAL_CALL LOKInteractionHandler::supportsService(OUString const & rServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL LOKInteractionHandler::supportsService(OUString const & rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence< OUString > SAL_CALL LOKInteractionHandler::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL LOKInteractionHandler::getSupportedServiceNames()
{
uno::Sequence< OUString > aNames(3);
aNames[0] = "com.sun.star.task.InteractionHandler";
@@ -85,13 +85,12 @@ uno::Sequence< OUString > SAL_CALL LOKInteractionHandler::getSupportedServiceNam
return aNames;
}
-void SAL_CALL LOKInteractionHandler::initialize(uno::Sequence<uno::Any> const & /*rArguments*/) throw (uno::Exception, std::exception)
+void SAL_CALL LOKInteractionHandler::initialize(uno::Sequence<uno::Any> const & /*rArguments*/)
{
}
void SAL_CALL LOKInteractionHandler::handle(
uno::Reference<task::XInteractionRequest> const & xRequest)
-throw (uno::RuntimeException, std::exception)
{
// just do the same thing in both cases
handleInteractionRequest(xRequest);
@@ -325,7 +324,7 @@ bool LOKInteractionHandler::handlePasswordRequest(const uno::Sequence<uno::Refer
}
sal_Bool SAL_CALL LOKInteractionHandler::handleInteractionRequest(
- const uno::Reference<task::XInteractionRequest>& xRequest) throw (uno::RuntimeException, std::exception)
+ const uno::Reference<task::XInteractionRequest>& xRequest)
{
uno::Sequence<uno::Reference<task::XInteractionContinuation>> const &rContinuations = xRequest->getContinuations();
uno::Any const request(xRequest->getRequest());
diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx
index d6716eb51b2d..0a8defe53047 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -88,23 +88,17 @@ public:
virtual ~LOKInteractionHandler() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
- virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
- virtual void SAL_CALL initialize(com::sun::star::uno::Sequence<com::sun::star::uno::Any > const & rArguments)
- throw (com::sun::star::uno::Exception, std::exception) override;
+ virtual void SAL_CALL initialize(com::sun::star::uno::Sequence<com::sun::star::uno::Any > const & rArguments) override;
- virtual void SAL_CALL handle(com::sun::star::uno::Reference<com::sun::star::task::XInteractionRequest> const & rRequest)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL handle(com::sun::star::uno::Reference<com::sun::star::task::XInteractionRequest> const & rRequest) override;
- virtual sal_Bool SAL_CALL handleInteractionRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL handleInteractionRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request) override;
};
#endif
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index a71ca5b0ebaf..bfe2e84df1d6 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -151,20 +151,19 @@ namespace migration
// XServiceInfo
- OUString BasicMigration::getImplementationName() throw (RuntimeException, std::exception)
+ OUString BasicMigration::getImplementationName()
{
return BasicMigration_getImplementationName();
}
sal_Bool BasicMigration::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
- Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
+ Sequence< OUString > BasicMigration::getSupportedServiceNames()
{
return BasicMigration_getSupportedServiceNames();
}
@@ -173,7 +172,7 @@ namespace migration
// XInitialization
- void BasicMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+ void BasicMigration::initialize( const Sequence< Any >& aArguments )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -200,7 +199,6 @@ namespace migration
Any BasicMigration::execute( const Sequence< beans::NamedValue >& )
- throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index 53791d64ba4b..f8d3d0a4a1df 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -66,22 +66,16 @@ namespace migration
virtual ~BasicMigration() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XJob
virtual css::uno::Any SAL_CALL execute(
- const css::uno::Sequence< css::beans::NamedValue >& Arguments )
- throw (css::lang::IllegalArgumentException, css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
};
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index aa3e15deb494..907651433414 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -86,108 +86,65 @@ class JavaMigration : public ::cppu::WeakImplHelper<
{
public:
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
//XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
//XJob
virtual css::uno::Any SAL_CALL execute(
- const css::uno::Sequence<css::beans::NamedValue >& Arguments )
- throw (css::lang::IllegalArgumentException, css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence<css::beans::NamedValue >& Arguments ) override;
// XLayerHandler
- virtual void SAL_CALL startLayer()
- throw(css::lang::WrappedTargetException, std::exception) override;
+ virtual void SAL_CALL startLayer() override;
- virtual void SAL_CALL endLayer()
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ virtual void SAL_CALL endLayer() override;
virtual void SAL_CALL overrideNode(
const OUString& aName,
sal_Int16 aAttributes,
- sal_Bool bClear)
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ sal_Bool bClear) override;
virtual void SAL_CALL addOrReplaceNode(
const OUString& aName,
- sal_Int16 aAttributes)
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ sal_Int16 aAttributes) override;
virtual void SAL_CALL addOrReplaceNodeFromTemplate(
const OUString& aName,
const css::configuration::backend::TemplateIdentifier& aTemplate,
- sal_Int16 aAttributes )
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ sal_Int16 aAttributes ) override;
- virtual void SAL_CALL endNode()
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ virtual void SAL_CALL endNode() override;
virtual void SAL_CALL dropNode(
- const OUString& aName )
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ const OUString& aName ) override;
virtual void SAL_CALL overrideProperty(
const OUString& aName,
sal_Int16 aAttributes,
const css::uno::Type& aType,
- sal_Bool bClear )
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ sal_Bool bClear ) override;
virtual void SAL_CALL setPropertyValue(
- const css::uno::Any& aValue )
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ const css::uno::Any& aValue ) override;
virtual void SAL_CALL setPropertyValueForLocale(
const css::uno::Any& aValue,
- const OUString& aLocale )
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ const OUString& aLocale ) override;
- virtual void SAL_CALL endProperty()
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ virtual void SAL_CALL endProperty() override;
virtual void SAL_CALL addProperty(
const OUString& aName,
sal_Int16 aAttributes,
- const css::uno::Type& aType )
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ const css::uno::Type& aType ) override;
virtual void SAL_CALL addPropertyWithValue(
const OUString& aName,
sal_Int16 aAttributes,
- const css::uno::Any& aValue )
- throw(
- css::configuration::backend::MalformedDataException,
- css::lang::WrappedTargetException, std::exception ) override;
+ const css::uno::Any& aValue ) override;
virtual ~JavaMigration() override;
@@ -221,26 +178,22 @@ css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames()
// XServiceInfo
OUString SAL_CALL JavaMigration::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return jvmfwk_getImplementationName();
}
sal_Bool JavaMigration::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< OUString > SAL_CALL JavaMigration::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return jvmfwk_getSupportedServiceNames();
}
//XInitialization ----------------------------------------------------------------------
void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{
const css::uno::Any* pIter = aArguments.getConstArray();
const css::uno::Any* pEnd = pIter + aArguments.getLength();
@@ -284,8 +237,6 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
//XJob
css::uno::Any SAL_CALL JavaMigration::execute(
const css::uno::Sequence<css::beans::NamedValue >& )
- throw (css::lang::IllegalArgumentException, css::uno::Exception,
- css::uno::RuntimeException, std::exception)
{
migrateJavarc();
if (m_xLayer.is())
@@ -330,15 +281,11 @@ void JavaMigration::migrateJavarc()
// XLayerHandler
void SAL_CALL JavaMigration::startLayer()
- throw(css::lang::WrappedTargetException, std::exception)
{
}
void SAL_CALL JavaMigration::endLayer()
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
@@ -347,9 +294,6 @@ void SAL_CALL JavaMigration::overrideNode(
const OUString&,
sal_Int16,
sal_Bool)
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
@@ -359,25 +303,16 @@ void SAL_CALL JavaMigration::overrideNode(
void SAL_CALL JavaMigration::addOrReplaceNode(
const OUString&,
sal_Int16)
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
void SAL_CALL JavaMigration::endNode()
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
void SAL_CALL JavaMigration::dropNode(
const OUString& )
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
@@ -387,9 +322,6 @@ void SAL_CALL JavaMigration::overrideProperty(
sal_Int16,
const Type&,
sal_Bool )
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
if ( aName == "Enable" )
m_aStack.push(TElementStack::value_type(aName,ENABLE_JAVA));
@@ -400,9 +332,6 @@ void SAL_CALL JavaMigration::overrideProperty(
void SAL_CALL JavaMigration::setPropertyValue(
const Any& aValue )
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
if ( !m_aStack.empty())
{
@@ -446,17 +375,11 @@ void SAL_CALL JavaMigration::setPropertyValue(
void SAL_CALL JavaMigration::setPropertyValueForLocale(
const Any&,
const OUString& )
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
void SAL_CALL JavaMigration::endProperty()
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
if (!m_aStack.empty())
m_aStack.pop();
@@ -467,9 +390,6 @@ void SAL_CALL JavaMigration::addProperty(
const OUString&,
sal_Int16,
const Type& )
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
@@ -478,9 +398,6 @@ void SAL_CALL JavaMigration::addPropertyWithValue(
const OUString&,
sal_Int16,
const Any& )
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
@@ -488,9 +405,6 @@ void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate(
const OUString&,
const TemplateIdentifier&,
sal_Int16 )
- throw(
- MalformedDataException,
- WrappedTargetException, std::exception )
{
}
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index a0caafb4ea9a..182c50bf5e2f 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -293,20 +293,19 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir )
// XServiceInfo
-OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException, std::exception)
+OUString OO3ExtensionMigration::getImplementationName()
{
return OO3ExtensionMigration_getImplementationName();
}
sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
-Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames()
{
return OO3ExtensionMigration_getSupportedServiceNames();
}
@@ -315,7 +314,7 @@ Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (Ru
// XInitialization
-void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -345,7 +344,6 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro
}
Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
- throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -385,14 +383,12 @@ TmpRepositoryCommandEnv::~TmpRepositoryCommandEnv()
// XCommandEnvironment
uno::Reference< task::XInteractionHandler > TmpRepositoryCommandEnv::getInteractionHandler()
-throw ( uno::RuntimeException, std::exception )
{
return this;
}
uno::Reference< ucb::XProgressHandler > TmpRepositoryCommandEnv::getProgressHandler()
-throw ( uno::RuntimeException, std::exception )
{
return this;
}
@@ -400,7 +396,6 @@ throw ( uno::RuntimeException, std::exception )
// XInteractionHandler
void TmpRepositoryCommandEnv::handle(
uno::Reference< task::XInteractionRequest> const & xRequest )
- throw ( uno::RuntimeException, std::exception )
{
OSL_ASSERT( xRequest->getRequest().getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -428,17 +423,15 @@ void TmpRepositoryCommandEnv::handle(
// XProgressHandler
void TmpRepositoryCommandEnv::push( uno::Any const & /*Status*/ )
-throw (uno::RuntimeException, std::exception)
{
}
void TmpRepositoryCommandEnv::update( uno::Any const & /*Status */)
-throw (uno::RuntimeException, std::exception)
{
}
-void TmpRepositoryCommandEnv::pop() throw (uno::RuntimeException, std::exception)
+void TmpRepositoryCommandEnv::pop()
{
}
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 482dfe844909..f9722aa2edac 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -90,22 +90,16 @@ namespace migration
virtual ~OO3ExtensionMigration() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XJob
virtual css::uno::Any SAL_CALL execute(
- const css::uno::Sequence< css::beans::NamedValue >& Arguments )
- throw (css::lang::IllegalArgumentException, css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
};
class TmpRepositoryCommandEnv
@@ -119,21 +113,18 @@ namespace migration
// XCommandEnvironment
virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL
- getInteractionHandler() throw ( css::uno::RuntimeException, std::exception ) override;
+ getInteractionHandler() override;
virtual css::uno::Reference< css::ucb::XProgressHandler >
- SAL_CALL getProgressHandler() throw ( css::uno::RuntimeException, std::exception ) override;
+ SAL_CALL getProgressHandler() override;
// XInteractionHandler
virtual void SAL_CALL handle(
- css::uno::Reference< css::task::XInteractionRequest > const & xRequest )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::task::XInteractionRequest > const & xRequest ) override;
// XProgressHandler
- virtual void SAL_CALL push( css::uno::Any const & Status )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL update( css::uno::Any const & Status )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL push( css::uno::Any const & Status ) override;
+ virtual void SAL_CALL update( css::uno::Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 91950c4f49a7..8e607ac8b594 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -185,20 +185,19 @@ bool IsUserWordbook( const OUString& rFile )
// XServiceInfo
- OUString WordbookMigration::getImplementationName() throw (RuntimeException, std::exception)
+ OUString WordbookMigration::getImplementationName()
{
return WordbookMigration_getImplementationName();
}
sal_Bool WordbookMigration::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
- Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
+ Sequence< OUString > WordbookMigration::getSupportedServiceNames()
{
return WordbookMigration_getSupportedServiceNames();
}
@@ -207,7 +206,7 @@ bool IsUserWordbook( const OUString& rFile )
// XInitialization
- void WordbookMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+ void WordbookMigration::initialize( const Sequence< Any >& aArguments )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -234,7 +233,6 @@ bool IsUserWordbook( const OUString& rFile )
Any WordbookMigration::execute( const Sequence< beans::NamedValue >& )
- throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 86013ce36d89..ab89858ee109 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -66,22 +66,16 @@ namespace migration
virtual ~WordbookMigration() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XJob
virtual css::uno::Any SAL_CALL execute(
- const css::uno::Sequence< css::beans::NamedValue >& Arguments )
- throw (css::lang::IllegalArgumentException, css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
};
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 2449a7fd4bb1..9f95f1a28ce8 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -129,7 +129,6 @@ void Acceptor::run()
// XInitialize
void Acceptor::initialize( const Sequence<Any>& aArguments )
- throw( Exception, std::exception )
{
// prevent multiple initialization
osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -185,7 +184,6 @@ OUString Acceptor::impl_getImplementationName()
return OUString("com.sun.star.office.comp.Acceptor");
}
OUString Acceptor::getImplementationName()
- throw (RuntimeException, std::exception)
{
return Acceptor::impl_getImplementationName();
}
@@ -195,13 +193,11 @@ Sequence<OUString> Acceptor::impl_getSupportedServiceNames()
return aSequence;
}
Sequence<OUString> Acceptor::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return Acceptor::impl_getSupportedServiceNames();
}
sal_Bool Acceptor::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
@@ -229,7 +225,6 @@ AccInstanceProvider::~AccInstanceProvider()
}
Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
- throw ( NoSuchElementException, std::exception )
{
Reference<XInterface> rInstance;
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 0dc1889d0adb..bbafc03030f1 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -77,17 +77,13 @@ public:
// XService info
static OUString impl_getImplementationName();
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
static css::uno::Sequence<OUString> impl_getSupportedServiceNames();
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& aName )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) override;
// XInitialize
- virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments )
- throw ( css::uno::Exception, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments ) override;
static css::uno::Reference<css::uno::XInterface> impl_getInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
};
@@ -104,8 +100,7 @@ public:
virtual ~AccInstanceProvider() override;
// XInstanceProvider
- virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName )
- throw ( css::container::NoSuchElementException, std::exception ) override;
+ virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName ) override;
};
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 822a1b9c4276..f18188349b79 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -131,18 +131,15 @@ public:
: m_rDialogClosedCondition( rDialogClosedCondition ) {}
// XEventListener (base of XDialogClosedListener)
- virtual void SAL_CALL disposing( lang::EventObject const & Source )
- throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( lang::EventObject const & Source ) override;
// XDialogClosedListener
virtual void SAL_CALL dialogClosed(
- ui::dialogs::DialogClosedEvent const & aEvent )
- throw (RuntimeException, std::exception) override;
+ ui::dialogs::DialogClosedEvent const & aEvent ) override;
};
// XEventListener (base of XDialogClosedListener)
void DialogClosedListenerImpl::disposing( lang::EventObject const & )
- throw (RuntimeException, std::exception)
{
// nothing to do
}
@@ -150,7 +147,6 @@ void DialogClosedListenerImpl::disposing( lang::EventObject const & )
// XDialogClosedListener
void DialogClosedListenerImpl::dialogClosed(
ui::dialogs::DialogClosedEvent const & )
- throw (RuntimeException, std::exception)
{
m_rDialogClosedCondition.set();
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 2de8302b6020..a47d4b81761b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -64,7 +64,7 @@ class CommandEnvironmentImpl
Reference< XProgressHandler > m_xLogFile;
/// @throws RuntimeException
- void update_( Any const & Status ) throw (RuntimeException);
+ void update_( Any const & Status );
void printLicense(const OUString & sName,const OUString& sLicense,
bool & accept, bool & decline);
@@ -79,19 +79,17 @@ public:
// XCommandEnvironment
virtual Reference< task::XInteractionHandler > SAL_CALL
- getInteractionHandler() throw (RuntimeException, std::exception) override;
- virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
- throw (RuntimeException, std::exception) override;
+ getInteractionHandler() override;
+ virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override;
// XInteractionHandler
virtual void SAL_CALL handle(
- Reference< task::XInteractionRequest > const & xRequest )
- throw (RuntimeException, std::exception) override;
+ Reference< task::XInteractionRequest > const & xRequest ) override;
// XProgressHandler
- virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL pop() throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL push( Any const & Status ) override;
+ virtual void SAL_CALL update( Any const & Status ) override;
+ virtual void SAL_CALL pop() override;
};
@@ -188,14 +186,13 @@ void CommandEnvironmentImpl::printLicense(
// XCommandEnvironment
Reference< task::XInteractionHandler >
-CommandEnvironmentImpl::getInteractionHandler() throw (RuntimeException, std::exception)
+CommandEnvironmentImpl::getInteractionHandler()
{
return this;
}
Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler()
- throw (RuntimeException, std::exception)
{
return this;
}
@@ -204,7 +201,6 @@ Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler()
void CommandEnvironmentImpl::handle(
Reference<task::XInteractionRequest> const & xRequest )
- throw (RuntimeException, std::exception)
{
Any request( xRequest->getRequest() );
OSL_ASSERT( request.getValueTypeClass() == TypeClass_EXCEPTION );
@@ -323,7 +319,6 @@ void CommandEnvironmentImpl::handle(
// XProgressHandler
void CommandEnvironmentImpl::push( Any const & Status )
- throw (RuntimeException, std::exception)
{
update_( Status );
OSL_ASSERT( m_logLevel >= 0 );
@@ -334,7 +329,6 @@ void CommandEnvironmentImpl::push( Any const & Status )
void CommandEnvironmentImpl::update_( Any const & Status )
- throw (RuntimeException)
{
if (! Status.hasValue())
return;
@@ -376,7 +370,6 @@ void CommandEnvironmentImpl::update_( Any const & Status )
void CommandEnvironmentImpl::update( Any const & Status )
- throw (RuntimeException, std::exception)
{
update_( Status );
if (m_xLogFile.is())
@@ -384,7 +377,7 @@ void CommandEnvironmentImpl::update( Any const & Status )
}
-void CommandEnvironmentImpl::pop() throw (RuntimeException, std::exception)
+void CommandEnvironmentImpl::pop()
{
OSL_ASSERT( m_logLevel > 0 );
--m_logLevel;
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 13c59c89c7dc..e809b4e786ad 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -107,26 +107,22 @@ public:
SplashScreen();
// XStatusIndicator
- virtual void SAL_CALL end() throw ( RuntimeException, std::exception ) override;
- virtual void SAL_CALL reset() 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 start(const OUString& aText, sal_Int32 nRange) throw ( RuntimeException, std::exception ) override;
+ virtual void SAL_CALL end() override;
+ virtual void SAL_CALL reset() override;
+ virtual void SAL_CALL setText(const OUString& aText) override;
+ virtual void SAL_CALL setValue(sal_Int32 nValue) override;
+ virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) override;
// XInitialize
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
- throw ( RuntimeException, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{ return desktop::splash::getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{ return desktop::splash::getSupportedServiceNames(); }
};
@@ -194,7 +190,6 @@ SplashScreen::~SplashScreen()
}
void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
- throw (RuntimeException, std::exception)
{
_iMax = nRange;
if (_bVisible) {
@@ -208,7 +203,6 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
}
void SAL_CALL SplashScreen::end()
- throw (RuntimeException, std::exception)
{
_iProgress = _iMax;
if (_bVisible )
@@ -221,7 +215,6 @@ void SAL_CALL SplashScreen::end()
}
void SAL_CALL SplashScreen::reset()
- throw (RuntimeException, std::exception)
{
_iProgress = 0;
if (_bVisible && !_bProgressEnd )
@@ -234,7 +227,6 @@ void SAL_CALL SplashScreen::reset()
}
void SAL_CALL SplashScreen::setText(const OUString& rText)
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
if ( _sProgressText != rText )
@@ -252,7 +244,6 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
}
void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
- throw (RuntimeException, std::exception)
{
SAL_INFO( "desktop.splash", "setValue: " << nValue );
@@ -272,7 +263,6 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
// XInitialize
void SAL_CALL
SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
- throw (RuntimeException, std::exception)
{
::osl::ClearableMutexGuard aGuard( _aMutex );
if (aArguments.getLength() > 0)
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index ba22c3ec44db..c735f59fa30c 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -45,12 +45,10 @@ UnxSplashScreen::~UnxSplashScreen()
}
void SAL_CALL UnxSplashScreen::start( const OUString& /*aText*/, sal_Int32 /*nRange*/ )
- throw ( uno::RuntimeException, std::exception )
{
}
void SAL_CALL UnxSplashScreen::end()
- throw ( uno::RuntimeException, std::exception )
{
SAL_INFO("desktop.splash", "UnxSplashScreen::end()");
if( !m_pOutFd )
@@ -61,7 +59,6 @@ void SAL_CALL UnxSplashScreen::end()
}
void SAL_CALL UnxSplashScreen::reset()
- throw ( uno::RuntimeException, std::exception )
{
SAL_INFO("desktop.splash", "UNXSplashScreen::reset()");
if( !m_pOutFd )
@@ -72,13 +69,11 @@ void SAL_CALL UnxSplashScreen::reset()
}
void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ )
- throw ( uno::RuntimeException, std::exception )
{
// TODO?
}
void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
- throw ( uno::RuntimeException, std::exception )
{
if ( m_pOutFd )
{
@@ -90,7 +85,6 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
// XInitialize
void SAL_CALL
UnxSplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& )
- throw ( uno::RuntimeException, std::exception )
{
for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
{
@@ -109,19 +103,16 @@ UnxSplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& )
}
OUString UnxSplashScreen::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return UnxSplash_getImplementationName();
}
sal_Bool UnxSplashScreen::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence<OUString> UnxSplashScreen::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return UnxSplash_getSupportedServiceNames();
}
@@ -133,7 +124,7 @@ using namespace desktop;
// get service instance...
static uno::Reference< uno::XInterface > m_xINSTANCE;
-uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & ) throw( uno::Exception )
+uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & )
{
static osl::Mutex s_aMutex;
if ( !m_xINSTANCE.is() )
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index 69b51c383385..faf4233a9bef 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -46,29 +46,26 @@ public:
explicit UnxSplashScreen();
// XStatusIndicator
- virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL end() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setText( const OUString& aText ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( css::uno::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 reset() override;
+ virtual void SAL_CALL setText( const OUString& aText ) override;
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) override;
// XInitialize
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
}
/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx ) throw( css::uno::Exception );
+css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx );
OUString UnxSplash_getImplementationName();
css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw ();