commit 728f074ab672469af933d492843230bd5c5bd0cd
author Caolán McNamara <caolanm@redhat.com> Tue Apr 02 20:26:53 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Apr 03 09:51:21 2019 +0200
tree bbd95684b02b5eff34f03b00fffa852816cf5e12
parent 86ba9cdc69976d9cdb7d6ec1a527012647abf10d

Related: tdf#124148 null-deref on clicking inside empty listbox

since...

commit ce9dab8c161e29769131cec741a6a9cceec8552d
Date:   Thu Mar 28 17:43:29 2019 +0900

    tdf#124148 add configurable margin for the listbox pop-up list

Change-Id: Id0bedb86f4fb74aff230d65f1e4371959814fd0f
Reviewed-on: https://gerrit.libreoffice.org/70151
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/control/imp_listbox.cxx

diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 35c2ee7..e2a78a1 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -810,9 +810,11 @@

    sal_Int32 nSelect = mnTop;
    const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nSelect );
    long nEntryHeight = pEntry->getHeightWithMargin();
    while( pEntry && rPoint.Y() > nEntryHeight + nY )
    while (pEntry)
    {
        long nEntryHeight = pEntry->getHeightWithMargin();
        if (rPoint.Y() <= nEntryHeight + nY)
            break;
        nY += nEntryHeight;
        pEntry = mpEntryList->GetEntryPtr( ++nSelect );
    }