Kaydet (Commit) 8ca6ddb6 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Andras Timar

tdf#91917 tdf#91602: avoid layout recursion differently

(regression from 587006ca)

Change-Id: I38e00a7469243088e25aa1a91e3581240b3bbdea
(cherry picked from commit 238e07dd)
üst 1f088320
...@@ -285,10 +285,6 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX ) ...@@ -285,10 +285,6 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
} }
return; return;
} }
else
{
eFlags |= SwCrsrShell::NOCALRECT; // tdf#91602 prevent recursive Action!
}
if ( !bIdleEnd ) if ( !bIdleEnd )
eFlags |= SwCrsrShell::SCROLLWIN; eFlags |= SwCrsrShell::SCROLLWIN;
...@@ -1745,12 +1741,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd ) ...@@ -1745,12 +1741,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
aTmpState.pSpecialPos = &aSpecialPos; aTmpState.pSpecialPos = &aSpecialPos;
} }
++mnStartAction; // tdf#91602 prevent recursive Action!
if( !pFrm->GetCharRect( m_aCharRect, *pShellCrsr->GetPoint(), &aTmpState ) ) if( !pFrm->GetCharRect( m_aCharRect, *pShellCrsr->GetPoint(), &aTmpState ) )
{ {
Point& rPt = pShellCrsr->GetPtPos(); Point& rPt = pShellCrsr->GetPtPos();
rPt = m_aCharRect.Center(); rPt = m_aCharRect.Center();
pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState ); pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState );
} }
--mnStartAction;
if( !pShellCrsr->HasMark() ) if( !pShellCrsr->HasMark() )
m_aCrsrHeight = aTmpState.aRealHeight; m_aCrsrHeight = aTmpState.aRealHeight;
......
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