diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-20 09:16:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-20 12:20:27 +0100 |
| commit | 3826abea6a877433007ca32a96a71b3a41f0118e (patch) | |
| tree | 57a8e70de327874a6a32ec6bb49731c81d6ab3bc /sw | |
| parent | f81d532648ccbbd08d3cb568eadc9f402dac67ad (diff) | |
rhbz#1690645 null deref of pEntry when GetCurEntry return null
in GetFocusRect at SvTreeList::GetDepth
code in since....
commit 76c549eb01dcb7b5bf28a271ce00e386f3d388ba
Author: Steve Yin <steve_y@apache.org>
Date: Fri Nov 29 13:03:27 2013 +0000
Integrate branch of IAccessible2
Change-Id: Ida6cb934c94037c861c7d5da005226f32599b5fc
Reviewed-on: https://gerrit.libreoffice.org/69459
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/utlui/content.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 1bb69c686343..01021f7129e1 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2850,15 +2850,14 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) //and realize multi-selection . else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier()) { - SvTreeListEntry* pEntry = GetCurEntry(); - if( GetChildCount( pEntry ) == 0 ) - m_bIsKeySpace = true; - Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration - m_aOldRectangle = GetFocusRect( pEntry,tempPoint.Y() ); - if(pEntry) { + if( GetChildCount( pEntry ) == 0 ) + m_bIsKeySpace = true; + Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration + m_aOldRectangle = GetFocusRect(pEntry, tempPoint.Y()); + if (State::HIDDEN != m_eState) { if (State::CONSTANT == m_eState) |