diff options
3 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 0d1c019229e9..12077e62f117 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -902,7 +902,7 @@ SlideSorterController::ModelChangeLock::ModelChangeLock ( mpController->LockModelChange(); } -SlideSorterController::ModelChangeLock::~ModelChangeLock() COVERITY_NOEXCEPT_FALSE +SlideSorterController::ModelChangeLock::~ModelChangeLock() { Release(); } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index a633c4e143f7..1fab61b99223 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -295,7 +295,8 @@ void Listener::Notify ( case ViewShellHint::HINT_PAGE_RESIZE_START: // Initiate a model change but do nothing (well, not much) // until we are told that all slides have been resized. - mpModelChangeLock.reset(new SlideSorterController::ModelChangeLock(mrController)); + mpModelChangeLock.reset(new SlideSorterController::ModelChangeLock(mrController), + o3tl::default_delete<SlideSorterController::ModelChangeLock>()); mrController.HandleModelChange(); break; @@ -313,7 +314,8 @@ void Listener::Notify ( break; case ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_START: - mpModelChangeLock.reset(new SlideSorterController::ModelChangeLock(mrController)); + mpModelChangeLock.reset(new SlideSorterController::ModelChangeLock(mrController), + o3tl::default_delete<SlideSorterController::ModelChangeLock>()); break; case ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END: diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 18cdb920ba39..13409ace971b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -156,8 +156,8 @@ public: */ class ModelChangeLock {public: - ModelChangeLock (SlideSorterController& rController); - ~ModelChangeLock() COVERITY_NOEXCEPT_FALSE; + ModelChangeLock(SlideSorterController& rController); + ~ModelChangeLock(); void Release(); private: SlideSorterController* mpController; |