diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-25 10:13:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-25 13:31:20 +0100 |
| commit | fe5366d9d2d57ee3648589db86d2c17f43febb6b (patch) | |
| tree | 7944522314a7556493372df1329f6f2a679f4414 /dbaccess | |
| parent | 189c8a7caba5f7bf31c8bab96f6ca0a6aa8a8066 (diff) | |
Resolves: tdf#130922 don't crash removing non-existing elements
Change-Id: Id05faf6537ae096d563c57dcde71cd65ae04152d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89418
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/WColumnSelect.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 077e01049767..0e57a26828b2 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -130,7 +130,9 @@ void OWizColumnSelect::Activate( ) { OUString sId(OUString::number(reinterpret_cast<sal_Int64>(new OFieldDescription(*(column->second))))); m_xNewColumnNames->append(sId, column->first); - m_xOrgColumnNames->remove_text(column->first); + int nRemove = m_xOrgColumnNames->find_text(column->first); + if (nRemove != -1) + m_xOrgColumnNames->remove(nRemove); } } m_pParent->GetOKButton().set_sensitive(m_xNewColumnNames->n_children() != 0); |