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

[Caolán McNamara]

 cui/source/options/optinet2.cxx   |    2 +-
 sw/source/ui/dialog/swdlgfact.hxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bb1376afbe6978f3d9bd153e2cf34919000bc174
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 19 14:10:32 2018 +0000

    coverity#1430061 silence Unchecked return value
    
    Change-Id: I76288e6c7907487efb986f9367c640257f47deb1
    Reviewed-on: https://gerrit.libreoffice.org/51559
    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/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 0118938f53b5..1a03dba47d9c 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -631,7 +631,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void)
 {
     if (!m_xSecOptDlg)
         m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetFrameWeld(), mpSecOptions));
-    m_xSecOptDlg->run();
+    (void)m_xSecOptDlg->run();
 }
 
 IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, Button*, void)
commit 16d5cbfd38e57a6fccfda018ede2de7e4c448221
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 19 14:27:53 2018 +0000

    coverity#1430065 silence Uncaught exception
    
    Change-Id: I71d5fedb8753d41effa3ebf41811f81f369dae54
    Reviewed-on: https://gerrit.libreoffice.org/51564
    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/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index caf3059c86ac..018a2710f36d 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -40,8 +40,8 @@ class SwTOXMark;
 class SwSplitTableDlg;
 
 #include <itabenum.hxx>
-
 #include <boost/optional.hpp>
+#include <o3tl/deleter.hxx>
 
 namespace sw
 {
@@ -237,7 +237,7 @@ class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
 class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
 {
 protected:
-    std::unique_ptr<SwAutoFormatDlg> m_xDlg;
+    std::unique_ptr<SwAutoFormatDlg, o3tl::default_delete<SwAutoFormatDlg>> m_xDlg;
 public:
     explicit AbstractSwAutoFormatDlg_Impl(SwAutoFormatDlg* p)
         : m_xDlg(p)