summaryrefslogtreecommitdiff
path: root/stoc/source/javavm
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 /stoc/source/javavm
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 'stoc/source/javavm')
-rw-r--r--stoc/source/javavm/interact.cxx7
-rw-r--r--stoc/source/javavm/interact.hxx5
-rw-r--r--stoc/source/javavm/javavm.cxx26
-rw-r--r--stoc/source/javavm/javavm.hxx41
4 files changed, 23 insertions, 56 deletions
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 5e20d3d603c5..081dce9b1e72 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -40,7 +40,7 @@ public:
AbortContinuation(const AbortContinuation&) = delete;
AbortContinuation& operator=(const AbortContinuation&)= delete;
- virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override {}
+ virtual void SAL_CALL select() override {}
private:
virtual inline ~AbortContinuation() override {}
@@ -56,7 +56,7 @@ public:
RetryContinuation(const RetryContinuation&) = delete;
RetryContinuation& operator=(const RetryContinuation&) = delete;
- virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL select() override;
bool isSelected() const;
@@ -68,7 +68,6 @@ private:
};
void SAL_CALL InteractionRequest::RetryContinuation::select()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
m_bSelected = true;
@@ -90,14 +89,12 @@ InteractionRequest::InteractionRequest(css::uno::Any const & rRequest):
}
css::uno::Any SAL_CALL InteractionRequest::getRequest()
- throw (css::uno::RuntimeException, std::exception)
{
return m_aRequest;
}
css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >
SAL_CALL InteractionRequest::getContinuations()
- throw (css::uno::RuntimeException, std::exception)
{
return m_aContinuations;
}
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 8977b4449416..67a506769327 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -39,12 +39,11 @@ class InteractionRequest:
public:
explicit InteractionRequest(css::uno::Any const & rRequest);
- virtual css::uno::Any SAL_CALL getRequest()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getRequest() override;
virtual css::uno::Sequence< css::uno::Reference<
css::task::XInteractionContinuation > > SAL_CALL
- getContinuations() throw (css::uno::RuntimeException, std::exception) override;
+ getContinuations() override;
bool retry() const;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 907fd12bd7ea..8627f8583d6c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -131,8 +131,7 @@ private:
SingletonFactory(const SingletonFactory&) = delete;
SingletonFactory& operator=(const SingletonFactory&) = delete;
- virtual void SAL_CALL disposing(css::lang::EventObject const &)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(css::lang::EventObject const &) override;
static void dispose();
@@ -173,7 +172,6 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::getSingleton(
}
void SAL_CALL SingletonFactory::disposing(css::lang::EventObject const &)
- throw (css::uno::RuntimeException, std::exception)
{
dispose();
}
@@ -268,7 +266,7 @@ bool askForRetry(css::uno::Any const & rException)
/// @throws css::uno::Exception
void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
- const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw (css::uno::Exception)
+ const css::uno::Reference<css::uno::XComponentContext> &xCtx )
{
css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext(
"com.sun.star.configuration.ConfigurationRegistry",
@@ -351,7 +349,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
void getDefaultLocaleFromConfig(
stoc_javavm::JVM * pjvm,
const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
- const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw(css::uno::Exception, std::exception)
+ const css::uno::Reference<css::uno::XComponentContext> &xCtx )
{
css::uno::Reference<css::uno::XInterface> xConfRegistry =
xSMgr->createInstanceWithContext( "com.sun.star.configuration.ConfigurationRegistry", xCtx );
@@ -455,7 +453,7 @@ void getDefaultLocaleFromConfig(
void getJavaPropsFromSafetySettings(
stoc_javavm::JVM * pjvm,
const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
- const css::uno::Reference<css::uno::XComponentContext> &xCtx) throw(css::uno::Exception)
+ const css::uno::Reference<css::uno::XComponentContext> &xCtx)
{
css::uno::Reference<css::uno::XInterface> xConfRegistry =
xSMgr->createInstanceWithContext(
@@ -542,7 +540,7 @@ void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
void initVMConfiguration(
stoc_javavm::JVM * pjvm,
const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
- const css::uno::Reference<css::uno::XComponentContext > &xCtx) throw(css::uno::Exception, std::exception)
+ const css::uno::Reference<css::uno::XComponentContext > &xCtx)
{
stoc_javavm::JVM jvm;
try {
@@ -619,7 +617,6 @@ JavaVirtualMachine::JavaVirtualMachine(
void SAL_CALL
JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const &
rArguments)
- throw (css::uno::Exception, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
if (m_bDisposed)
@@ -674,28 +671,24 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const &
}
OUString SAL_CALL JavaVirtualMachine::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return serviceGetImplementationName();
}
sal_Bool SAL_CALL
JavaVirtualMachine::supportsService(OUString const & rServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL
JavaVirtualMachine::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return serviceGetSupportedServiceNames();
}
css::uno::Any SAL_CALL
JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
if (m_bDisposed)
@@ -935,7 +928,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
}
sal_Bool SAL_CALL JavaVirtualMachine::isVMStarted()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
if (m_bDisposed)
@@ -945,7 +937,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMStarted()
}
sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled()
- throw (css::uno::RuntimeException, std::exception)
{
{
osl::MutexGuard aGuard(m_aMutex);
@@ -964,7 +955,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled()
}
sal_Bool SAL_CALL JavaVirtualMachine::isThreadAttached()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
if (m_bDisposed)
@@ -978,7 +968,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isThreadAttached()
}
void SAL_CALL JavaVirtualMachine::registerThread()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
if (m_bDisposed)
@@ -1011,7 +1000,6 @@ void SAL_CALL JavaVirtualMachine::registerThread()
}
void SAL_CALL JavaVirtualMachine::revokeThread()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
if (m_bDisposed)
@@ -1033,7 +1021,6 @@ void SAL_CALL JavaVirtualMachine::revokeThread()
void SAL_CALL
JavaVirtualMachine::disposing(css::lang::EventObject const & rSource)
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(m_aMutex);
if (rSource.Source == m_xInetConfiguration)
@@ -1044,12 +1031,10 @@ JavaVirtualMachine::disposing(css::lang::EventObject const & rSource)
void SAL_CALL JavaVirtualMachine::elementInserted(
css::container::ContainerEvent const &)
- throw (css::uno::RuntimeException, std::exception)
{}
void SAL_CALL JavaVirtualMachine::elementRemoved(
css::container::ContainerEvent const &)
- throw (css::uno::RuntimeException, std::exception)
{}
// If a user changes the setting, for example for proxy settings, then this
@@ -1059,7 +1044,6 @@ void SAL_CALL JavaVirtualMachine::elementRemoved(
// values.
void SAL_CALL JavaVirtualMachine::elementReplaced(
css::container::ContainerEvent const & rEvent)
- throw (css::uno::RuntimeException, std::exception)
{
// TODO Using the new value stored in rEvent is wrong here. If two threads
// receive different elementReplaced calls in quick succession, it is
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index f4ebabd48f7f..a8883f1ddffb 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -66,57 +66,44 @@ public:
// XInitialization
virtual void SAL_CALL
initialize(css::uno::Sequence< css::uno::Any > const &
- rArguments)
- throw (css::uno::Exception, std::exception) override;
+ rArguments) override;
// XServiceInfo
- 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 & rServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ supportsService(OUString const & rServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
// XJavaVM
virtual css::uno::Any SAL_CALL
- getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
- throw (css::uno::RuntimeException, std::exception) override;
+ getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) override;
- virtual sal_Bool SAL_CALL isVMStarted()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isVMStarted() override;
- virtual sal_Bool SAL_CALL isVMEnabled()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isVMEnabled() override;
// XJavaThreadRegister_11
- virtual sal_Bool SAL_CALL isThreadAttached()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isThreadAttached() override;
- virtual void SAL_CALL registerThread()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL registerThread() override;
- virtual void SAL_CALL revokeThread()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL revokeThread() override;
// XContainerListener
virtual void SAL_CALL
- disposing(css::lang::EventObject const & rSource)
- throw (css::uno::RuntimeException, std::exception) override;
+ disposing(css::lang::EventObject const & rSource) override;
virtual void SAL_CALL
- elementInserted(css::container::ContainerEvent const & rEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ elementInserted(css::container::ContainerEvent const & rEvent) override;
virtual void SAL_CALL
- elementRemoved(css::container::ContainerEvent const & rEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ elementRemoved(css::container::ContainerEvent const & rEvent) override;
virtual void SAL_CALL
- elementReplaced(css::container::ContainerEvent const & rEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ elementReplaced(css::container::ContainerEvent const & rEvent) override;
private:
JavaVirtualMachine(JavaVirtualMachine &) = delete;