[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svtools/source

[Caolán McNamara]

 svtools/source/contnr/svimpbox.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d3a227820040c25bb4ad3b28a9042e3f7d37eef0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 9 13:50:20 2014 +0100

    Resolves: fdo#82270 Grabbing focus can invalidate the entries
    
    Change-Id: Ie9b4f936cebdcf2a37e66abef456c6b0c0e26201
    (cherry picked from commit fef9bf4e39b041c7f13e4d1584e3086068e781fc)
    Reviewed-on: https://gerrit.libreoffice.org/11878
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 79ae60b..d08660d 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2049,6 +2049,8 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
         nCurTabPos = FIRST_ENTRY_TAB;
     nFlags &= (~F_FILLING);
     pView->GrabFocus();
+    //fdo#82270 Grabbing focus can invalidate the entries, re-fetch
+    pEntry = GetEntry(aPos);
     // the entry can still be invalid!
     if( !pEntry || !pView->GetViewData( pEntry ))
         return;