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

[Caolán McNamara (via logerrit)]

 sw/source/ui/fldui/fldref.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 144ce9fc0e189d6bc117c46ce10fb84ecbd59e18
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 5 15:31:46 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Dec 6 11:06:37 2019 +0100

    tdf#127955 check if position stored in user config is in range for the treeview
    
    https://crashreport.libreoffice.org/stats/crash_details/8c4a3136-73be-4536-ad6f-ce97ae0368dd
    
    Change-Id: I320f965eb622f90f8059f85e7ba2ff203419ab3f
    Reviewed-on: https://gerrit.libreoffice.org/84600
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 4b89a8aca6f5..95935b115177 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -257,7 +257,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
         }
     }
     TypeHdl(*m_xTypeLB);
-    if(nFormatBoxPosition != USHRT_MAX)
+    if (nFormatBoxPosition < m_xFormatLB->n_children())
     {
         m_xFormatLB->select(nFormatBoxPosition);
     }