summaryrefslogtreecommitdiff
path: root/comphelper/qa
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 /comphelper/qa
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 'comphelper/qa')
-rw-r--r--comphelper/qa/container/comphelper_ifcontainer.cxx3
-rw-r--r--comphelper/qa/container/testifcontainer.cxx5
-rw-r--r--comphelper/qa/string/test_string.cxx62
3 files changed, 30 insertions, 40 deletions
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx
index 135adfdb9304..5a6cff89583d 100644
--- a/comphelper/qa/container/comphelper_ifcontainer.cxx
+++ b/comphelper/qa/container/comphelper_ifcontainer.cxx
@@ -47,8 +47,7 @@ public:
explicit ContainerListener(ContainerStats *pStats)
: m_pStats(pStats) { m_pStats->m_nAlive++; }
virtual ~ContainerListener() override { m_pStats->m_nAlive--; }
- virtual void SAL_CALL disposing( const EventObject& )
- throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL disposing( const EventObject& ) override
{
m_pStats->m_nDisposed++;
}
diff --git a/comphelper/qa/container/testifcontainer.cxx b/comphelper/qa/container/testifcontainer.cxx
index e881f6739db6..b39eef1d5bd4 100644
--- a/comphelper/qa/container/testifcontainer.cxx
+++ b/comphelper/qa/container/testifcontainer.cxx
@@ -48,13 +48,12 @@ class TestListener : public cppu::WeakImplHelper< XVetoableChangeListener >
{
public:
// Methods
- virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) throw(css::uno::RuntimeException) override
+ virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) override
{
}
- virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ )
- throw(css::beans::PropertyVetoException, css::uno::RuntimeException) override
+ virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ ) override
{
}
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
index 636c30587370..1180805542fa 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -89,29 +89,26 @@ class testCollator : public cppu::WeakImplHelper< i18n::XCollator >
public:
virtual sal_Int32 SAL_CALL compareSubstring(
const OUString& str1, sal_Int32 off1, sal_Int32 len1,
- const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException, std::exception) override
+ const OUString& str2, sal_Int32 off2, sal_Int32 len2) override
{
return str1.copy(off1, len1).compareTo(str2.copy(off2, len2));
}
virtual sal_Int32 SAL_CALL compareString(
const OUString& str1,
- const OUString& str2) throw(uno::RuntimeException, std::exception) override
+ const OUString& str2) override
{
return str1.compareTo(str2);
}
- virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32)
- throw(uno::RuntimeException, std::exception) override {return 0;}
+ virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) override {return 0;}
virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const OUString&,
- const lang::Locale&, sal_Int32) throw(uno::RuntimeException, std::exception) override {return 0;}
+ const lang::Locale&, sal_Int32) override {return 0;}
virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const OUString&,
- const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException, std::exception) override {}
- virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
- throw(uno::RuntimeException, std::exception) override
+ const lang::Locale&, const uno::Sequence< sal_Int32 >&) override {}
+ virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) override
{
return uno::Sequence< OUString >();
}
- virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&)
- throw(uno::RuntimeException, std::exception) override
+ virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) override
{
return uno::Sequence< sal_Int32 >();
}
@@ -123,64 +120,59 @@ class testBreakIterator : public cppu::WeakImplHelper< i18n::XBreakIterator >
{
public:
virtual sal_Int32 SAL_CALL nextCharacters( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
- throw(uno::RuntimeException, std::exception) override {return -1;}
+ const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;}
virtual sal_Int32 SAL_CALL previousCharacters( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
- throw(uno::RuntimeException, std::exception) override {return -1;}
+ const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;}
virtual i18n::Boundary SAL_CALL previousWord( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale&, sal_Int16) override
{ return i18n::Boundary(); }
virtual i18n::Boundary SAL_CALL nextWord( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale&, sal_Int16) override
{ return i18n::Boundary(); }
virtual i18n::Boundary SAL_CALL getWordBoundary( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16, sal_Bool )
- throw(uno::RuntimeException, std::exception) override
+ const lang::Locale&, sal_Int16, sal_Bool ) override
{ return i18n::Boundary(); }
virtual sal_Bool SAL_CALL isBeginWord( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale&, sal_Int16 ) override
{ return false; }
virtual sal_Bool SAL_CALL isEndWord( const OUString&, sal_Int32,
- const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale& , sal_Int16 ) override
{ return false; }
virtual sal_Int16 SAL_CALL getWordType( const OUString&, sal_Int32,
- const lang::Locale& ) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale& ) override
{ return 0; }
virtual sal_Int32 SAL_CALL beginOfSentence( const OUString&, sal_Int32,
- const lang::Locale& ) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale& ) override
{ return 0; }
virtual sal_Int32 SAL_CALL endOfSentence( const OUString& rText, sal_Int32,
- const lang::Locale& ) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale& ) override
{ return rText.getLength(); }
virtual i18n::LineBreakResults SAL_CALL getLineBreak( const OUString&, sal_Int32,
const lang::Locale&, sal_Int32,
const i18n::LineBreakHyphenationOptions&,
- const i18n::LineBreakUserOptions&)
- throw(uno::RuntimeException, std::exception) override
+ const i18n::LineBreakUserOptions&) override
{
return i18n::LineBreakResults();
}
- virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 )
- throw(uno::RuntimeException, std::exception) override { return -1; }
+ virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) override { return -1; }
virtual sal_Int32 SAL_CALL beginOfScript( const OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+ sal_Int16 ) override { return -1; }
virtual sal_Int32 SAL_CALL endOfScript( const OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+ sal_Int16 ) override { return -1; }
virtual sal_Int32 SAL_CALL previousScript( const OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+ sal_Int16 ) override { return -1; }
virtual sal_Int32 SAL_CALL nextScript( const OUString&, sal_Int32,
- sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+ sal_Int16 ) override { return -1; }
virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+ const lang::Locale&, sal_Int16 ) override { return -1; }
virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& rText, sal_Int32 nStartPos,
- const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale&, sal_Int16 CharType ) override
{
const sal_Unicode *pStr = rText.getStr()+nStartPos;
for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)
@@ -194,9 +186,9 @@ public:
return -1;
}
virtual sal_Int32 SAL_CALL previousCharBlock( const OUString&, sal_Int32,
- const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+ const lang::Locale&, sal_Int16 ) override { return -1; }
virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& rText, sal_Int32 nStartPos,
- const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override
+ const lang::Locale&, sal_Int16 CharType ) override
{
const sal_Unicode *pStr = rText.getStr()+nStartPos;
for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)