diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-09 22:29:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-10 00:10:46 +0200 |
| commit | d76fa3f5a5ae1d781ddd7457607a5773373d4f01 (patch) | |
| tree | 7b56b12b9d614c04b3ef5b70491f625482148a81 | |
| parent | 2ca0360a6c75959bf61bd2ee0ef96b2729369a15 (diff) | |
sw: use DisableCallbackAction here also
This should also fix tdf#91602 and appears more consistent.
Change-Id: Ic0a227d01f45b01b5cfb511d12b71b3b3aa84a05
| -rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 64af2eea098f..400a751768cc 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1764,14 +1764,15 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd ) aTmpState.m_pSpecialPos = &aSpecialPos; } - ++mnStartAction; // tdf#91602 prevent recursive Action! - if( !pFrame->GetCharRect( m_aCharRect, *pShellCursor->GetPoint(), &aTmpState ) ) { - Point& rPt = pShellCursor->GetPtPos(); - rPt = m_aCharRect.Center(); - pFrame->GetCursorOfst( pShellCursor->GetPoint(), rPt, &aTmpState ); + DisableCallbackAction a(*GetLayout()); // tdf#91602 prevent recursive Action + if (!pFrame->GetCharRect(m_aCharRect, *pShellCursor->GetPoint(), &aTmpState)) + { + Point& rPt = pShellCursor->GetPtPos(); + rPt = m_aCharRect.Center(); + pFrame->GetCursorOfst( pShellCursor->GetPoint(), rPt, &aTmpState ); + } } - --mnStartAction; UISizeNotify(); // tdf#96256 update view size if( !pShellCursor->HasMark() ) |