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

[Caolán McNamara (via logerrit)]

 svx/source/dialog/ctredlin.cxx |    1 +
 sw/source/ui/fldui/flddinf.cxx |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f3a68efcdf53b1ec2ca8736943f00aeae6e642d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 15 21:57:32 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 09:29:27 2019 +0200

    cid#1448424 silence Uninitialized pointer field
    
    Change-Id: Ie68cb97a092753185cc31c0b590fe75fad79989b
    Reviewed-on: https://gerrit.libreoffice.org/75668
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index f912a6fc7f9c..18c7cd44e1fb 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -79,6 +79,7 @@ SvxRedlinTable::SvxRedlinTable(std::unique_ptr<weld::TreeView> xWriterControl,
         Application::GetSettings().GetUILanguageTag().getLocale()))
     , xWriterTreeView(std::move(xWriterControl))
     , xCalcTreeView(std::move(xCalcControl))
+    , pTreeView(nullptr)
     , nDatePos(WRITER_DATE)
     , bAuthor(false)
     , bDate(false)
commit 50119846cc9cb666632705dd3a7f95bb4c7b3505
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 15 21:53:56 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 16 09:29:16 2019 +0200

    cid#1448306 silence Unchecked return value
    
    Change-Id: I4d95a54820a3cce9b23ac772abfbfe35ec908765
    Reviewed-on: https://gerrit.libreoffice.org/75667
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 8780fa60c9e9..3c29bd911a43 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -216,9 +216,9 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
 IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, weld::TreeView&, void)
 {
     // current ListBoxPos
-    if (!m_xTypeTLB->get_selected(m_xSelEntry.get()))
+    if (!m_xTypeTLB->get_selected(m_xSelEntry.get()) &&
+        m_xTypeTLB->get_iter_first(*m_xSelEntry))
     {
-        m_xTypeTLB->get_iter_first(*m_xSelEntry);
         m_xTypeTLB->select(*m_xSelEntry);
     }
     FillSelectionLB(m_xTypeTLB->get_id(*m_xSelEntry).toUInt32());