diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-11-18 13:44:46 +0000 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-11-21 20:21:56 +0100 |
commit | 611d7a2d07c6f2ee97bf3cec4b3b372bfb5b0f4c (patch) | |
tree | aff4bf3e1f6a1225b7d68f8549a813ef19dcc0bf /svx | |
parent | ad7dc47c3d604f5a130e36eedc8ce266fcd84669 (diff) |
rhbz#1773525 wrong elements removed from saved entries when limit hit
Change-Id: Iaf8a012ffe927cbf38789e97b469d899e7cbf87b
Reviewed-on: https://gerrit.libreoffice.org/83096
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 8952e347c7cb..ce298c60e494 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1581,16 +1581,16 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) if (std::find(pArr->begin(), pArr->end(), rStr) != pArr->end()) return; + pArr->insert(pArr->begin(), rStr); + pListBox->insert_text(0, rStr); + // delete oldest entry at maximum occupancy (ListBox and Array) - if(nRememberSize < pArr->size()) + size_t nArrSize = pArr->size(); + if (nArrSize > nRememberSize) { - pListBox->remove(static_cast<sal_uInt16>(nRememberSize - 1)); - (*pArr)[nRememberSize - 1] = rStr; - pArr->erase(pArr->begin() + nRememberSize - 1); + pListBox->remove(nArrSize - 1); + pArr->erase(pArr->begin() + nArrSize - 1); } - - pArr->insert(pArr->begin(), rStr); - pListBox->insert_text(0, rStr); } void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) |