[Libreoffice-commits] core.git: include/vcl sc/source sw/source vcl/source

[Caolán McNamara]

 include/vcl/weld.hxx              |    4 ++--
 sc/source/ui/inc/impex.hxx        |    3 ++-
 sw/source/ui/misc/insfnote.cxx    |    2 +-
 sw/source/uibase/inc/insfnote.hxx |    2 +-
 vcl/source/app/salvtables.cxx     |    8 ++++++--
 5 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 2d1690da6d4d97751e19b2e46a46d971bb060c14
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 17 10:25:56 2018 +0100

    coverity#1434889 Uncaught exception
    
    and
    
    coverity#1401334 Uncaught exception
    
    Change-Id: Ib2fadd83068cc94c972f6312719081d5ac75d8ce

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 058f7d3a6bb8..47d399a8eb69 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -746,7 +746,7 @@ public:
     void set_help_id(const OString& rHelpId) { getDialog()->set_help_id(rHelpId); }
     OString get_help_id() const { return getConstDialog()->get_help_id(); }
     void response(int nResponse) { getDialog()->response(nResponse); }
-    virtual ~DialogController();
+    virtual ~DialogController() COVERITY_NOEXCEPT_FALSE;
 };
 
 class VCL_DLLPUBLIC GenericDialogController : public DialogController
@@ -761,7 +761,7 @@ protected:
 public:
     GenericDialogController(weld::Widget* pParent, const OUString& rUIFile,
                             const OString& rDialogId);
-    virtual ~GenericDialogController() override;
+    virtual ~GenericDialogController() COVERITY_NOEXCEPT_FALSE override;
 };
 
 class VCL_DLLPUBLIC MessageDialogController : public DialogController
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index d82265dd5c3d..c41fb83fafa2 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_IMPEX_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_IMPEX_HXX
 
+#include <o3tl/deleter.hxx>
 #include <sot/exchange.hxx>
 #include <global.hxx>
 #include <address.hxx>
@@ -48,7 +49,7 @@ class ScImportExport
 {
     ScDocShell* pDocSh;
     ScDocument* pDoc;
-    std::unique_ptr<ScDocument> pUndoDoc;
+    std::unique_ptr<ScDocument, o3tl::default_delete<ScDocument>> pUndoDoc;
     ScRange     aRange;
     OUString    aStreamPath;
     OUString    aNonConvertibleChars;
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 19dc1c01c0c8..8131efc698ec 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -180,7 +180,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(weld::Window *pParent, SwWrtShell &rShell, bo
     }
 }
 
-SwInsFootNoteDlg::~SwInsFootNoteDlg()
+SwInsFootNoteDlg::~SwInsFootNoteDlg() COVERITY_NOEXCEPT_FALSE
 {
     SwViewShell::SetCareDialog(nullptr);
 
diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx
index 49ea5563fede..c86b53f00146 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.hxx
@@ -61,7 +61,7 @@ class SwInsFootNoteDlg: public weld::GenericDialogController
 
 public:
     SwInsFootNoteDlg(weld::Window * pParent, SwWrtShell &rSh, bool bEd);
-    virtual ~SwInsFootNoteDlg() override;
+    virtual ~SwInsFootNoteDlg() COVERITY_NOEXCEPT_FALSE override;
 
     const OUString& GetFontName() { return m_aFontName; }
     bool            IsEndNote() const { return m_xEndNoteBtn->get_active(); }
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c478974f9482..dd831b6d3a8f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2024,7 +2024,9 @@ namespace weld
         return rController->getDialog()->runAsync(rController, func);
     }
 
-    DialogController::~DialogController() = default;
+    DialogController::~DialogController() COVERITY_NOEXCEPT_FALSE
+    {
+    }
 
     Dialog* GenericDialogController::getDialog() { return m_xDialog.get(); }
 
@@ -2034,7 +2036,9 @@ namespace weld
     {
     }
 
-    GenericDialogController::~GenericDialogController() = default;
+    GenericDialogController::~GenericDialogController() COVERITY_NOEXCEPT_FALSE
+    {
+    }
 
     Dialog* MessageDialogController::getDialog() { return m_xDialog.get(); }