[Libreoffice-commits] core.git: basic/source sd/source

[Caolán McNamara]

 basic/source/inc/runtime.hxx                            |    3 ++-
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 462866cfdc57e6901ae2c28a2b73e59e6f920fde
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 22 20:46:42 2017 +0000

    various coverity warnings
    
    Change-Id: I27f20c51f86aeaed8e932f7ca45cce8770bc34ec
    Reviewed-on: https://gerrit.libreoffice.org/45140
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 647fe364274e..dc92fb87f3d9 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <unotools/localedatawrapper.hxx>
+#include <o3tl/deleter.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 class SbiInstance;                  // active StarBASIC process
@@ -127,7 +128,7 @@ class SbiInstance
     SbiRTLData      aRTLData;
 
     // file system
-    std::unique_ptr<SbiIoSystem>     pIosys;
+    std::unique_ptr<SbiIoSystem, o3tl::default_delete<SbiIoSystem>> pIosys;
     // DDE
     std::unique_ptr<SbiDdeControl>    pDdeCtrl;
     // DLL-Calls (DECLARE)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index ae6ec2d8fae8..f3f7b061bed6 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -23,13 +23,13 @@
 #include <SlideSorter.hxx>
 #include <view/SlideSorterView.hxx>
 #include <canvas/elapsedtime.hxx>
+#include <o3tl/deleter.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <sal/types.h>
 
-#include <memory>
-
 #include <functional>
+#include <memory>
 #include <vector>
 
 namespace sd { namespace slidesorter { namespace controller {
@@ -96,7 +96,7 @@ private:
     AnimationList maAnimations;
     ::canvas::tools::ElapsedTime maElapsedTime;
 
-    std::unique_ptr<view::SlideSorterView::DrawLock> mpDrawLock;
+    std::unique_ptr<view::SlideSorterView::DrawLock, o3tl::default_delete<view::SlideSorterView::DrawLock>> mpDrawLock;
 
     AnimationId mnNextAnimationId;