[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/dialog/srchdlg.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 458806e52813ff59aed1aa0e34f84e076fb9333f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 18 12:42:41 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 19 09:55:27 2019 +0100

    rhbz#1773525 reducing the amount of saved search/replace entries didn't work
    
    Change-Id: I1512ef507130718859271079e603a95cf2105c58
    Reviewed-on: https://gerrit.libreoffice.org/83090
    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/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6b1365af8cb1..01274ced7f7b 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -149,7 +149,7 @@ struct SearchDlg_Impl
     }
 };
 
-static void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, weld::ComboBox& rCBox )
+static void ListToStrArr_Impl(sal_uInt16 nId, std::vector<OUString>& rStrLst, weld::ComboBox& rCBox, sal_uInt16 nRememberSize)
 {
     const SfxStringListItem* pSrchItem =
         static_cast<const SfxStringListItem*>(SfxGetpApp()->GetItem( nId ));
@@ -158,6 +158,9 @@ static void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, w
     {
         std::vector<OUString> aLst = pSrchItem->GetList();
 
+        if (aLst.size() > nRememberSize)
+            aLst.resize(nRememberSize);
+
         for (const OUString & s : aLst)
         {
             rStrLst.push_back(s);
@@ -375,9 +378,9 @@ void SvxSearchDialog::Construct_Impl()
 
     // Get stored search-strings from the application
     ListToStrArr_Impl(SID_SEARCHDLG_SEARCHSTRINGS,
-                       aSearchStrings, *m_xSearchLB);
+                       aSearchStrings, *m_xSearchLB, nRememberSize);
     ListToStrArr_Impl(SID_SEARCHDLG_REPLACESTRINGS,
-                       aReplaceStrings, *m_xReplaceLB);
+                       aReplaceStrings, *m_xReplaceLB, nRememberSize);
 
     InitControls_Impl();