commit 0b6bb036168590795b674fb3fdfb42ba5fdac271
author Caolán McNamara <caolanm@redhat.com> Tue Oct 01 09:14:37 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Oct 01 13:23:29 2019 +0200
tree 5b3c4f250fed4981f1947123b5d12012bc4f197a
parent a3e29642b9c118674ad88785500ce164aa103de9

Resolves: tdf#127896 fix 'Exchange database' crash

Change-Id: I8278c9e959ab054b5bccf0b33e5885cd4ac7573a
Reviewed-on: https://gerrit.libreoffice.org/79923
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/fldui/changedb.cxx

diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 0118adb..5f076a0 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -135,14 +135,17 @@ std::unique_ptr<weld::TreeIter> SwChangeDBDlg::Insert(const OUString& rDBName)
        {
            if (sDBName == m_xUsedDBTLB->get_text(*xIter))
            {
                if (m_xUsedDBTLB->iter_children(*xIter))
                if (m_xUsedDBTLB->iter_has_child(*xIter))
                {
                    do
                    std::unique_ptr<weld::TreeIter> xChild(m_xUsedDBTLB->make_iterator(xIter.get()));
                    if (m_xUsedDBTLB->iter_children(*xChild))
                    {
                        if (sTableName == m_xUsedDBTLB->get_text(*xIter))
                            return xIter;
                    } while (m_xUsedDBTLB->iter_next_sibling(*xIter));
                    m_xUsedDBTLB->iter_parent(*xIter);
                        do
                        {
                            if (sTableName == m_xUsedDBTLB->get_text(*xChild))
                                return xChild;
                        } while (m_xUsedDBTLB->iter_next_sibling(*xChild));
                    }
                }
                m_xUsedDBTLB->insert(xIter.get(), -1, &sTableName, &sUserData, nullptr, nullptr,
                                     &rToInsert, false, xIter.get());