diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-30 10:31:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-30 21:24:29 +0100 |
| commit | 19b86af070453bb8671aefe7472012d19580dd81 (patch) | |
| tree | 591f3b0163f512f3ec21f355bb706a191069fc5e /sd | |
| parent | 18a7a5859b6c2f59ab2f64eadfc6178abb96940b (diff) | |
silence various coverity warnings
Change-Id: I9ac4c179c30efa9d5950aa2106639d3781dd0308
Reviewed-on: https://gerrit.libreoffice.org/45583
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshel.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
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 <sdxfer.hxx> #include <sal/types.h> +#include <o3tl/deleter.hxx> #include <tools/solar.h> #include <svx/svdpage.hxx> @@ -134,7 +135,7 @@ private: class UndoContext; std::unique_ptr<UndoContext> mxUndoContext; - std::unique_ptr<SelectionObserver::Context> mxSelectionObserverContext; + std::unique_ptr<SelectionObserver::Context, o3tl::default_delete<SelectionObserver::Context>> 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<KeepSlideSorterInSyncWithPageChanges> xWatcher; + std::unique_ptr<KeepSlideSorterInSyncWithPageChanges, o3tl::default_delete<KeepSlideSorterInSyncWithPageChanges>> 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<KeepSlideSorterInSyncWithPageChanges> xWatcher; + std::unique_ptr<KeepSlideSorterInSyncWithPageChanges, o3tl::default_delete<KeepSlideSorterInSyncWithPageChanges>> xWatcher; slidesorter::SlideSorterViewShell* pSlideSorterViewShell = slidesorter::SlideSorterViewShell::GetSlideSorter(GetViewShellBase()); if (pSlideSorterViewShell) |