diff options
author | Caolán McNamara <caolanm@redhat.com> | 2023-04-26 09:19:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2023-04-26 17:57:56 +0200 |
commit | f5dd0ffdae83d3e9a568d54719ca82cf53693c4a (patch) | |
tree | 9df0eae8dd1a27c5274f709874b72126d12cd580 /sd/source | |
parent | e2279c73456cd54f0cc8290bb562e0226fa174dd (diff) |
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>
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 5 |
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(); |