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

heiko tietze (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 4 09:05:15 UTC 2019


 svx/source/dialog/srchdlg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5cfac16dbd4af456a7fb6d52c8953c69a72ba2ba
Author:     heiko tietze <tietze.heiko at gmail.com>
AuthorDate: Fri May 17 12:08:18 2019 +0200
Commit:     Heiko Tietze <tietze.heiko at gmail.com>
CommitDate: Tue Jun 4 11:00:10 2019 +0200

    Resolves tdf#125333 - Crash with FindReplaceRememberedSearches=0
    
    Zero remembered searches crash the app when no result is found
    minimum set to 1
    
    Change-Id: Ib2b4b195d018f0f11238699458066f4d128f8997
    Reviewed-on: https://gerrit.libreoffice.org/72459
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    (cherry picked from commit def76a088dea12dfd9d9b796e975e742cbe44ce1)
    Reviewed-on: https://gerrit.libreoffice.org/73431

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 07dd53d75708..791116324361 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -332,6 +332,8 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, SfxChildWindow* pChildWi
 
     //tdf#122322
     nRememberSize = officecfg::Office::Common::Misc::FindReplaceRememberedSearches::get();
+    if (nRememberSize<1)
+        nRememberSize = 1; //0 crashes with no results found
 
     auto nTermWidth = m_xSearchLB->get_approximate_digit_width() * 28;
     m_xSearchLB->set_size_request(nTermWidth, -1);


More information about the Libreoffice-commits mailing list