sd/source/ui/inc/DrawViewShell.hxx | 2 ++
sd/source/ui/view/drviewsa.cxx | 5 +++++
2 files changed, 7 insertions(+)
New commits:
commit f5dd0ffdae83d3e9a568d54719ca82cf53693c4a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Apr 26 09:19:20 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Apr 26 17:57:56 2023 +0200
cid#1401342 Uncaught exception
Change-Id: I50a2a4b1763749ae6117e38c982808b514e876d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151037
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index a8e48c723d2e..15f1dc9888c3 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -398,6 +398,8 @@ protected:
private:
void Construct (DrawDocShell* pDocSh, PageKind ePageKind);
+ void ImplDestroy();
+
/** Depending on the given request create a new page or duplicate an
existing one. See ViewShell::CreateOrDuplicatePage() for more
information.
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 34324d3aa93f..dbc410ca2545 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -132,6 +132,11 @@ DrawViewShell::DrawViewShell( ViewShellBase&
rViewShellBase, vcl::Window* pParen
}
DrawViewShell::~DrawViewShell()
+{
+ suppress_fun_call_w_exception(ImplDestroy());
+}
+
+void DrawViewShell::ImplDestroy()
{
SD_MOD()->GetColorConfig().RemoveListener(this);
