From 19b86af070453bb8671aefe7472012d19580dd81 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 30 Nov 2017 10:31:23 +0000 Subject: silence various coverity warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9ac4c179c30efa9d5950aa2106639d3781dd0308 Reviewed-on: https://gerrit.libreoffice.org/45583 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 3 ++- sd/source/ui/view/viewshel.cxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 241b310b3bf8..3666eec12373 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -134,7 +135,7 @@ private: class UndoContext; std::unique_ptr mxUndoContext; - std::unique_ptr mxSelectionObserverContext; + std::unique_ptr> mxSelectionObserverContext; ImplSVEvent * mnDragFinishedUserEventId; void CreateSlideTransferable ( diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 82a6e67db3cc..f335beaa3a54 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1273,7 +1273,7 @@ void ViewShell::ImpSidUndo(SfxRequest& rReq) { //The xWatcher keeps the SlideSorter selection in sync //with the page insertions/deletions that Undo may introduce - std::unique_ptr xWatcher; + std::unique_ptr> xWatcher; slidesorter::SlideSorterViewShell* pSlideSorterViewShell = slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase()); if (pSlideSorterViewShell) @@ -1342,7 +1342,7 @@ void ViewShell::ImpSidRedo(SfxRequest& rReq) { //The xWatcher keeps the SlideSorter selection in sync //with the page insertions/deletions that Undo may introduce - std::unique_ptr xWatcher; + std::unique_ptr> xWatcher; slidesorter::SlideSorterViewShell* pSlideSorterViewShell = slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase()); if (pSlideSorterViewShell) -- cgit v1.2.3