sd/source/ui/framework/configuration/ConfigurationController.cxx | 2 +- sd/source/ui/slideshow/PaneHider.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 6f2df0c6e953b166d51940304f09e07e8ad93289 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Jun 22 20:11:03 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jun 22 22:42:52 2025 +0200 cid#1401328 Uncaught exception Change-Id: If2cf22466eab446a9f15e826cc3876d937615478 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186803 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index aa7f5d88d2de..4e76f3061cf8 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -87,7 +87,7 @@ PaneHider::~PaneHider() { mxConfigurationController->restoreConfiguration(mxConfiguration); } - catch (DisposedException&) + catch (RuntimeException&) { // When the configuration controller is already disposed then // there is no point in restoring the configuration. commit 89c1ea290a8a941c675089ebd8b2e1a7bb024792 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Jun 22 20:08:40 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Jun 22 22:42:37 2025 +0200 cid#1655081 silence Uncaught exception Change-Id: I654490d41dd69cdeae4d8e82c97de7f336b4cce2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186802 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index c111565fa00d..09675fc98bc5 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -94,7 +94,7 @@ ConfigurationController::Lock::Lock (const rtl::Reference<ConfigurationControlle ConfigurationController::Lock::~Lock() { if (mxController.is()) - mxController->unlock(); + suppress_fun_call_w_exception(mxController->unlock()); } //===== ConfigurationController ===============================================
