include/sfx2/request.hxx | 2 +- sfx2/source/control/request.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit b7b13ff527f8e726ada907634ca1f1ddd4c4699e Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Nov 15 19:41:39 2019 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Sat Nov 16 17:39:04 2019 +0100 revert cid#1455212 Uncaught exception doesn't help in this case, so drop it Change-Id: I1837c08b604cd74ca07793d5d31eb60364381d8f Reviewed-on: https://gerrit.libreoffice.org/82964 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 3dde592b244e..90058a5b1f7f 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -64,7 +64,7 @@ public: SfxRequest(sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs); SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs, const SfxAllItemSet& rSfxInternalArgs ); SfxRequest( const SfxRequest& rOrig ); - virtual ~SfxRequest() COVERITY_NOEXCEPT_FALSE override; + virtual ~SfxRequest() override; sal_uInt16 GetSlot() const { return nSlot; } void SetSlot(sal_uInt16 nNewSlot) { nSlot = nNewSlot; } diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index e9aced895cc3..fcdb5c036f32 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -118,7 +118,7 @@ void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool ) } -SfxRequest::~SfxRequest() COVERITY_NOEXCEPT_FALSE +SfxRequest::~SfxRequest() { // Leave out Done() marked requests with 'rem' if ( pImpl->xRecorder.is() && !pImpl->bDone && !pImpl->bIgnored ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits