Commits

Jens-Heiner Rechtien  committed c3b2b88 Merge

CWS-TOOLING: integrate CWS sw33bf07

  • Participants
  • Parent commits 076d68c, 3136e1f

Comments (0)

Files changed (2)

File sw/source/core/text/itrform2.cxx

 {
 	// Die neue Portion wird eingefuegt,
 	// bei dem LineLayout ist allerdings alles anders...
-	if( pPor == pCurr )
-	{
-		if( pCurr->GetPortion() )
-			pPor = pCurr->GetPortion();
-	}
+    if( pPor == pCurr )
+    {
+        if ( pCurr->GetPortion() )
+        {        
+            pPor = pCurr->GetPortion();
+        }
+
+        // --> OD 2010-07-07 #i112181#
+        rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() );
+        // <--
+    }
 	else
 	{
 		SwLinePortion *pLast = rInf.GetLast();

File sw/source/ui/docvw/edtwin.cxx

 
 
                 BOOL bIsAutoCorrectChar =  SvxAutoCorrect::IsAutoCorrectChar( aCh );
-                BOOL bRunNext = pACorr->HasRunNext();
+                BOOL bRunNext = pACorr && pACorr->HasRunNext();
                 if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) &&
                         pACfg->IsAutoFmtByInput() &&
                     (( pACorr->IsAutoCorrFlag( ChgWeightUnderl ) &&