summaryrefslogtreecommitdiff
path: root/uui
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 /uui
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 'uui')
-rw-r--r--uui/source/fltdlg.cxx2
-rw-r--r--uui/source/interactionhandler.cxx24
-rw-r--r--uui/source/passwordcontainer.cxx6
-rw-r--r--uui/source/passwordcontainer.hxx15
-rw-r--r--uui/source/requeststringresolver.cxx4
-rw-r--r--uui/source/requeststringresolver.hxx12
6 files changed, 17 insertions, 46 deletions
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 4aa2baa2c8e9..84cec1b166a6 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -173,7 +173,7 @@ class StringCalculator : public ::cppu::WeakImplHelper< css::util::XStringWidth
{
}
- sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( css::uno::RuntimeException, std::exception ) override
+ sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) override
{
return (sal_Int32)(m_pDevice->GetTextWidth(sString));
}
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 7ed463cd844b..fde6db7f4687 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -47,29 +47,24 @@ public:
UUIInteractionHandler(const UUIInteractionHandler&) = delete;
UUIInteractionHandler& operator=(const UUIInteractionHandler&) = delete;
- 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;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
virtual void SAL_CALL
initialize(
- css::uno::Sequence< css::uno::Any > const & rArguments)
- throw (css::uno::Exception, std::exception) override;
+ css::uno::Sequence< css::uno::Any > const & rArguments) override;
virtual void SAL_CALL
- handle(css::uno::Reference< css::task::XInteractionRequest > const & rRequest)
- throw (css::uno::RuntimeException, std::exception) override;
+ handle(css::uno::Reference< css::task::XInteractionRequest > const & rRequest) override;
virtual sal_Bool SAL_CALL
handleInteractionRequest(
const css::uno::Reference< css::task::XInteractionRequest >& Request
- ) throw ( css::uno::RuntimeException, std::exception ) override;
+ ) override;
};
UUIInteractionHandler::UUIInteractionHandler(
@@ -79,21 +74,18 @@ UUIInteractionHandler::UUIInteractionHandler(
}
OUString SAL_CALL UUIInteractionHandler::getImplementationName()
- throw (uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.uui.UUIInteractionHandler");
}
sal_Bool SAL_CALL
UUIInteractionHandler::supportsService(OUString const & rServiceName)
- throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SAL_CALL
UUIInteractionHandler::getSupportedServiceNames()
- throw (uno::RuntimeException, std::exception)
{
uno::Sequence< OUString > aNames(3);
aNames[0] = "com.sun.star.task.InteractionHandler";
@@ -107,7 +99,6 @@ UUIInteractionHandler::getSupportedServiceNames()
void SAL_CALL
UUIInteractionHandler::initialize(
uno::Sequence< uno::Any > const & rArguments)
- throw (uno::Exception, std::exception)
{
uno::Reference<uno::XComponentContext> xContext = m_pImpl->getORB();
m_pImpl.reset();
@@ -139,7 +130,6 @@ UUIInteractionHandler::initialize(
void SAL_CALL
UUIInteractionHandler::handle(
uno::Reference< task::XInteractionRequest > const & rRequest)
- throw (uno::RuntimeException, std::exception)
{
try
{
@@ -152,7 +142,7 @@ UUIInteractionHandler::handle(
}
sal_Bool SAL_CALL UUIInteractionHandler::handleInteractionRequest(
- const uno::Reference< task::XInteractionRequest >& Request ) throw ( uno::RuntimeException, std::exception )
+ const uno::Reference< task::XInteractionRequest >& Request )
{
try
{
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 35bf978669d8..c0639c269cfa 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -291,7 +291,6 @@ PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler()
// virtual
OUString SAL_CALL
PasswordContainerInteractionHandler::getImplementationName()
- throw ( uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
@@ -301,7 +300,6 @@ PasswordContainerInteractionHandler::getImplementationName()
sal_Bool SAL_CALL
PasswordContainerInteractionHandler::supportsService(
const OUString& ServiceName )
- throw ( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
@@ -310,7 +308,6 @@ PasswordContainerInteractionHandler::supportsService(
// virtual
uno::Sequence< OUString > SAL_CALL
PasswordContainerInteractionHandler::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
@@ -340,7 +337,6 @@ PasswordContainerInteractionHandler::getSupportedServiceNames_Static()
void SAL_CALL
PasswordContainerInteractionHandler::handle(
const uno::Reference< task::XInteractionRequest >& rRequest )
- throw ( uno::RuntimeException, std::exception )
{
handleInteractionRequest( rRequest );
}
@@ -349,7 +345,6 @@ PasswordContainerInteractionHandler::handle(
sal_Bool SAL_CALL
PasswordContainerInteractionHandler::handleInteractionRequest(
const uno::Reference< task::XInteractionRequest >& rRequest )
- throw ( uno::RuntimeException, std::exception )
{
if ( !rRequest.is() )
return false;
@@ -406,7 +401,6 @@ PasswordContainerInteractionHandler::handleInteractionRequest(
static uno::Reference< uno::XInterface > SAL_CALL
PasswordContainerInteractionHandler_CreateInstance(
const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
- throw( uno::Exception )
{
lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
new PasswordContainerInteractionHandler( comphelper::getComponentContext(rSMgr) ) );
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index 7457ddfe264a..d4bdf32f9d9d 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -134,25 +134,20 @@ public:
virtual ~PasswordContainerInteractionHandler() 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( const OUString& ServiceName )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ getSupportedServiceNames() override;
// XInteractionHandler2
virtual void SAL_CALL
- handle( const css::uno::Reference< css::task::XInteractionRequest >& Request )
- throw (css::uno::RuntimeException, std::exception) override;
+ handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
virtual sal_Bool SAL_CALL
- handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request )
- throw (css::uno::RuntimeException, std::exception) override;
+ handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
// Non-UNO interfaces
static OUString
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index b63b0358f988..1289a9e9c6fc 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -36,7 +36,6 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
OUString SAL_CALL
UUIInteractionRequestStringResolver::getImplementationName()
- throw (uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.uui.UUIInteractionRequestStringResolver");
}
@@ -44,7 +43,6 @@ UUIInteractionRequestStringResolver::getImplementationName()
sal_Bool SAL_CALL
UUIInteractionRequestStringResolver::supportsService(
OUString const & rServiceName)
- throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
@@ -52,7 +50,6 @@ UUIInteractionRequestStringResolver::supportsService(
uno::Sequence< OUString > SAL_CALL
UUIInteractionRequestStringResolver::getSupportedServiceNames()
- throw (uno::RuntimeException, std::exception)
{
return { "com.sun.star.task.InteractionRequestStringResolver" };
}
@@ -61,7 +58,6 @@ beans::Optional< OUString > SAL_CALL
UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
const uno::Reference<
task::XInteractionRequest >& Request )
- throw (uno::RuntimeException, std::exception)
{
try
{
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index e6dc745f2ab7..7a9bf0237623 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -45,21 +45,17 @@ private:
virtual ~UUIInteractionRequestStringResolver() 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 &
- rServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ rServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
virtual css::beans::Optional< OUString > SAL_CALL
getStringFromInformationalRequest(
- const css::uno::Reference< css::task::XInteractionRequest >& Request )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
};
#endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX