[Libreoffice-commits] .: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 21 13:46:47 PDT 2012
sw/source/core/inc/frame.hxx | 100 ++++++++++++++++++-------------------
sw/source/core/inc/layfrm.hxx | 4 -
sw/source/core/layout/atrfrm.cxx | 4 -
sw/source/core/layout/calcmove.cxx | 10 +--
sw/source/core/layout/flycnt.cxx | 4 -
sw/source/core/layout/layact.cxx | 4 -
sw/source/core/layout/paintfrm.cxx | 6 +-
sw/source/core/layout/sectfrm.cxx | 8 +-
sw/source/core/layout/wsfrm.cxx | 4 -
9 files changed, 72 insertions(+), 72 deletions(-)
New commits:
commit 4520f7471f1da9c87825a570b58bfcde590e718c
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Sep 22 05:36:26 2012 +0900
sal_Bool to bool
Change-Id: I75936bc66b0621de5e62f8e3a35a38fa85dcfcef
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index b72964c..bc3bcb7 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -798,33 +798,33 @@ public:
const void *pVoid = 0, sal_Bool bNotify = sal_True );
// sal_True if it is the correct class, sal_False otherwise
- inline sal_Bool IsLayoutFrm() const;
- inline sal_Bool IsRootFrm() const;
- inline sal_Bool IsPageFrm() const;
- inline sal_Bool IsColumnFrm() const;
- inline sal_Bool IsFtnBossFrm() const; // footnote bosses might be PageFrms or ColumnFrms
- inline sal_Bool IsHeaderFrm() const;
- inline sal_Bool IsFooterFrm() const;
- inline sal_Bool IsFtnContFrm() const;
- inline sal_Bool IsFtnFrm() const;
- inline sal_Bool IsBodyFrm() const;
- inline sal_Bool IsColBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above ColumnFrm
- inline sal_Bool IsPageBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above PageFrm
- inline sal_Bool IsFlyFrm() const;
- inline sal_Bool IsSctFrm() const;
- inline sal_Bool IsTabFrm() const;
- inline sal_Bool IsRowFrm() const;
- inline sal_Bool IsCellFrm() const;
- inline sal_Bool IsCntntFrm() const;
- inline sal_Bool IsTxtFrm() const;
- inline sal_Bool IsNoTxtFrm() const;
+ inline bool IsLayoutFrm() const;
+ inline bool IsRootFrm() const;
+ inline bool IsPageFrm() const;
+ inline bool IsColumnFrm() const;
+ inline bool IsFtnBossFrm() const; // footnote bosses might be PageFrms or ColumnFrms
+ inline bool IsHeaderFrm() const;
+ inline bool IsFooterFrm() const;
+ inline bool IsFtnContFrm() const;
+ inline bool IsFtnFrm() const;
+ inline bool IsBodyFrm() const;
+ inline bool IsColBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above ColumnFrm
+ inline bool IsPageBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above PageFrm
+ inline bool IsFlyFrm() const;
+ inline bool IsSctFrm() const;
+ inline bool IsTabFrm() const;
+ inline bool IsRowFrm() const;
+ inline bool IsCellFrm() const;
+ inline bool IsCntntFrm() const;
+ inline bool IsTxtFrm() const;
+ inline bool IsNoTxtFrm() const;
// Frms where its PrtArea depends on their neighbors and that are
// positioned in the content flow
- inline sal_Bool IsFlowFrm() const;
+ inline bool IsFlowFrm() const;
// Frms that are capable of retouching or that might need to retouch behind
// themselves
- inline sal_Bool IsRetoucheFrm() const;
- inline sal_Bool IsAccessibleFrm() const;
+ inline bool IsRetoucheFrm() const;
+ inline bool IsAccessibleFrm() const;
void PrepareCrsr(); // CrsrShell is allowed to call this
@@ -1141,89 +1141,89 @@ inline const SwFrm *SwFrm::FindPrev() const
}
-inline sal_Bool SwFrm::IsLayoutFrm() const
+inline bool SwFrm::IsLayoutFrm() const
{
- return GetType() & FRM_LAYOUT ? sal_True : sal_False;
+ return GetType() & FRM_LAYOUT;
}
-inline sal_Bool SwFrm::IsRootFrm() const
+inline bool SwFrm::IsRootFrm() const
{
return nType == FRMC_ROOT;
}
-inline sal_Bool SwFrm::IsPageFrm() const
+inline bool SwFrm::IsPageFrm() const
{
return nType == FRMC_PAGE;
}
-inline sal_Bool SwFrm::IsColumnFrm() const
+inline bool SwFrm::IsColumnFrm() const
{
return nType == FRMC_COLUMN;
}
-inline sal_Bool SwFrm::IsFtnBossFrm() const
+inline bool SwFrm::IsFtnBossFrm() const
{
- return GetType() & FRM_FTNBOSS ? sal_True : sal_False;
+ return GetType() & FRM_FTNBOSS;
}
-inline sal_Bool SwFrm::IsHeaderFrm() const
+inline bool SwFrm::IsHeaderFrm() const
{
return nType == FRMC_HEADER;
}
-inline sal_Bool SwFrm::IsFooterFrm() const
+inline bool SwFrm::IsFooterFrm() const
{
return nType == FRMC_FOOTER;
}
-inline sal_Bool SwFrm::IsFtnContFrm() const
+inline bool SwFrm::IsFtnContFrm() const
{
return nType == FRMC_FTNCONT;
}
-inline sal_Bool SwFrm::IsFtnFrm() const
+inline bool SwFrm::IsFtnFrm() const
{
return nType == FRMC_FTN;
}
-inline sal_Bool SwFrm::IsBodyFrm() const
+inline bool SwFrm::IsBodyFrm() const
{
return nType == FRMC_BODY;
}
-inline sal_Bool SwFrm::IsFlyFrm() const
+inline bool SwFrm::IsFlyFrm() const
{
return nType == FRMC_FLY;
}
-inline sal_Bool SwFrm::IsSctFrm() const
+inline bool SwFrm::IsSctFrm() const
{
return nType == FRMC_SECTION;
}
-inline sal_Bool SwFrm::IsTabFrm() const
+inline bool SwFrm::IsTabFrm() const
{
return nType == FRMC_TAB;
}
-inline sal_Bool SwFrm::IsRowFrm() const
+inline bool SwFrm::IsRowFrm() const
{
return nType == FRMC_ROW;
}
-inline sal_Bool SwFrm::IsCellFrm() const
+inline bool SwFrm::IsCellFrm() const
{
return nType == FRMC_CELL;
}
-inline sal_Bool SwFrm::IsCntntFrm() const
+inline bool SwFrm::IsCntntFrm() const
{
- return GetType() & FRM_CNTNT ? sal_True : sal_False;
+ return GetType() & FRM_CNTNT;
}
-inline sal_Bool SwFrm::IsTxtFrm() const
+inline bool SwFrm::IsTxtFrm() const
{
return nType == FRMC_TXT;
}
-inline sal_Bool SwFrm::IsNoTxtFrm() const
+inline bool SwFrm::IsNoTxtFrm() const
{
return nType == FRMC_NOTXT;
}
-inline sal_Bool SwFrm::IsFlowFrm() const
+inline bool SwFrm::IsFlowFrm() const
{
- return GetType() & 0xCA00 ? sal_True : sal_False; //TabFrm, CntntFrm, SectionFrm
+ return GetType() & 0xCA00; //TabFrm, CntntFrm, SectionFrm
}
-inline sal_Bool SwFrm::IsRetoucheFrm() const
+inline bool SwFrm::IsRetoucheFrm() const
{
- return GetType() & 0xCA40 ? sal_True : sal_False; //TabFrm, CntntFrm, SectionFrm, Ftnfrm
+ return GetType() & 0xCA40; //TabFrm, CntntFrm, SectionFrm, Ftnfrm
}
-inline sal_Bool SwFrm::IsAccessibleFrm() const
+inline bool SwFrm::IsAccessibleFrm() const
{
- return GetType() & FRM_ACCESSIBLE ? sal_True : sal_False;
+ return GetType() & FRM_ACCESSIBLE;
}
#endif
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 4c4e4e6..14c03b0 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -192,12 +192,12 @@ inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections )
}
// Diese SwFrm-inlines sind hier, damit frame.hxx nicht layfrm.hxx includen muss
-inline sal_Bool SwFrm::IsColBodyFrm() const
+inline bool SwFrm::IsColBodyFrm() const
{
return nType == FRMC_BODY && GetUpper()->IsColumnFrm();
}
-inline sal_Bool SwFrm::IsPageBodyFrm() const
+inline bool SwFrm::IsPageBodyFrm() const
{
return nType == FRMC_BODY && GetUpper()->IsPageFrm();
}
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 86ce81e..416ccf2 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2843,7 +2843,7 @@ void SwFlyFrmFmt::MakeFrms()
SwIterator<SwFrm,SwModify> aIter( *pModify );
for( SwFrm *pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
{
- sal_Bool bAdd = !pFrm->IsCntntFrm() ||
+ bool bAdd = !pFrm->IsCntntFrm() ||
!((SwCntntFrm*)pFrm)->IsFollow();
if ( FLY_AT_FLY == aAnchorAttr.GetAnchorId() && !pFrm->IsFlyFrm() )
@@ -2877,7 +2877,7 @@ void SwFlyFrmFmt::MakeFrms()
if( pObj->ISA(SwFlyFrm) &&
(&pObj->GetFrmFmt()) == this )
{
- bAdd = sal_False;
+ bAdd = false;
break;
}
}
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index ec72b37..97f9b0e 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -289,8 +289,8 @@ void SwFrm::PrepareMake()
if ( !GetUpper() )
return;
- const sal_Bool bCnt = IsCntntFrm();
- const sal_Bool bTab = IsTabFrm();
+ const bool bCnt = IsCntntFrm();
+ const bool bTab = IsTabFrm();
sal_Bool bNoSect = IsInSct();
sal_Bool bOldTabLock = sal_False, bFoll = sal_False;
SwFlowFrm* pThis = bCnt ? (SwCntntFrm*)this : NULL;
@@ -418,8 +418,8 @@ void SwFrm::PrepareCrsr()
if ( !GetUpper() )
return;
- const sal_Bool bCnt = IsCntntFrm();
- const sal_Bool bTab = IsTabFrm();
+ const bool bCnt = IsCntntFrm();
+ const bool bTab = IsTabFrm();
sal_Bool bNoSect = IsInSct();
sal_Bool bOldTabLock = sal_False, bFoll;
@@ -966,7 +966,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
bValidPrtArea = sal_True;
SWRECTFN( this )
- const sal_Bool bTxtFrm = IsTxtFrm();
+ const bool bTxtFrm = IsTxtFrm();
SwTwips nUpper = 0;
if ( bTxtFrm && ((SwTxtFrm*)this)->IsHiddenNow() )
{
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 58d4113..b6e0d59 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -386,7 +386,7 @@ void SwFlyAtCntFrm::MakeAll()
if( pFooter && !pFooter->IsFooterFrm() )
pFooter = NULL;
bool bOsz = false;
- sal_Bool bExtra = Lower() && Lower()->IsColumnFrm();
+ bool bExtra = Lower() && Lower()->IsColumnFrm();
// #i3317# - boolean, to apply temporarly the
// 'straightforward positioning process' for the frame due to its
// overlapping with a previous column.
@@ -501,7 +501,7 @@ void SwFlyAtCntFrm::MakeAll()
// a position change, we loop once more and format
// our content using FormatWidthCols again.
_InvalidateSize();
- bExtra = sal_False; // Ensure only one additional loop run
+ bExtra = false; // Ensure only one additional loop run
}
} while ( !IsValid() && !bOsz &&
// #i3317#
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index adeda9d..d542238 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1398,12 +1398,12 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
aPaint = pPageFrm->GetBoundRect();
}
- sal_Bool bPageInBrowseMode = pLay->IsPageFrm();
+ bool bPageInBrowseMode = pLay->IsPageFrm();
if( bPageInBrowseMode )
{
const ViewShell *pSh = pLay->getRootFrm()->GetCurrShell();
if( !pSh || !pSh->GetViewOptions()->getBrowseMode() )
- bPageInBrowseMode = sal_False;
+ bPageInBrowseMode = false;
}
if( bPageInBrowseMode )
{
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index d8673cd..54348d6 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6088,7 +6088,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
SvxBrushItem* pTmpBackBrush = 0;
const Color* pCol;
SwRect aOrigBackRect;
- const sal_Bool bPageFrm = IsPageFrm();
+ const bool bPageFrm = IsPageFrm();
sal_Bool bLowMode = sal_True;
sal_Bool bBack = GetBackgroundBrush( pItem, pCol, aOrigBackRect, bLowerMode );
@@ -6612,7 +6612,7 @@ void SwColumnFrm::PaintSubsidiaryLines( const SwPageFrm *,
void SwSectionFrm::PaintSubsidiaryLines( const SwPageFrm * pPage,
const SwRect & rRect ) const
{
- const sal_Bool bNoLowerColumn = !Lower() || !Lower()->IsColumnFrm();
+ const bool bNoLowerColumn = !Lower() || !Lower()->IsColumnFrm();
if ( bNoLowerColumn )
{
SwLayoutFrm::PaintSubsidiaryLines( pPage, rRect );
@@ -6681,7 +6681,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
const bool bFlys = pPage->GetSortedObjs() ? true : false;
- const bool bCell = IsCellFrm() ? true : false;
+ const bool bCell = IsCellFrm();
// use frame area for cells
// OD 13.02.2003 #i3662# - for section use also frame area
const bool bUseFrmArea = bCell || IsSctFrm();
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 8c92c2a..ae2aa34 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -572,7 +572,7 @@ sal_Bool SwSectionFrm::SplitSect( SwFrm* pFrm, sal_Bool bApres )
// If a multi-column section is cancelled, the ContentFrms have to be
// invalidated
-void lcl_InvalidateInfFlags( SwFrm* pFrm, sal_Bool bInva )
+void lcl_InvalidateInfFlags( SwFrm* pFrm, bool bInva )
{
while ( pFrm )
{
@@ -646,7 +646,7 @@ SwCntntFrm* lcl_GetNextCntntFrm( const SwLayoutFrm* pLay, bool bFwd )
void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, sal_Bool bSave )
{
- sal_Bool bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm();
+ bool bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm();
SwFrm* pPrv = pDel->GetPrev();
SwLayoutFrm* pUp = pDel->GetUpper();
// OD 27.03.2003 #i12711# - initialize local pointer variables.
@@ -1353,7 +1353,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
// Column widths have to be adjusted before calling _CheckClipping.
// _CheckClipping can cause the formatting of the lower frames
// which still have a width of 0.
- const sal_Bool bHasColumns = Lower() && Lower()->IsColumnFrm();
+ const bool bHasColumns = Lower() && Lower()->IsColumnFrm();
if ( bHasColumns && Lower()->GetNext() )
AdjustColumns( 0, sal_False );
@@ -1989,7 +1989,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst )
sal_Bool bInCalcCntnt = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked();
// OD 2004-03-15 #116561# - allow grow in online layout
- sal_Bool bGrow = !Lower() || !Lower()->IsColumnFrm() || !Lower()->GetNext() ||
+ bool bGrow = !Lower() || !Lower()->IsColumnFrm() || !Lower()->GetNext() ||
GetSection()->GetFmt()->GetBalancedColumns().GetValue();
if( !bGrow )
{
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 9a5b34a..eb7d548 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1551,7 +1551,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst )
}
else
{
- const sal_Bool bFtnPage = pBoss->IsPageFrm() && ((SwPageFrm*)pBoss)->IsFtnPage();
+ const bool bFtnPage = pBoss->IsPageFrm() && ((SwPageFrm*)pBoss)->IsFtnPage();
if ( bFtnPage && !IsFtnContFrm() )
pFrm = (SwFrm*)pBoss->FindFtnCont();
if ( !pFrm )
@@ -3110,7 +3110,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
const sal_uInt16 nRight = (sal_uInt16)((SwBorderAttrs*)pAttrs)->CalcRight( this );
const sal_uInt16 nLower = pAttrs->CalcBottom();
- sal_Bool bVert = IsVertical() && !IsPageFrm();
+ bool bVert = IsVertical() && !IsPageFrm();
//Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
if ( !bValidPrtArea )
More information about the Libreoffice-commits
mailing list