summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-09 13:50:20 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-10-11 11:15:10 +0000
commitd3a227820040c25bb4ad3b28a9042e3f7d37eef0 (patch)
tree4f8abedb97279a88bc3a5afa04915a729eeca532
parentd5482208ba905df70e4012f5f5f0d9bc8bac443a (diff)
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@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--svtools/source/contnr/svimpbox.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 79ae60b3d59e..d08660d42178 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;