Kaydet (Commit) 3826abea authored tarafından Caolán McNamara's avatar Caolán McNamara

rhbz#1690645 null deref of pEntry when GetCurEntry return null

in GetFocusRect at SvTreeList::GetDepth

code in since....

commit 76c549eb
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: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f81d5326
...@@ -2850,15 +2850,14 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) ...@@ -2850,15 +2850,14 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent)
//and realize multi-selection . //and realize multi-selection .
else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier()) else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier())
{ {
SvTreeListEntry* pEntry = GetCurEntry(); 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(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::HIDDEN != m_eState)
{ {
if (State::CONSTANT == m_eState) if (State::CONSTANT == m_eState)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment