[Libreoffice-commits] core.git: 2 commits - sfx2/qa sw/source

[Caolán McNamara]

 sfx2/qa/cppunit/test_misc.cxx                           |    3 ++-
 sw/source/core/inc/DocumentChartDataProviderManager.hxx |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f62fcab7f16a2c6abbc37a0d83145e9ded3ad6e3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 29 09:34:33 2018 +0100

    coverity#1433647 Unchecked return value from library
    
    Change-Id: I05c91dc21ddcef0f64f712f4fe9a5736b0cee0f9
    Reviewed-on: https://gerrit.libreoffice.org/52059
    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/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index 72f21fc66c3a..b7c17a0e1cf3 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -171,7 +171,8 @@ void MiscTest::testHardLinks()
     xStorable->store();
 
     struct stat buf;
-    stat(aOld.getStr(), &buf);
+    int nRet = stat(aOld.getStr(), &buf);
+    CPPUNIT_ASSERT_EQUAL(nRet, 0);
     // This failed: hard link count was 1, the hard link broke on store.
     CPPUNIT_ASSERT(buf.st_nlink > 1);
 
commit a3c686318230c91fda23f81b6b6cbd759bf80d84
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 29 09:55:09 2018 +0100

    coverity#1401334 Uncaught exception
    
    Change-Id: I14cfde619e1280c21d8481fc58c5ba69855c1b5d
    Reviewed-on: https://gerrit.libreoffice.org/52064
    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/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
index a30194473ec5..1e747e97636b 100644
--- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx
+++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTCHARTDATAPROVIDEMANAGER_HXX
 
 #include <IDocumentChartDataProviderAccess.hxx>
+#include <o3tl/deleter.hxx>
 #include <rtl/ref.hxx>
 #include <memory>
 
@@ -58,8 +59,8 @@ private:
 
     SwDoc& m_rDoc;
 
-mutable rtl::Reference<SwChartDataProvider> maChartDataProviderImplRef;
-    std::unique_ptr<SwChartLockController_Helper> mpChartControllerHelper;
+    mutable rtl::Reference<SwChartDataProvider> maChartDataProviderImplRef;
+    std::unique_ptr<SwChartLockController_Helper, o3tl::default_delete<SwChartLockController_Helper>> mpChartControllerHelper;
 };
 
 }