svx/source/form/fmview.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit d601ed92689d2a353710668e23fa904d06c3610d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 9 11:53:21 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Dec 9 18:21:04 2021 +0100
cid#1485150 silence Uncaught exception
Change-Id: Ic7944a6b6a956a9b699e5743b78b98cbb522721f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126582
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 46461728482a..09e984ee79f9 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -41,6 +41,7 @@
#include <fmundo.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <comphelper/namedvaluecollection.hxx>
+#include <o3tl/deleter.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/awt/XControl.hpp>
@@ -114,16 +115,14 @@ void FmFormView::Init()
SetDesignMode( bInitDesignMode );
}
-
FmFormView::~FmFormView()
{
- if( pFormShell )
- pFormShell->SetView( nullptr );
+ if (pFormShell)
+ suppress_fun_call_w_exception(pFormShell->SetView(nullptr));
pImpl->notifyViewDying();
}
-
FmFormPage* FmFormView::GetCurPage()
{
SdrPageView* pPageView = GetSdrPageView();
@@ -131,7 +130,6 @@ FmFormPage* FmFormView::GetCurPage()
return pCurPage;
}
-
void FmFormView::MarkListHasChanged()
{
E3dView::MarkListHasChanged();
