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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 94c634aac1e9ebd515cdcecb5c9920181b9e22fd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 5 15:31:46 2019 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Dec 6 14:51:46 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/84601
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

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