summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/registry/sfwk
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/deployment/registry/sfwk
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/deployment/registry/sfwk')
-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
3 files changed, 13 insertions, 43 deletions
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)
{
}