[ooo-build-commit] .: 8 commits - sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Sep 30 07:51:07 PDT 2010
sw/source/core/layout/calcmove.cxx | 7 ++++---
sw/source/core/layout/findfrm.cxx | 10 ++++++----
sw/source/core/layout/frmtool.cxx | 2 +-
sw/source/core/layout/layact.cxx | 26 ++++++++++++++++++--------
sw/source/core/layout/pagechg.cxx | 11 ++++++-----
sw/source/core/text/itrpaint.cxx | 2 +-
sw/source/core/text/txtfly.cxx | 4 ++--
sw/source/ui/utlui/glbltree.cxx | 19 ++++++++++++++-----
8 files changed, 52 insertions(+), 29 deletions(-)
New commits:
commit 164d00d11b47a1ba8d581922b9996fb1bc8c7ae8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:44:38 2010 +0100
#i113319# silence gcc warning
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index bdc4411..e170979 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -495,7 +495,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
if( ( nDiff > 0 &&
( GetEnd() < GetInfo().GetTxt().Len() ||
( nDiff > nTmpHeight/2 && GetPrevLine() ) ) ) ||
- nDiff >= 0 && bNextUndersized )
+ (nDiff >= 0 && bNextUndersized) )
{
SwArrowPortion aArrow( GetInfo() );
commit 37fc9c50ad1ca46996c0ad5122acae30a4687eed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:43:54 2010 +0100
#i113321# silence gcc warning
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index f36ee06..a35a19a 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -2027,10 +2027,10 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid
// <--
if( aFly.IsEmpty() || !aFly.IsOver( rRect ) )
continue;
- if( !bRet ||
+ if( !bRet || (
( !pCurrFrm->IsRightToLeft() &&
( (aFly.*fnRect->fnGetLeft)() <
- (pRect->*fnRect->fnGetLeft)() ) ||
+ (pRect->*fnRect->fnGetLeft)() ) ) ||
( pCurrFrm->IsRightToLeft() &&
( (aFly.*fnRect->fnGetRight)() >
(pRect->*fnRect->fnGetRight)() ) ) ) )
commit 99ad71d308c6512fc72c69a8b48d173b1eb834f8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:42:07 2010 +0100
#i113324# silence gcc warning
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 3178938..d4e5463 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -1241,11 +1241,20 @@ BOOL SwGlobalTree::Update(BOOL bHard)
GlobalDocContentType eType = pLeft->GetType();
SvLBoxEntry* pEntry = GetEntry(i);
String sTemp = GetEntryText(pEntry);
- if(eType != pRight->GetType() ||
- eType == GLBLDOC_SECTION &&
- (pLeft->GetSection()->GetSectionName() != sTemp) ||
- eType == GLBLDOC_TOXBASE && pLeft->GetTOX()->GetTitle() != sTemp)
- bCopy = bRet = TRUE;
+ if (
+ eType != pRight->GetType() ||
+ (
+ eType == GLBLDOC_SECTION &&
+ pLeft->GetSection()->GetSectionName() != sTemp
+ ) ||
+ (
+ eType == GLBLDOC_TOXBASE &&
+ pLeft->GetTOX()->GetTitle() != sTemp
+ )
+ )
+ {
+ bCopy = bRet = TRUE;
+ }
}
}
if(bCopy || bHard)
commit f3c5c8cd4554fe84313b9beafaa5a3dcf6060509
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:39:16 2010 +0100
#i113325#: && || ambiguity
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 3afa737..e1c4373 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1042,10 +1042,11 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
SwAnchoredObject* pObj = (*GetDrawObjs())[i];
const SwFrmFmt& rFmt = pObj->GetFrmFmt();
const BOOL bFly = pObj->ISA(SwFlyFrm);
- if ( bFly &&
- WEIT_WECH == pObj->GetObjRect().Width()||
- rFmt.GetFrmSize().GetWidthPercent() )
+ if ((bFly && (WEIT_WECH == pObj->GetObjRect().Width()))
+ || rFmt.GetFrmSize().GetWidthPercent())
+ {
continue;
+ }
if ( FLY_AS_CHAR == rFmt.GetAnchor().GetAnchorId() )
{
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 8ced3ab..f58388c 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1827,10 +1827,11 @@ void SwRootFrm::ImplCalcBrowseWidth()
SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i];
const SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
const BOOL bFly = pAnchoredObj->ISA(SwFlyFrm);
- if ( bFly &&
- WEIT_WECH == pAnchoredObj->GetObjRect().Width()||
- rFmt.GetFrmSize().GetWidthPercent() )
+ if ((bFly && (WEIT_WECH == pAnchoredObj->GetObjRect().Width()))
+ || rFmt.GetFrmSize().GetWidthPercent())
+ {
continue;
+ }
long nWidth = 0;
switch ( rFmt.GetAnchor().GetAnchorId() )
commit b7564b467c671c749057a479b860aeefaf1a742d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:36:19 2010 +0100
#i113327# silence gcc warning
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index cf4c84e..c391d1f 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -659,9 +659,11 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b
{
const SwRect& rBoundRect = bExtend ? maPageRects[ nPageIdx++ ] : pPage->Frm();
- if ( !pSize && rBoundRect.IsInside( rPt ) ||
- pSize && rBoundRect.IsOver( aRect ) )
+ if ( (!pSize && rBoundRect.IsInside(rPt)) ||
+ (pSize && rBoundRect.IsOver(aRect)) )
+ {
pRet = static_cast<const SwPageFrm*>(pPage);
+ }
pPage = pPage->GetNext();
}
@@ -1728,8 +1730,8 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
else
{
if ( pMasterTable == pTableFrm ||
- ( bStart && pMasterTable->IsAnFollow( pTableFrm ) ||
- !bStart && pTableFrm->IsAnFollow( pMasterTable ) ) )
+ ( (bStart && pMasterTable->IsAnFollow(pTableFrm)) ||
+ (!bStart && pTableFrm->IsAnFollow(pMasterTable)) ) )
{
pRet = pMasterCell;
break;
commit 4c00259db73d2b93e8ca1b5b8ee152b9339cc350
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:27:59 2010 +0100
#i113329# sw: && || ambiguity in frmtool.cxx
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index dd0a3eb..70a7669 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1738,7 +1738,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
// die in den Fussnoten liegen, nicht etwa die (spaltigen) Bereiche,
// in denen die Fussnoten(Container) liegen.
// #109767# Table frame is in section, insert section in cell frame.
- if( pSct && ( pFtnFrm && !pSct->IsInFtn() ) || pUpper->IsCellFrm() )
+ if( pSct && ((pFtnFrm && !pSct->IsInFtn()) || pUpper->IsCellFrm()) )
pSct = NULL;
if( pSct )
{ // damit der SectionFrm nicht zerstoert wird durch pTmp->MoveFwd()
commit b026d6fd7b7468245c59e604fff5774fde940bfb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:26:27 2010 +0100
#i113331# sw: && || ambiguity in layact.cxx
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index ffc647a..2d1291a 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1073,23 +1073,33 @@ BOOL SwLayAction::TurboAction()
|* Letzte Aenderung MA 18. Jul. 96
|*
|*************************************************************************/
-const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
+static bool lcl_IsInvaLay( const SwFrm *pFrm, long nBottom )
+{
+ if (
+ !pFrm->IsValid() ||
+ (pFrm->IsCompletePaint() && pFrm->Frm().Top() < nBottom)
+ )
+ {
+ return true;
+ }
+ return false;
+}
+
+static const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
{
ASSERT( pFrm->IsLayoutFrm(), "FindFirstInvaLay, no LayFrm" );
- if ( !pFrm->IsValid() || pFrm->IsCompletePaint() &&
- pFrm->Frm().Top() < nBottom )
+ if (lcl_IsInvaLay(pFrm, nBottom))
return pFrm;
pFrm = ((SwLayoutFrm*)pFrm)->Lower();
while ( pFrm )
{
if ( pFrm->IsLayoutFrm() )
{
- if ( !pFrm->IsValid() || pFrm->IsCompletePaint() &&
- pFrm->Frm().Top() < nBottom )
+ if (lcl_IsInvaLay(pFrm, nBottom))
return pFrm;
const SwFrm *pTmp;
- if ( 0 != (pTmp = ::lcl_FindFirstInvaLay( pFrm, nBottom )) )
+ if ( 0 != (pTmp = lcl_FindFirstInvaLay( pFrm, nBottom )) )
return pTmp;
}
pFrm = pFrm->GetNext();
@@ -1097,7 +1107,7 @@ const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
return 0;
}
-const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom,
+static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom,
const SwCntntFrm *pFirst )
{
const SwCntntFrm *pCnt = pFirst ? pFirst->GetNextCntntFrm() :
@@ -1144,7 +1154,7 @@ const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom,
}
// --> OD 2005-02-21 #i37877# - consider drawing objects
-const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
+static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
long _nBottom )
{
ASSERT( _pPage->GetSortedObjs(), "FindFirstInvaObj, no Objs" )
commit 6459f4579008f5c473ab48d9f74f9fda9a93facf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 30 15:23:13 2010 +0100
#i113332# sw: && || ambiguity in pagechg.cxx
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 8ca7c2d..8ced3ab 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2358,9 +2358,9 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
static const long nOuterClickDiff = 1000000;
// adjust borders for these special cases:
- if ( bFirstColumn && !bRTL || bLastColumn && bRTL )
+ if ( (bFirstColumn && !bRTL) || (bLastColumn && bRTL) )
aPageRectWithBorders.SubLeft( nOuterClickDiff );
- if ( bLastColumn && !bRTL || bFirstColumn && bRTL )
+ if ( (bLastColumn && !bRTL) || (bFirstColumn && bRTL) )
aPageRectWithBorders.AddRight( nOuterClickDiff );
if ( bFirstRow )
aPageRectWithBorders.SubTop( nOuterClickDiff );
More information about the ooo-build-commit
mailing list