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

[Caolán McNamara]

 sfx2/source/dialog/alienwarn.cxx |   16 +++++++++++-----
 svx/source/dialog/linkwarn.cxx   |   16 +++++++++++-----
 sw/source/ui/table/tautofmt.cxx  |   10 ++++++++--
 3 files changed, 30 insertions(+), 12 deletions(-)

New commits:
commit 7df7545fc9ac4aa55403998b2d65e1b147a9f037
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 19 15:43:36 2018 +0000

    coverity#1430074 Uncaught exception
    
    and
    
    coverity#1430066 Uncaught exception
    coverity#1430095 Uncaught exception
    
    Change-Id: Idca2e12d3911e3ea768a2a9fb8e7f3b03a2c887f
    Reviewed-on: https://gerrit.libreoffice.org/51567
    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/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index d5b45ba091a6..d3ffe5c13c8d 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -63,11 +63,17 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(weld::Window* pParent, const OUStri
 
 SfxAlienWarningDialog::~SfxAlienWarningDialog()
 {
-    // save value of "warning off" checkbox, if necessary
-    SvtSaveOptions aSaveOpt;
-    bool bChecked = m_xWarningOnBox->get_active();
-    if (aSaveOpt.IsWarnAlienFormat() != bChecked)
-        aSaveOpt.SetWarnAlienFormat(bChecked);
+    try
+    {
+        // save value of "warning off" checkbox, if necessary
+        SvtSaveOptions aSaveOpt;
+        bool bChecked = m_xWarningOnBox->get_active();
+        if (aSaveOpt.IsWarnAlienFormat() != bChecked)
+            aSaveOpt.SetWarnAlienFormat(bChecked);
+    }
+    catch (...)
+    {
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 2dcf5be18747..8d7c23d08e20 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -42,11 +42,17 @@ SvxLinkWarningDialog::SvxLinkWarningDialog(weld::Widget* pParent, const OUString
 
 SvxLinkWarningDialog::~SvxLinkWarningDialog()
 {
-    // save value of "warning off" checkbox, if necessary
-    SvtMiscOptions aMiscOpt;
-    bool bChecked = m_xWarningOnBox->get_active();
-    if (aMiscOpt.ShowLinkWarningDialog() != bChecked)
-        aMiscOpt.SetShowLinkWarningDialog(bChecked);
+    try
+    {
+        // save value of "warning off" checkbox, if necessary
+        SvtMiscOptions aMiscOpt;
+        bool bChecked = m_xWarningOnBox->get_active();
+        if (aMiscOpt.ShowLinkWarningDialog() != bChecked)
+            aMiscOpt.SetShowLinkWarningDialog(bChecked);
+    }
+    catch (...)
+    {
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 37deeb341cfc..a66761b483d4 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -93,8 +93,14 @@ SwAutoFormatDlg::SwAutoFormatDlg(weld::Window* pParent, SwWrtShell* pWrtShell,
 
 SwAutoFormatDlg::~SwAutoFormatDlg()
 {
-    if (m_bCoreDataChanged)
-        m_xTableTable->Save();
+    try
+    {
+        if (m_bCoreDataChanged)
+            m_xTableTable->Save();
+    }
+    catch (...)
+    {
+    }
     m_xTableTable.reset();
 }