commit 000849f1cccba60c129c0c4cd8b66a29dcec2269
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 16:51:18 2019 +0200
tree 0082a08d2857270c9b277fd3b3fa79ebd031ad43
parent 5e0ce7dc9ebe1a8b5bd70c91bcd16a49ec487b49

Resolves: tdf#127896 fix 'Exchange database' crash

Change-Id: I8278c9e959ab054b5bccf0b33e5885cd4ac7573a
Reviewed-on: https://gerrit.libreoffice.org/79924
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins

sw/source/ui/fldui/changedb.cxx

diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index b04d69a..22715e4 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -142,14 +142,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());