[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Michael Stahl]

 sw/source/core/crsr/crsrsh.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 73b303fc3693e7cdf457e617c252c10ef4620bd9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jun 8 23:28:11 2015 +0200

    tdf#91917 tdf#91602: avoid layout recursion differently
    
    (regression from 587006cac508616f486aea45e265a170bcccdc87)
    
    Change-Id: I38e00a7469243088e25aa1a91e3581240b3bbdea
    (cherry picked from commit 238e07ddca879e0951bef6391fdc5c3fc26bded5)

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 2742a2c..ee223b5 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -285,10 +285,6 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
         }
         return;
     }
-    else
-    {
-        eFlags |= SwCrsrShell::NOCALRECT; // tdf#91602 prevent recursive Action!
-    }
 
     if ( !bIdleEnd )
         eFlags |= SwCrsrShell::SCROLLWIN;
@@ -1745,12 +1741,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 aTmpState.pSpecialPos = &aSpecialPos;
             }
 
+            ++mnStartAction; // tdf#91602 prevent recursive Action!
             if( !pFrm->GetCharRect( m_aCharRect, *pShellCrsr->GetPoint(), &aTmpState ) )
             {
                 Point& rPt = pShellCrsr->GetPtPos();
                 rPt = m_aCharRect.Center();
                 pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState );
             }
+            --mnStartAction;
 
             if( !pShellCrsr->HasMark() )
                 m_aCrsrHeight = aTmpState.aRealHeight;