sw/source/core/layout/findfrm.cxx | 1 + sw/source/core/layout/flycnt.cxx | 1 + sw/source/core/layout/paintfrm.cxx | 1 + sw/source/core/layout/wsfrm.cxx | 2 ++ 4 files changed, 5 insertions(+)
New commits: commit 0f1120ad344ae220a93bd2af9cf4a6bf50e25888 Author: Jan Holesovsky <ke...@suse.cz> Date: Mon Feb 27 15:09:52 2012 +0100 Fix build (few missing {'s in the translations). diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index c4829a3..a2c7bf0 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -1365,6 +1365,7 @@ void SwFrm::SetInfFlags() if( IsFtnContFrm() ) bInfFtn = sal_True; do + { // bInfBody is only set in the page body, but not in the column body if ( pFrm->IsBodyFrm() && !bInfFtn && pFrm->GetUpper() && pFrm->GetUpper()->IsPageFrm() ) diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 3c2cf9c..0e21be6 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -937,6 +937,7 @@ sal_uLong MA_FASTCALL lcl_FindCntDiff( const Point &rPt, const SwLayoutFrm *pLay if ( pCnt->Frm().Top() <= rPt.Y() ) { if ( nDiff < nDistance ) + { //This one is the nearer one nDistance = nNearest = nDiff; rpCnt = pNearest = pCnt; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b9b903a..271ee0b 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -6189,6 +6189,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay, aP2( rP2 ); while ( aP1.*pDirPt < aP2.*pDirPt ) + { //If the starting point lies in a fly, it is directly set behind the //fly. //The end point moves to the start if the end point lies in a fly or we diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index ff03015..e2600e3 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -741,6 +741,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct ) pBehind->pPrev = pLast; } else + { //Insert at the end, or ... the first node in the subtree pPrev = pUpper->Lower(); if ( pPrev ) @@ -931,6 +932,7 @@ void SwCntntFrm::Cut() } if( 0 != (pFrm = GetIndNext()) ) + { //The old follower may calculated a gap to the predecessor which now //becomes obsolete or different respectively as it becomes the first //one itself. _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits