diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-12-09 11:53:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-12-09 18:21:04 +0100 |
| commit | d601ed92689d2a353710668e23fa904d06c3610d (patch) | |
| tree | bfce223d14dda9a351afe69d78eae4be64c8b3cd /svx | |
| parent | dc1589f0859d5219d6f3f67748f0f0ec9af48790 (diff) | |
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 <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmview.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
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(); |