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

[Caolán McNamara]

 cui/source/customize/cfg.cxx           |    4 ++--
 filter/source/pdf/pdfinteract.cxx      |    2 +-
 sw/source/core/doc/docftn.cxx          |    5 ++---
 sw/source/ui/dbui/mmoutputtypepage.cxx |    2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit bec100c0742101f9fd378f21b20f0721262bfd32
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 21 09:23:50 2018 +0000

    coverity#1430229 Unchecked return value
    
    Change-Id: I100125d723a83ec7846cf9651ecebd3df697ce58
    Reviewed-on: https://gerrit.libreoffice.org/51695
    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/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 429e8302eb31..7f27e15f695a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1632,7 +1632,7 @@ SvTreeListEntry* SvxConfigPage::AddFunction(
             {
                 std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
                                                           VclMessageType::Info, VclButtonsType::Ok, CuiResId(RID_SVXSTR_MNUCFG_ALREADY_INCLUDED)));
-                xBox->run();
+                (void)xBox->run();
                 delete pNewEntryData;
                 return nullptr;
             }
@@ -3316,7 +3316,7 @@ void SvxIconSelectorDialog::ImportGraphics(
         }
 
         SvxIconChangeDialog aDialog(GetFrameWeld(), message);
-        aDialog.run();
+        (void)aDialog.run();
     }
 }
 
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index 19dc5e7546f3..a08221562141 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -62,7 +62,7 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
 
         VclPtr<vcl::Window> xParent(VCLUnoHelper::GetWindow(m_xParent));
         ImplErrorDialog aDlg(xParent ? xParent->GetFrameWeld() : nullptr, aCodes);
-        aDlg.run();
+        (void)aDlg.run();
         bHandled = true;
     }
     return bHandled;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index fe6c362a7bbd..6f1176f6cbdf 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -548,7 +548,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> const &
     if (pError)
     {
         SwSendWarningBox_Impl aDlg(GetFrameWeld(), *pError);
-        aDlg.run();
+        (void)aDlg.run();
     }
 }
 
commit 42fe3985ed93d79228f70ecd6d69218fb9c3d41a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 21 09:29:58 2018 +0000

    coverity#1430228 Dereference after null check
    
    Change-Id: I15b63e0adba812a84517bae086548441edfab7dc
    Reviewed-on: https://gerrit.libreoffice.org/51697
    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/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 8f1c4e43ea1a..ffbb49c35623 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -185,11 +185,10 @@ void SwEndNoteInfo::SwClientNotify( const SwModify& rModify, const SfxHint& rHin
     if (auto pLegacyHint = dynamic_cast<const sw::LegacyModifyHint*>(&rHint))
     {
         const sal_uInt16 nWhich = pLegacyHint->m_pOld ? pLegacyHint->m_pOld->Which() : pLegacyHint->m_pNew ? pLegacyHint->m_pNew->Which() : 0 ;
-        if( RES_ATTRSET_CHG == nWhich ||
-            RES_FMT_CHG == nWhich )
+        if (RES_ATTRSET_CHG == nWhich || RES_FMT_CHG == nWhich)
         {
             auto pFormat = GetCurrentCharFormat(pCharFormat != nullptr);
-            if(!aDepends.IsListeningTo(pFormat) || pFormat->IsFormatInDTOR())
+            if (!pFormat || !aDepends.IsListeningTo(pFormat) || pFormat->IsFormatInDTOR())
                 return;
             SwDoc* pDoc = pFormat->GetDoc();
             SwFootnoteIdxs& rFootnoteIdxs = pDoc->GetFootnoteIdxs();