summaryrefslogtreecommitdiff
path: root/unotools/source/accessibility
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 /unotools/source/accessibility
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 'unotools/source/accessibility')
-rw-r--r--unotools/source/accessibility/accessiblerelationsethelper.cxx30
-rw-r--r--unotools/source/accessibility/accessiblestatesethelper.cxx28
2 files changed, 10 insertions, 48 deletions
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index e25719c8bb2c..1a59cea8e844 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -33,22 +33,16 @@ public:
AccessibleRelationSetHelperImpl(const AccessibleRelationSetHelperImpl& rImpl);
/// @throws uno::RuntimeException
- sal_Int32 getRelationCount( )
- throw (uno::RuntimeException);
+ sal_Int32 getRelationCount( );
/// @throws lang::IndexOutOfBoundsException
/// @throws uno::RuntimeException
- AccessibleRelation getRelation( sal_Int32 nIndex )
- throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException);
+ AccessibleRelation getRelation( sal_Int32 nIndex );
/// @throws uno::RuntimeException
- bool containsRelation( sal_Int16 aRelationType )
- throw (uno::RuntimeException);
+ bool containsRelation( sal_Int16 aRelationType );
/// @throws uno::RuntimeException
- AccessibleRelation getRelationByType( sal_Int16 aRelationType )
- throw (uno::RuntimeException);
+ AccessibleRelation getRelationByType( sal_Int16 aRelationType );
/// @throws uno::RuntimeException
- void AddRelation(const AccessibleRelation& rRelation)
- throw (uno::RuntimeException);
+ void AddRelation(const AccessibleRelation& rRelation);
private:
std::vector<AccessibleRelation> maRelations;
@@ -64,14 +58,11 @@ AccessibleRelationSetHelperImpl::AccessibleRelationSetHelperImpl(const Accessibl
}
sal_Int32 AccessibleRelationSetHelperImpl::getRelationCount( )
- throw (uno::RuntimeException)
{
return maRelations.size();
}
AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nIndex )
- throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException)
{
if ((nIndex < 0) || (static_cast<sal_uInt32>(nIndex) >= maRelations.size()))
throw lang::IndexOutOfBoundsException();
@@ -79,7 +70,6 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nInde
}
bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType )
- throw (uno::RuntimeException)
{
AccessibleRelation defaultRelation; // default is INVALID
AccessibleRelation relationByType = getRelationByType(aRelationType);
@@ -87,7 +77,6 @@ bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType
}
AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16 aRelationType )
- throw (uno::RuntimeException)
{
sal_Int32 nCount(getRelationCount());
sal_Int32 i(0);
@@ -103,7 +92,6 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16
}
void AccessibleRelationSetHelperImpl::AddRelation(const AccessibleRelation& rRelation)
- throw (uno::RuntimeException)
{
sal_Int32 nCount(getRelationCount());
sal_Int32 i(0);
@@ -150,7 +138,6 @@ AccessibleRelationSetHelper::~AccessibleRelationSetHelper()
*/
sal_Int32 SAL_CALL
AccessibleRelationSetHelper::getRelationCount( )
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
return mpHelperImpl->getRelationCount();
@@ -171,8 +158,6 @@ sal_Int32 SAL_CALL
*/
AccessibleRelation SAL_CALL
AccessibleRelationSetHelper::getRelation( sal_Int32 nIndex )
- throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
return mpHelperImpl->getRelation(nIndex);
@@ -192,7 +177,6 @@ sal_Int32 SAL_CALL
*/
sal_Bool SAL_CALL
AccessibleRelationSetHelper::containsRelation( sal_Int16 aRelationType )
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
return mpHelperImpl->containsRelation(aRelationType);
@@ -211,14 +195,12 @@ sal_Bool SAL_CALL
*/
AccessibleRelation SAL_CALL
AccessibleRelationSetHelper::getRelationByType( sal_Int16 aRelationType )
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
return mpHelperImpl->getRelationByType(aRelationType);
}
void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelation)
- throw (uno::RuntimeException)
{
osl::MutexGuard aGuard (maMutex);
mpHelperImpl->AddRelation(rRelation);
@@ -227,7 +209,6 @@ void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelatio
//===== XTypeProvider =======================================================
uno::Sequence< css::uno::Type> AccessibleRelationSetHelper::getTypes()
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
css::uno::Sequence< css::uno::Type> aTypeSequence {
@@ -238,7 +219,6 @@ uno::Sequence< css::uno::Type> AccessibleRelationSetHelper::getTypes()
}
uno::Sequence<sal_Int8> SAL_CALL AccessibleRelationSetHelper::getImplementationId()
- throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 0b669c6cdbbe..26cd61c1a5e8 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -36,20 +36,15 @@ public:
AccessibleStateSetHelperImpl(const AccessibleStateSetHelperImpl& rImpl);
/// @throws uno::RuntimeException
- bool IsEmpty () const
- throw (uno::RuntimeException);
+ bool IsEmpty () const;
/// @throws uno::RuntimeException
- bool Contains (sal_Int16 aState) const
- throw (uno::RuntimeException);
+ bool Contains (sal_Int16 aState) const;
/// @throws uno::RuntimeException
- uno::Sequence<sal_Int16> GetStates() const
- throw (uno::RuntimeException);
+ uno::Sequence<sal_Int16> GetStates() const;
/// @throws uno::RuntimeException
- void AddState(sal_Int16 aState)
- throw (uno::RuntimeException);
+ void AddState(sal_Int16 aState);
/// @throws uno::RuntimeException
- void RemoveState(sal_Int16 aState)
- throw (uno::RuntimeException);
+ void RemoveState(sal_Int16 aState);
inline void AddStates( const sal_Int64 _nStates );
@@ -68,13 +63,11 @@ AccessibleStateSetHelperImpl::AccessibleStateSetHelperImpl(const AccessibleState
}
inline bool AccessibleStateSetHelperImpl::IsEmpty () const
- throw (uno::RuntimeException)
{
return maStates == 0;
}
inline bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
- throw (uno::RuntimeException)
{
DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
sal_uInt64 aTempBitSet(1);
@@ -83,7 +76,6 @@ inline bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
}
inline uno::Sequence<sal_Int16> AccessibleStateSetHelperImpl::GetStates() const
- throw (uno::RuntimeException)
{
uno::Sequence<sal_Int16> aRet(BITFIELDSIZE);
sal_Int16* pSeq = aRet.getArray();
@@ -105,7 +97,6 @@ inline void AccessibleStateSetHelperImpl::AddStates( const sal_Int64 _nStates )
}
inline void AccessibleStateSetHelperImpl::AddState(sal_Int16 aState)
- throw (uno::RuntimeException)
{
DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
sal_uInt64 aTempBitSet(1);
@@ -114,7 +105,6 @@ inline void AccessibleStateSetHelperImpl::AddState(sal_Int16 aState)
}
inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
- throw (uno::RuntimeException)
{
DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
sal_uInt64 aTempBitSet(1);
@@ -158,7 +148,6 @@ AccessibleStateSetHelper::~AccessibleStateSetHelper()
<FALSE/> if there is at least one state set in it.
*/
sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty ()
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
return mpHelperImpl->IsEmpty();
@@ -176,7 +165,6 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty ()
state set and <FALSE/> otherwise.
*/
sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState)
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
return mpHelperImpl->Contains(aState);
@@ -199,7 +187,6 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState)
*/
sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll
(const uno::Sequence<sal_Int16>& rStateSet)
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
sal_Int32 nCount(rStateSet.getLength());
@@ -215,21 +202,18 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll
}
uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSetHelper::getStates()
- throw (uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard(maMutex);
return mpHelperImpl->GetStates();
}
void AccessibleStateSetHelper::AddState(sal_Int16 aState)
- throw (uno::RuntimeException)
{
osl::MutexGuard aGuard (maMutex);
mpHelperImpl->AddState(aState);
}
void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
- throw (uno::RuntimeException)
{
osl::MutexGuard aGuard (maMutex);
mpHelperImpl->RemoveState(aState);
@@ -238,7 +222,6 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
//===== XTypeProvider =======================================================
uno::Sequence< css::uno::Type> AccessibleStateSetHelper::getTypes()
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< css::uno::Type> aTypeSequence {
cppu::UnoType<XAccessibleStateSet>::get(),
@@ -248,7 +231,6 @@ uno::Sequence< css::uno::Type> AccessibleStateSetHelper::getTypes()
}
uno::Sequence<sal_Int8> SAL_CALL AccessibleStateSetHelper::getImplementationId()
- throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}