bridges/inc/msvc/amd64.hxx | 4 +-
bridges/inc/msvc/except.hxx | 18
+++++-----
bridges/source/cpp_uno/msvc_shared/except.cxx | 18
+++++-----
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 13
+++----
bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx | 2 -
connectivity/source/drivers/ado/ACallableStatement.cxx | 4 +-
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 4 +-
connectivity/source/drivers/ado/APreparedStatement.cxx | 4 +-
connectivity/source/drivers/ado/AResultSet.cxx | 4 +-
connectivity/source/drivers/ado/AStatement.cxx | 8 ++--
connectivity/source/inc/ado/ACallableStatement.hxx | 4 +-
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 4 +-
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 2 -
connectivity/source/inc/ado/APreparedStatement.hxx | 4 +-
connectivity/source/inc/ado/AResultSet.hxx | 4 +-
connectivity/source/inc/ado/AStatement.hxx | 8 ++--
extensions/source/ole/windata.hxx | 6 +--
include/cppuhelper/compbase1.hxx | 18
+++++-----
include/cppuhelper/compbase10.hxx | 18
+++++-----
include/cppuhelper/compbase11.hxx | 18
+++++-----
include/cppuhelper/implbase11.hxx | 18
+++++-----
shell/source/win32/zipfile/zipexcptn.cxx | 8 ++--
shell/source/win32/zipfile/zipexcptn.hxx | 8 ++--
23 files changed, 100 insertions(+), 99 deletions(-)
New commits:
commit 4bea7449711f1832c1db0e9b5447fb2c3415c068
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 18 14:39:37 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 19 08:53:34 2021 +0200
loplugin:noexcept (clang-cl)
Change-Id: Ife669f959358992b547b408ab5d1f6bf1c1d14bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115744
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/bridges/inc/msvc/amd64.hxx b/bridges/inc/msvc/amd64.hxx
index fb095446b097..eea88ea96f2f 100644
--- a/bridges/inc/msvc/amd64.hxx
+++ b/bridges/inc/msvc/amd64.hxx
@@ -33,7 +33,7 @@ struct ExceptionType final
ExceptionTypeInfo exc_type_info;
explicit ExceptionType(unsigned char* pCode, sal_uInt64 pCodeBase,
- typelib_TypeDescription* pTD) throw();
+ typelib_TypeDescription* pTD) noexcept;
ExceptionType(const ExceptionType&) = delete;
ExceptionType& operator=(const ExceptionType&) = delete;
@@ -51,7 +51,7 @@ struct RaiseInfo final
unsigned char* _code;
sal_uInt64 _codeBase;
- explicit RaiseInfo(typelib_TypeDescription* pTD) throw();
+ explicit RaiseInfo(typelib_TypeDescription* pTD) noexcept;
};
#pragma pack(pop)
diff --git a/bridges/inc/msvc/except.hxx b/bridges/inc/msvc/except.hxx
index aba0ce46248e..798fc44f147c 100644
--- a/bridges/inc/msvc/except.hxx
+++ b/bridges/inc/msvc/except.hxx
@@ -61,12 +61,12 @@ class ExceptionTypeInfo final
char m_d_name[1];
public:
- explicit ExceptionTypeInfo(void* data, const char* d_name) throw()
+ explicit ExceptionTypeInfo(void* data, const char* d_name) noexcept
: m_data(data)
{
::strcpy(m_d_name, d_name); // #100211# - checked
}
- virtual ~ExceptionTypeInfo() throw();
+ virtual ~ExceptionTypeInfo() noexcept;
};
class ExceptionTypeInfoWrapper final
@@ -75,7 +75,7 @@ class ExceptionTypeInfoWrapper final
ExceptionTypeInfo info;
public:
- explicit ExceptionTypeInfoWrapper(void* m_data, const char* m_d_name)
throw()
+ explicit ExceptionTypeInfoWrapper(void* m_data, const char* m_d_name)
noexcept
: info(m_data, m_d_name)
{
type_info_size = sizeof(ExceptionTypeInfo) + strlen(m_d_name);
@@ -90,13 +90,13 @@ class RTTInfos final
osl::Mutex m_aMutex;
t_string2PtrMap m_allRTTI;
- RTTInfos() throw();
- ExceptionTypeInfoWrapper* getInfo(OUString const& rUNOname) throw();
+ RTTInfos() noexcept;
+ ExceptionTypeInfoWrapper* getInfo(OUString const& rUNOname) noexcept;
public:
~RTTInfos();
- static type_info* get(OUString const& rUNOname, int* len = nullptr)
throw();
+ static type_info* get(OUString const& rUNOname, int* len = nullptr)
noexcept;
};
class ExceptionInfos final
@@ -105,12 +105,12 @@ class ExceptionInfos final
t_string2PtrMap m_allRaiseInfos;
public:
- static RaiseInfo* getRaiseInfo(typelib_TypeDescription* pTD) throw();
+ static RaiseInfo* getRaiseInfo(typelib_TypeDescription* pTD) noexcept;
static DWORD allocationGranularity;
- ExceptionInfos() throw();
- ~ExceptionInfos() throw();
+ ExceptionInfos() noexcept;
+ ~ExceptionInfos() noexcept;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/msvc_shared/except.cxx
b/bridges/source/cpp_uno/msvc_shared/except.cxx
index 4b3d2ae3da0d..283baa75173c 100644
--- a/bridges/source/cpp_uno/msvc_shared/except.cxx
+++ b/bridges/source/cpp_uno/msvc_shared/except.cxx
@@ -51,7 +51,7 @@
using namespace ::com::sun::star;
-static OUString toUNOname(OUString const& rRTTIname) throw()
+static OUString toUNOname(OUString const& rRTTIname) noexcept
{
OUStringBuffer aRet(64);
OUString aStr(rRTTIname.copy(4, rRTTIname.getLength() - 4 - 2)); // filter
.?AUzzz@yyy@xxx@@
@@ -67,7 +67,7 @@ static OUString toUNOname(OUString const& rRTTIname) throw()
return aRet.makeStringAndClear();
}
-static OUString toRTTIname(OUString const& rUNOname) throw()
+static OUString toRTTIname(OUString const& rUNOname) noexcept
{
OUStringBuffer aRet(64);
aRet.append(".?AV"); // class ".?AV"; struct ".?AU"
@@ -83,9 +83,9 @@ static OUString toRTTIname(OUString const& rUNOname) throw()
return aRet.makeStringAndClear();
}
-ExceptionTypeInfo::~ExceptionTypeInfo() throw() { (void)m_data; }
+ExceptionTypeInfo::~ExceptionTypeInfo() noexcept { (void)m_data; }
-ExceptionTypeInfoWrapper* RTTInfos::getInfo(OUString const& rUNOname) throw()
+ExceptionTypeInfoWrapper* RTTInfos::getInfo(OUString const& rUNOname) noexcept
{
ExceptionTypeInfoWrapper* pRTTI;
t_string2PtrMap::const_iterator const iFind(m_allRTTI.find(rUNOname));
@@ -107,7 +107,7 @@ ExceptionTypeInfoWrapper* RTTInfos::getInfo(OUString const&
rUNOname) throw()
return pRTTI;
}
-type_info* RTTInfos::get(OUString const& rUNOname, int* len) throw()
+type_info* RTTInfos::get(OUString const& rUNOname, int* len) noexcept
{
static RTTInfos* s_pRTTIs = new RTTInfos();
@@ -121,13 +121,13 @@ type_info* RTTInfos::get(OUString const& rUNOname, int*
len) throw()
return pETIW->get_type_info();
}
-RTTInfos::RTTInfos() throw() {}
+RTTInfos::RTTInfos() noexcept {}
DWORD ExceptionInfos::allocationGranularity = 0;
-ExceptionInfos::ExceptionInfos() throw() {}
+ExceptionInfos::ExceptionInfos() noexcept {}
-ExceptionInfos::~ExceptionInfos() throw()
+ExceptionInfos::~ExceptionInfos() noexcept
{
SAL_INFO("bridges", "> freeing exception infos... <");
@@ -136,7 +136,7 @@ ExceptionInfos::~ExceptionInfos() throw()
delete static_cast<RaiseInfo*>(rEntry.second);
}
-RaiseInfo* ExceptionInfos::getRaiseInfo(typelib_TypeDescription* pTD) throw()
+RaiseInfo* ExceptionInfos::getRaiseInfo(typelib_TypeDescription* pTD) noexcept
{
static ExceptionInfos* s_pInfos = []() {
#if defined _M_AMD64 || defined _M_ARM64
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index ec874621baf8..e5836dd11d98 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -256,13 +256,13 @@ void
using namespace ::com::sun::star;
static void* __cdecl copyConstruct(void* pExcThis, void* pSource,
- typelib_TypeDescription* pTD) throw()
+ typelib_TypeDescription* pTD) noexcept
{
::uno_copyData(pExcThis, pSource, pTD, uno::cpp_acquire);
return pExcThis;
}
-static void* __cdecl destruct(void* pExcThis, typelib_TypeDescription* pTD)
throw()
+static void* __cdecl destruct(void* pExcThis, typelib_TypeDescription* pTD)
noexcept
{
::uno_destructData(pExcThis, pTD, uno::cpp_release);
return pExcThis;
@@ -270,7 +270,8 @@ static void* __cdecl destruct(void* pExcThis,
typelib_TypeDescription* pTD) thro
const int codeSnippetSize = 40;
-static void GenerateConstructorTrampoline(unsigned char* code,
typelib_TypeDescription* pTD) throw()
+static void GenerateConstructorTrampoline(unsigned char* code,
+ typelib_TypeDescription* pTD)
noexcept
{
unsigned char* p = code;
@@ -294,7 +295,7 @@ static void GenerateConstructorTrampoline(unsigned char*
code, typelib_TypeDescr
assert(p < code + codeSnippetSize);
}
-static void GenerateDestructorTrampoline(unsigned char* code,
typelib_TypeDescription* pTD) throw()
+static void GenerateDestructorTrampoline(unsigned char* code,
typelib_TypeDescription* pTD) noexcept
{
unsigned char* p = code;
@@ -319,7 +320,7 @@ static void GenerateDestructorTrampoline(unsigned char*
code, typelib_TypeDescri
}
ExceptionType::ExceptionType(unsigned char* pCode, sal_uInt64 pCodeBase,
- typelib_TypeDescription* pTD) throw()
+ typelib_TypeDescription* pTD) noexcept
: _n0(0)
, _n1(0)
, _n2(-1)
@@ -355,7 +356,7 @@ ExceptionType::ExceptionType(unsigned char* pCode,
sal_uInt64 pCodeBase,
* is also member of ExceptionType and can be referenced via 32 bit offset.
*/
-RaiseInfo::RaiseInfo(typelib_TypeDescription* pTD) throw()
+RaiseInfo::RaiseInfo(typelib_TypeDescription* pTD) noexcept
: _n0(0)
, _n2(0)
, _pTD(pTD)
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 938775629c17..d5df4a161ef2 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -50,7 +50,7 @@ bool cpp_call(
typelib_MethodParameter * pParams,
void * pUnoReturn,
void * pUnoArgs[],
- uno_Any ** ppUnoExc ) throw ()
+ uno_Any ** ppUnoExc ) noexcept
{
const int MAXPARAMS = 32;
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx
b/connectivity/source/drivers/ado/ACallableStatement.cxx
index d572a8f99d9e..5bed29141871 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -209,12 +209,12 @@ Reference< XRef > SAL_CALL OCallableStatement::getRef(
sal_Int32 /*columnIndex*/
}
-void SAL_CALL OCallableStatement::acquire() throw()
+void SAL_CALL OCallableStatement::acquire() noexcept
{
OPreparedStatement::acquire();
}
-void SAL_CALL OCallableStatement::release() throw()
+void SAL_CALL OCallableStatement::release() noexcept
{
OPreparedStatement::release();
}
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 95358ed6df5c..2b94f944656d 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -1192,12 +1192,12 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(bool
_bJetEngine)
m_xMetaData = pMetaData;
}
-void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw()
+void SAL_CALL ODatabaseMetaDataResultSet::acquire() noexcept
{
ODatabaseMetaDataResultSet_BASE::acquire();
}
-void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
+void SAL_CALL ODatabaseMetaDataResultSet::release() noexcept
{
ODatabaseMetaDataResultSet_BASE::release();
}
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index c06b1267b57b..bffecc94afc8 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -426,12 +426,12 @@ void SAL_CALL OPreparedStatement::clearParameters( )
}
}
-void SAL_CALL OPreparedStatement::acquire() throw()
+void SAL_CALL OPreparedStatement::acquire() noexcept
{
OStatement_Base::acquire();
}
-void SAL_CALL OPreparedStatement::release() throw()
+void SAL_CALL OPreparedStatement::release() noexcept
{
OStatement_Base::release();
}
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx
b/connectivity/source/drivers/ado/AResultSet.cxx
index bf33edbd4528..abae9087823e 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -1136,12 +1136,12 @@ void OResultSet::getFastPropertyValue(Any&
rValue,sal_Int32 nHandle) const
}
}
-void SAL_CALL OResultSet::acquire() throw()
+void SAL_CALL OResultSet::acquire() noexcept
{
OResultSet_BASE::acquire();
}
-void SAL_CALL OResultSet::release() throw()
+void SAL_CALL OResultSet::release() noexcept
{
OResultSet_BASE::release();
}
diff --git a/connectivity/source/drivers/ado/AStatement.cxx
b/connectivity/source/drivers/ado/AStatement.cxx
index 553d42a976f3..57f9c347ecea 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -108,7 +108,7 @@ void OStatement_Base::disposing()
OStatement_BASE::disposing();
}
-void SAL_CALL OStatement_Base::release() throw()
+void SAL_CALL OStatement_Base::release() noexcept
{
OStatement_BASE::release();
}
@@ -809,17 +809,17 @@ OStatement::~OStatement()
}
IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement");
-void SAL_CALL OStatement_Base::acquire() throw()
+void SAL_CALL OStatement_Base::acquire() noexcept
{
OStatement_BASE::acquire();
}
-void SAL_CALL OStatement::acquire() throw()
+void SAL_CALL OStatement::acquire() noexcept
{
OStatement_Base::acquire();
}
-void SAL_CALL OStatement::release() throw()
+void SAL_CALL OStatement::release() noexcept
{
OStatement_Base::release();
}
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx
b/connectivity/source/inc/ado/ACallableStatement.hxx
index c038dbb3b9de..e58617b3b00e 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -42,8 +42,8 @@ namespace connectivity::ado
OCallableStatement( OConnection* _pConnection, const OUString& sql
);
virtual css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
// XRow
virtual sal_Bool SAL_CALL wasNull( ) override;
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index b2397711f6b3..dce6971658d3 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -131,8 +131,8 @@ namespace connectivity::ado
virtual void SAL_CALL disposing() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
// XPropertySet
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 18cc3b8508d9..abac49ba1d9b 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -72,7 +72,7 @@ namespace connectivity::ado
~ODatabaseMetaDataResultSetMetaData() override;
/// Avoid ambiguous cast error from the compiler.
- operator css::uno::Reference< css::sdbc::XResultSetMetaData > ()
throw()
+ operator css::uno::Reference< css::sdbc::XResultSetMetaData > ()
noexcept
{ return this; }
virtual sal_Int32 SAL_CALL getColumnCount( ) override;
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx
b/connectivity/source/inc/ado/APreparedStatement.hxx
index 0d8636d25592..2ce394dbdefb 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -62,8 +62,8 @@ namespace connectivity
// a Constructor, that is needed for when Returning the Object is
needed:
OPreparedStatement( OConnection* _pConnection, const OUString&
sql);
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
virtual css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
diff --git a/connectivity/source/inc/ado/AResultSet.hxx
b/connectivity/source/inc/ado/AResultSet.hxx
index c8ffe95d9b5b..58de2baeb539 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -134,8 +134,8 @@ namespace connectivity::ado
virtual void SAL_CALL disposing() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
// XPropertySet
diff --git a/connectivity/source/inc/ado/AStatement.hxx
b/connectivity/source/inc/ado/AStatement.hxx
index 3352e2336b64..625339917591 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -167,8 +167,8 @@ namespace connectivity::ado
// OComponentHelper
virtual void SAL_CALL disposing() override;
// XInterface
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
virtual css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
@@ -204,8 +204,8 @@ namespace connectivity::ado
DECLARE_SERVICE_INFO();
- virtual void SAL_CALL acquire() throw() override;
- virtual void SAL_CALL release() throw() override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
virtual css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
// XBatchExecution
virtual void SAL_CALL addBatch( const OUString& sql ) override;
diff --git a/extensions/source/ole/windata.hxx
b/extensions/source/ole/windata.hxx
index 9d87623dd425..edf3c1d45ab8 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -174,7 +174,7 @@ public:
{
OSL_ASSERT(pTypeInfo);
}
- ~TypeAttr() throw()
+ ~TypeAttr() noexcept
{
if (m_pTypeAttr != nullptr)
{
@@ -182,12 +182,12 @@ public:
}
}
- TYPEATTR** operator&() throw()
+ TYPEATTR** operator&() noexcept
{
return &m_pTypeAttr;
}
- TYPEATTR* operator->() throw()
+ TYPEATTR* operator->() noexcept
{
return m_pTypeAttr;
}
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
index 75e3ea5a8bb9..02c812920777 100644
--- a/include/cppuhelper/compbase1.hxx
+++ b/include/cppuhelper/compbase1.hxx
@@ -51,14 +51,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1<
Ifc1, WeakComponentImplHelper1< Ifc1 > > > {};
public:
- WeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper1( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::release(); }
virtual void SAL_CALL dispose() SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
@@ -89,14 +89,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1<
Ifc1, PartialWeakComponentImplHelper1< Ifc1 > > > {};
public:
- PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper1( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakComponentImplHelper_getTypes( cd::get() ); }
@@ -129,16 +129,16 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1<
Ifc1, WeakAggComponentImplHelper1< Ifc1 > > > {};
public:
- WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper1( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const
& rType ) SAL_OVERRIDE
{ return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakAggComponentImplHelper_getTypes( cd::get() ); }
diff --git a/include/cppuhelper/compbase10.hxx
b/include/cppuhelper/compbase10.hxx
index a3afbc7cc114..27682f83c7c6 100644
--- a/include/cppuhelper/compbase10.hxx
+++ b/include/cppuhelper/compbase10.hxx
@@ -51,14 +51,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData10<
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10,
WeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9,
Ifc10> > > {};
public:
- WeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper10( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::release(); }
virtual void SAL_CALL dispose() SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
@@ -89,14 +89,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData10<
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10,
PartialWeakComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7,
Ifc8, Ifc9, Ifc10> > > {};
public:
- PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper10( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakComponentImplHelper_getTypes( cd::get() ); }
@@ -129,16 +129,16 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData10<
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10,
WeakAggComponentImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8,
Ifc9, Ifc10> > > {};
public:
- WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper10( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const
& rType ) SAL_OVERRIDE
{ return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakAggComponentImplHelper_getTypes( cd::get() ); }
diff --git a/include/cppuhelper/compbase11.hxx
b/include/cppuhelper/compbase11.hxx
index 81916e7373f2..9edfb3f46dac 100644
--- a/include/cppuhelper/compbase11.hxx
+++ b/include/cppuhelper/compbase11.hxx
@@ -51,14 +51,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData11<
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11,
WeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9,
Ifc10, Ifc11> > > {};
public:
- WeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
+ WeakComponentImplHelper11( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::release(); }
virtual void SAL_CALL dispose() SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
@@ -89,14 +89,14 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData11<
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11,
PartialWeakComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7,
Ifc8, Ifc9, Ifc10, Ifc11> > > {};
public:
- PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
+ PartialWeakComponentImplHelper11( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakComponentImplHelperBase::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakComponentImplHelper_getTypes( cd::get() ); }
@@ -129,16 +129,16 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData11<
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11,
WeakAggComponentImplHelper11<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8,
Ifc9, Ifc10, Ifc11> > > {};
public:
- WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) throw ()
+ WeakAggComponentImplHelper11( ::osl::Mutex & rMutex ) SAL_NOEXCEPT
: WeakAggComponentImplHelperBase( rMutex )
{}
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const
& rType ) SAL_OVERRIDE
{ return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakAggComponentImplHelper_getTypes( cd::get() ); }
diff --git a/include/cppuhelper/implbase11.hxx
b/include/cppuhelper/implbase11.hxx
index fbd703879ada..02fad9040b3a 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.hxx
@@ -108,7 +108,7 @@ namespace cppu
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
#endif
- ~ImplHelper11() throw () {}
+ ~ImplHelper11() SAL_NOEXCEPT {}
#if defined _MSC_VER && defined __clang__
#pragma clang diagnostic pop
#endif
@@ -131,9 +131,9 @@ namespace cppu
public:
virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const &
rType ) SAL_OVERRIDE
{ return WeakImplHelper_query( rType, cd::get(), this,
static_cast<OWeakObject *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ OWeakObject::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakImplHelper_getTypes( cd::get() ); }
@@ -165,9 +165,9 @@ namespace cppu
{ return OWeakAggObject::queryInterface( rType ); }
virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const
& rType ) SAL_OVERRIDE
{ return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
static_cast<OWeakAggObject *>(this) ); }
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ OWeakAggObject::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ OWeakAggObject::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return WeakAggImplHelper_getTypes( cd::get() ); }
@@ -232,9 +232,9 @@ namespace cppu
return aRet;
return BaseClass::queryInterface( rType );
}
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ BaseClass::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ BaseClass::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes()
); }
@@ -302,9 +302,9 @@ namespace cppu
return aRet;
return BaseClass::queryAggregation( rType );
}
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
+ virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE
{ BaseClass::acquire(); }
- virtual void SAL_CALL release() throw () SAL_OVERRIDE
+ virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE
{ BaseClass::release(); }
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
SAL_OVERRIDE
{ return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes()
); }
diff --git a/shell/source/win32/zipfile/zipexcptn.cxx
b/shell/source/win32/zipfile/zipexcptn.cxx
index 623d511fb592..9b9054ceb435 100644
--- a/shell/source/win32/zipfile/zipexcptn.cxx
+++ b/shell/source/win32/zipfile/zipexcptn.cxx
@@ -27,7 +27,7 @@ RuntimeException::RuntimeException(int Error) :
}
-RuntimeException::~RuntimeException() throw()
+RuntimeException::~RuntimeException() noexcept
{
}
@@ -44,7 +44,7 @@ ZipException::ZipException(int Error) :
}
-const char* ZipException::what() const throw()
+const char* ZipException::what() const noexcept
{
return nullptr;
}
@@ -57,14 +57,14 @@ Win32Exception::Win32Exception(int Error) :
}
-Win32Exception::~Win32Exception() throw()
+Win32Exception::~Win32Exception() noexcept
{
if (m_MsgBuff)
LocalFree(m_MsgBuff);
}
-const char* Win32Exception::what() const throw()
+const char* Win32Exception::what() const noexcept
{
if (m_MsgBuff == nullptr)
{
diff --git a/shell/source/win32/zipfile/zipexcptn.hxx
b/shell/source/win32/zipfile/zipexcptn.hxx
index f6c6205058da..eb4911d9bb6a 100644
--- a/shell/source/win32/zipfile/zipexcptn.hxx
+++ b/shell/source/win32/zipfile/zipexcptn.hxx
@@ -28,7 +28,7 @@ class RuntimeException : public std::exception
{
public:
explicit RuntimeException(int Error);
- virtual ~RuntimeException() throw() override;
+ virtual ~RuntimeException() noexcept override;
int GetErrorCode() const;
@@ -41,16 +41,16 @@ class ZipException : public RuntimeException
public:
explicit ZipException(int Error);
- virtual const char* what() const throw() override;
+ virtual const char* what() const noexcept override;
};
class Win32Exception : public RuntimeException
{
public:
explicit Win32Exception(int Error);
- virtual ~Win32Exception() throw() override;
+ virtual ~Win32Exception() noexcept override;
- virtual const char* what() const throw() override;
+ virtual const char* what() const noexcept override;
private:
mutable char* m_MsgBuff;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
