sw/source/uibase/utlui/content.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
New commits: commit 3826abea6a877433007ca32a96a71b3a41f0118e Author: Caolán McNamara <[email protected]> AuthorDate: Wed Mar 20 09:16:28 2019 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Mar 20 12:20:27 2019 +0100 rhbz#1690645 null deref of pEntry when GetCurEntry return null in GetFocusRect at SvTreeList::GetDepth code in since.... commit 76c549eb01dcb7b5bf28a271ce00e386f3d388ba Author: Steve Yin <[email protected]> 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> 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) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
