summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-04-26 09:19:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2023-04-26 17:57:56 +0200
commitf5dd0ffdae83d3e9a568d54719ca82cf53693c4a (patch)
tree9df0eae8dd1a27c5274f709874b72126d12cd580
parentupgrade to more recent fuzzing dicts and use some additional ones (diff)
downloadcore-f5dd0ffdae83d3e9a568d54719ca82cf53693c4a.tar.gz
core-f5dd0ffdae83d3e9a568d54719ca82cf53693c4a.zip
cid#1401342 Uncaught exception
Change-Id: I50a2a4b1763749ae6117e38c982808b514e876d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151037 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx2
-rw-r--r--sd/source/ui/view/drviewsa.cxx5
2 files changed, 7 insertions, 0 deletions
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
@@ -133,6 +133,11 @@ DrawViewShell::DrawViewShell( ViewShellBase& rViewShellBase, vcl::Window* pParen
DrawViewShell::~DrawViewShell()
{
+ suppress_fun_call_w_exception(ImplDestroy());
+}
+
+void DrawViewShell::ImplDestroy()
+{
SD_MOD()->GetColorConfig().RemoveListener(this);
mpSelectionChangeHandler->Disconnect();