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

Caolán McNamara caolanm at redhat.com
Mon Dec 4 08:59:43 UTC 2017


 sd/source/ui/slidesorter/shell/SlideSorter.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 75b0afa1f23f4da928a5f0d866250e19d762f49f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 3 21:05:49 2017 +0000

    silence coverity#1405937 Uncaught exception
    
    Change-Id: I40e9827f1ff2fb7f5121da95c4f502de11f3f612
    Reviewed-on: https://gerrit.libreoffice.org/45760
    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/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 398cc2a0edc3..6afbd935294c 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -24,6 +24,7 @@
 #include <controller/SlsScrollBarManager.hxx>
 #include <controller/SlsProperties.hxx>
 #include <controller/SlsAnimator.hxx>
+#include <o3tl/deleter.hxx>
 #include <view/SlideSorterView.hxx>
 #include <view/SlsTheme.hxx>
 #include <model/SlideSorterModel.hxx>
@@ -82,7 +83,8 @@ std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter(
             pContentWindow,
             pHorizontalScrollBar,
             pVerticalScrollBar,
-            pScrollBarBox));
+            pScrollBarBox),
+        o3tl::default_delete<SlideSorter>());
     pSlideSorter->Init();
     return pSlideSorter;
 }
@@ -95,7 +97,8 @@ std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter (
         new SlideSorter(
             rBase,
             nullptr,
-            rParentWindow));
+            rParentWindow),
+        o3tl::default_delete<SlideSorter>());
     pSlideSorter->Init();
     return pSlideSorter;
 }


More information about the Libreoffice-commits mailing list