sw/inc/calbck.hxx | 8 ++--
sw/inc/swtable.hxx | 12 +++---
sw/source/core/attr/calbck.cxx | 4 +-
sw/source/core/crsr/trvltbl.cxx | 2 -
sw/source/core/doc/docfmt.cxx | 2 -
sw/source/core/doc/tblafmt.cxx | 2 -
sw/source/core/doc/tblcpy.cxx | 26 ++++++-------
sw/source/core/doc/tblrwcl.cxx | 2 -
sw/source/core/docnode/ndcopy.cxx | 12 +++---
sw/source/core/docnode/ndnotxt.cxx | 2 -
sw/source/core/docnode/ndnum.cxx | 2 -
sw/source/core/docnode/ndsect.cxx | 6 +--
sw/source/core/docnode/ndtbl.cxx | 69 ++++++++++++++++++-------------------
sw/source/core/docnode/ndtbl1.cxx | 46 ++++++++++++------------
sw/source/core/docnode/node.cxx | 6 +--
sw/source/core/graphic/ndgrf.cxx | 2 -
sw/source/core/inc/UndoTable.hxx | 4 +-
sw/source/core/table/swtable.cxx | 6 +--
sw/source/core/undo/untbl.cxx | 6 +--
sw/source/filter/xml/xmltbli.cxx | 4 +-
sw/source/filter/xml/xmltbli.hxx | 2 -
21 files changed, 113 insertions(+), 112 deletions(-)
New commits:
commit 1aad15bf3968e243ff2ee2572e5bc3fc5cd8f108
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Wed Nov 21 07:34:08 2012 +0900
sal_Bool to bool
Change-Id: I0845702a9d0d590b0410df8bdcc3a12661f87714
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 75e3ead..4eb30e1 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -133,7 +133,7 @@ inline SwClient::SwClient() :
class SW_DLLPUBLIC SwModify: public SwClient
{
SwClient* pRoot; // the start of the linked list of clients
- sal_Bool bModifyLocked : 1; // don't broadcast changes now
+ bool bModifyLocked : 1; // don't broadcast changes now
sal_Bool bLockClientList : 1; // may be set when this instance
notifies its clients
sal_Bool bInDocDTOR : 1; // workaround for problems when a lot
of objects are destroyed
sal_Bool bInCache : 1;
@@ -167,12 +167,12 @@ public:
// get information about attribute
virtual bool GetInfo( SfxPoolItem& ) const;
- void LockModify() { bModifyLocked = sal_True; }
- void UnlockModify() { bModifyLocked = sal_False; }
+ void LockModify() { bModifyLocked = true; }
+ void UnlockModify() { bModifyLocked = false; }
void SetInCache( sal_Bool bNew ) { bInCache = bNew; }
void SetInSwFntCache( sal_Bool bNew ) { bInSwFntCache = bNew; }
void SetInDocDTOR() { bInDocDTOR = sal_True; }
- sal_Bool IsModifyLocked() const { return bModifyLocked; }
+ bool IsModifyLocked() const { return bModifyLocked; }
sal_Bool IsInDocDTOR() const { return bInDocDTOR; }
sal_Bool IsInCache() const { return bInCache; }
sal_Bool IsInSwFntCache() const { return bInSwFntCache; }
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 59c7504..be5b1de 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -124,14 +124,14 @@ protected:
// at HTML-import.
sal_uInt16 nRowsToRepeat; // Number of rows to repeat on every
page.
- sal_Bool bModifyLocked :1;
+ bool bModifyLocked :1;
sal_Bool bNewModel :1; // sal_False: old SubTableModel;
sal_True: new RowSpanModel
#ifdef DBG_UTIL
/// This is set by functions (like Merge()) to forbid a late model change.
bool m_bDontChangeModel;
#endif
- sal_Bool IsModifyLocked(){ return bModifyLocked;}
+ bool IsModifyLocked(){ return bModifyLocked;}
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
@@ -179,8 +179,8 @@ public:
sal_uInt16 IncGrfsThatResize() { return ++nGrfsThatResize; }
sal_uInt16 DecGrfsThatResize() { return nGrfsThatResize ?
--nGrfsThatResize : 0; }
- void LockModify() { bModifyLocked = sal_True; } // Must be used always
- void UnlockModify() { bModifyLocked = sal_False;} // in pairs!
+ void LockModify() { bModifyLocked = true; } // Must be used always
+ void UnlockModify() { bModifyLocked = false;} // in pairs!
void SetTableModel( sal_Bool bNew ){ bNewModel = bNew; }
sal_Bool IsNewModel() const { return bNewModel; }
@@ -308,9 +308,9 @@ public:
// Search all content-bearing boxes of the base line on which this box
stands.
// rBoxes as a return value for immediate use.
// steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen
- // bToTop = sal_True -> up to base line, sal_False-> else only line of box.
+ // bToTop = true -> up to base line, sal_False-> else only line of box.
SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
- SwSelBoxes& rBoxes, sal_Bool bToTop = sal_True )
const;
+ SwSelBoxes& rBoxes, bool bToTop = true ) const;
// Get information from client.
virtual bool GetInfo( SfxPoolItem& ) const;
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 6b25b72..7b31f0b 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -100,7 +100,7 @@ bool SwClient::GetInfo( SfxPoolItem& ) const
SwModify::SwModify()
: SwClient(0), pRoot(0)
{
- bModifyLocked = sal_False;
+ bModifyLocked = false;
bLockClientList = sal_False;
bInDocDTOR = sal_False;
bInCache = sal_False;
@@ -110,7 +110,7 @@ SwModify::SwModify()
SwModify::SwModify( SwModify* pToRegisterIn )
: SwClient( pToRegisterIn ), pRoot( 0 )
{
- bModifyLocked = sal_False;
+ bModifyLocked = false;
bLockClientList = sal_False;
bInDocDTOR = sal_False;
bInCache = sal_False;
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index c93b7a1..741a017 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -100,7 +100,7 @@ sal_Bool SwCrsrShell::GoNextCell( sal_Bool bAppendLine )
// the document might change; w/o Action views would not be
notified
((SwEditShell*)this)->StartAllAction();
bRet = pDoc->InsertRow( pTblNd->GetTable().
- SelLineFromBox( pTableBox, aBoxes,
sal_False ));
+ SelLineFromBox( pTableBox, aBoxes, false
));
((SwEditShell*)this)->EndAllAction();
}
}
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 94e2758..58ec6d8 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -182,7 +182,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs
)
SwCntntNode* pNode = (SwCntntNode*)rpNd->GetCntntNode();
if( pNode && pNode->HasSwAttrSet() )
{
- const sal_Bool bLocked = pNode->IsModifyLocked();
+ const bool bLocked = pNode->IsModifyLocked();
pNode->LockModify();
SwDoc* pDoc = pNode->GetDoc();
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index eabafd1..a861adc 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -152,7 +152,7 @@ namespace
};
/// Checks whether a writer-specific block exists (i.e. size is not zero)
- sal_Bool WriterSpecificBlockExists(SvStream &stream)
+ bool WriterSpecificBlockExists(SvStream &stream)
{
sal_uInt64 endOfSwBlock = 0;
stream >> endOfSwBlock;
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 1726c4b..7905843 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -53,7 +53,7 @@
static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
SwTable& rDstTbl, SwTableBox* pDstBox,
- sal_Bool bDelCntnt, SwUndoTblCpyTbl* pUndo );
+ bool bDelCntnt, SwUndoTblCpyTbl* pUndo );
// The following type will be used by table copy functions to describe
// the structure of tables (or parts of tables).
@@ -501,7 +501,7 @@ namespace
SwTableBox *pBox = rInfo.mpBox;
if( pBox && pBox->getRowSpan() > 0 )
lcl_CpyBox( rSource, rInfo.mpCopy, rDstTbl, pBox,
- sal_True, pUndo );
+ true, pUndo );
}
}
}
@@ -519,7 +519,7 @@ namespace
// of a "BaseLine".
static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
SwTable& rDstTbl, SwTableBox* pDstBox,
- sal_Bool bDelCntnt, SwUndoTblCpyTbl* pUndo )
+ bool bDelCntnt, SwUndoTblCpyTbl* pUndo )
{
OSL_ENSURE( ( !pCpyBox || pCpyBox->GetSttNd() ) && pDstBox->GetSttNd(),
"No content in this Box" );
@@ -764,7 +764,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const
SwNodeIndex& rSttBox,
SwTblNumFmtMerge aTNFM( *pCpyDoc, *pDoc );
- sal_Bool bDelCntnt = sal_True;
+ bool bDelCntnt = true;
const SwTableBox* pTmp;
for( sal_uInt16 nLines = 0; nLines < rCpyTbl.GetTabLines().size();
++nLines )
@@ -785,11 +785,11 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const
SwNodeIndex& rSttBox,
pCpyBox = pTmp;
if( 0 == ( pTmp = pMyBox->FindNextBox( *this, pMyBox, false )))
- bDelCntnt = sal_False; // No space left?
+ bDelCntnt = false; // No space left?
else
pMyBox = (SwTableBox*)pTmp;
- } while( sal_True );
+ } while( true );
// Find the topmost Line
SwTableLine* pNxtLine = pMyBox->GetUpper();
@@ -798,7 +798,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const
SwNodeIndex& rSttBox,
sal_uInt16 nPos = GetTabLines().GetPos( pNxtLine );
// Is there a next?
if( nPos + 1 >= (sal_uInt16)GetTabLines().size() )
- bDelCntnt = sal_False; // there is none, all goes into the
last Box
+ bDelCntnt = false; // there is none, all goes into the last
Box
else
{
// Find the next Box with content
@@ -806,7 +806,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const
SwNodeIndex& rSttBox,
pMyBox = pNxtLine->GetTabBoxes().front();
while( !pMyBox->GetTabLines().empty() )
pMyBox = pMyBox->GetTabLines().front()->GetTabBoxes().front();
- bDelCntnt = sal_True;
+ bDelCntnt = true;
}
}
@@ -905,9 +905,9 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const
SwSelBoxes& rSelBoxes,
if( pUndo
? !pUndo->InsertRow( *this, SelLineFromBox( pInsBox,
- aBoxes, sal_True ), nNewLns )
+ aBoxes, true ), nNewLns )
: !InsertRow( pDoc, SelLineFromBox( pInsBox,
- aBoxes, sal_True ), nNewLns, true ) )
+ aBoxes, true ), nNewLns, true ) )
return sal_False;
}
@@ -1014,7 +1014,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const
SwSelBoxes& rSelBoxes,
for (size_t n = 0; n < rSelBoxes.size(); ++n)
{
lcl_CpyBox( rCpyTbl, pTmpBx, *this,
- (SwTableBox*)rSelBoxes[n], sal_True, pUndo );
+ (SwTableBox*)rSelBoxes[n], true, pUndo );
}
}
else
@@ -1028,7 +1028,7 @@ sal_Bool SwTable::InsTable( const SwTable& rCpyTbl, const
SwSelBoxes& rSelBoxes,
// Copy the pCpyBox into pMyBox
lcl_CpyBox( rCpyTbl, pCpyLn->GetTabBoxes()[
nBx % pCpyLn->GetTabBoxes().size() ],
- *this, pFLine->GetBoxes()[nBx].GetBox(), sal_True, pUndo );
+ *this, pFLine->GetBoxes()[nBx].GetBox(), true, pUndo );
}
}
@@ -1055,7 +1055,7 @@ static void _FndCntntLine( const SwTableLine* pLine,
SwSelBoxes* pPara )
// Find all Boxes with content in this Box
SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
- SwSelBoxes& rBoxes, sal_Bool bToTop ) const
+ SwSelBoxes& rBoxes, bool bToTop ) const
{
SwTableLine* pLine = (SwTableLine*)pBox->GetUpper();
if( bToTop )
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 240ccac..a25df27 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -2187,7 +2187,7 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd )
SwSelBoxes aSelBoxes;
SwTableBox* pBox = GetTabSortBoxes()[ 0 ];
pBox = GetTblBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 );
- SelLineFromBox( pBox, aSelBoxes, sal_True );
+ SelLineFromBox( pBox, aSelBoxes, true );
_FndBox aFndBox( 0, 0 );
{
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index a2b015f..3dbaa99 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -955,7 +955,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if( !bCopyCollFmt || bColumnSel || pStt->nContent.GetIndex() )
{
SwIndex aDestIdx( rPos.nContent );
- sal_Bool bCopyOk = sal_False;
+ bool bCopyOk = false;
if( !pDestTxtNd )
{
if( pStt->nContent.GetIndex() || bOneNode )
@@ -964,7 +964,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
else
{
pDestTxtNd =
static_cast<SwTxtNode*>(pSttTxtNd->MakeCopy( pDoc, aInsPos ));
- bCopyOk = sal_True;
+ bCopyOk = true;
}
aDestIdx.Assign( pDestTxtNd, 0 );
bCopyCollFmt = true;
@@ -990,7 +990,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// Correct the area again
if( bEndEqualIns )
{
- sal_Bool bChg = pEnd != rPam.GetPoint();
+ bool bChg = pEnd != rPam.GetPoint();
if( bChg )
rPam.Exchange();
rPam.Move( fnMoveBackward, fnGoCntnt );
@@ -1322,7 +1322,7 @@ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg,
const xub_StrLen nEndConte
_SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 );
SwNodeIndex aSavePos( rInsPos, -1 );
- sal_Bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
+ bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrms, sal_True );
++aSavePos;
if( bEndIsEqualEndPos )
@@ -1557,7 +1557,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
}
// Check recursion: copy content in its own frame, then don't copy it.
- sal_Bool bMakeCpy = sal_True;
+ bool bMakeCpy = true;
if( pDest == this )
{
const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt();
@@ -1567,7 +1567,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
pSNd->GetIndex() < rStartIdx.GetIndex() &&
rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
{
- bMakeCpy = sal_False;
+ bMakeCpy = false;
aSet.erase ( it );
}
}
diff --git a/sw/source/core/docnode/ndnotxt.cxx
b/sw/source/core/docnode/ndnotxt.cxx
index 805fcf1..e740e41 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -120,7 +120,7 @@ const PolyPolygon *SwNoTxtNode::HasContour() const
if( !bContourMapModeValid )
{
const MapMode aGrfMap( GetGraphic().GetPrefMapMode() );
- sal_Bool bPixelGrf = aGrfMap.GetMapUnit() == MAP_PIXEL;
+ bool bPixelGrf = aGrfMap.GetMapUnit() == MAP_PIXEL;
const MapMode aContourMap( bPixelGrf ? MAP_PIXEL : MAP_100TH_MM );
if( bPixelGrf ? !bPixelContour : aGrfMap != aContourMap )
{
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 2574001..88e0a2d 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -51,7 +51,7 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
if (pTxtNd && pTxtNd->IsOutlineStateChanged())
{
- sal_Bool bFound = pOutlineNds->find(pTxtNd) != pOutlineNds->end();
+ bool bFound = pOutlineNds->find(pTxtNd) != pOutlineNds->end();
if (pTxtNd->IsOutline())
{
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index 23f6744..e605e46 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -624,7 +624,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos,
SwSectionData & rNewData,
if (pSection->DataEquals(rNewData))
{
// Check Attributes
- sal_Bool bOnlyAttrChg = sal_False;
+ bool bOnlyAttrChg = false;
if( pAttr && pAttr->Count() )
{
SfxItemIter aIter( *pAttr );
@@ -633,7 +633,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos,
SwSectionData & rNewData,
{
if( pFmt->GetFmtAttr( nWhich ) != *aIter.GetCurItem() )
{
- bOnlyAttrChg = sal_True;
+ bOnlyAttrChg = true;
break;
}
@@ -902,7 +902,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex
const& rNdIdx,
// We could optimize this, by not removing already contained Frames and
recreating them,
// but by simply rewiring them
- sal_Bool bInsFrm = bCreateFrms && !pSectNd->GetSection().IsHidden() &&
+ bool bInsFrm = bCreateFrms && !pSectNd->GetSection().IsHidden() &&
GetDoc()->GetCurrentViewShell();
SwNode2Layout *pNode2Layout = NULL;
if( bInsFrm )
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4d752cd..b763c62 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -114,13 +114,13 @@ extern sal_Bool sw_GC_Line_Border( const SwTableLine*& ,
void* pPara );
static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
{
- sal_Bool bTop = sal_False, bBottom = sal_False, bLeft = sal_False, bRight
= sal_False;
+ sal_Bool bTop = false, bBottom = false, bLeft = false, bRight = false;
switch ( nId )
{
- case 0: bTop = bBottom = bLeft = sal_True; break;
- case 1: bTop = bBottom = bLeft = bRight = sal_True; break;
- case 2: bBottom = bLeft = sal_True; break;
- case 3: bBottom = bLeft = bRight = sal_True; break;
+ case 0: bTop = bBottom = bLeft = true; break;
+ case 1: bTop = bBottom = bLeft = bRight = true; break;
+ case 2: bBottom = bLeft = true; break;
+ case 3: bBottom = bLeft = bRight = true; break;
}
const sal_Bool bHTML =
rFmt.getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE);
@@ -269,7 +269,7 @@ sal_Bool SwNodes::InsBoxen( SwTableNode* pTblNd,
if( !pPrvBox && !pNxtBox )
{
- sal_Bool bSetIdxPos = sal_True;
+ bool bSetIdxPos = true;
if( pTblNd->GetTable().GetTabLines().size() && !nInsPos )
{
const SwTableLine* pTblLn = pLine;
@@ -282,7 +282,7 @@ sal_Bool SwNodes::InsBoxen( SwTableNode* pTblNd,
while( ( pNxtBox =
pLine->GetTabBoxes()[0])->GetTabLines().size() )
pLine = pNxtBox->GetTabLines()[0];
nIdxPos = pNxtBox->GetSttIdx();
- bSetIdxPos = sal_False;
+ bSetIdxPos = false;
}
}
if( bSetIdxPos )
@@ -371,7 +371,7 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTblOpts,
SwTxtFmtColl *pBodyColl = GetTxtCollFromPool( RES_POOLCOLL_TABLE ),
*pHeadColl = pBodyColl;
- sal_Bool bDfltBorders = 0 != ( rInsTblOpts.mnInsMode &
tabopts::DEFAULT_BORDER );
+ bool bDfltBorders = 0 != ( rInsTblOpts.mnInsMode & tabopts::DEFAULT_BORDER
);
if( (rInsTblOpts.mnInsMode & tabopts::HEADLINE) && (1 != nRows ||
!bDfltBorders) )
pHeadColl = GetTxtCollFromPool( RES_POOLCOLL_TABLE_HDLN );
@@ -668,7 +668,7 @@ const SwTable* SwDoc::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
if( pStt->nContent.GetIndex() )
SplitNode( *pStt, false );
- sal_Bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
+ bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
// Do not split at the End of a Line (except at the End of the Doc)
if( bEndCntnt )
@@ -740,12 +740,12 @@ const SwTable* SwDoc::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
0;
pNdTbl->SetRowsToRepeat( nRowsToRepeat );
- sal_Bool bUseBoxFmt = sal_False;
+ bool bUseBoxFmt = false;
if( !pBoxFmt->GetDepends() )
{
// The Box's Formats already have the right size, we must only set
// the right Border/AutoFmt.
- bUseBoxFmt = sal_True;
+ bUseBoxFmt = true;
pTableFmt->SetFmtAttr( pBoxFmt->GetFrmSize() );
delete pBoxFmt;
eAdjust = text::HoriOrientation::NONE;
@@ -784,7 +784,7 @@ const SwTable* SwDoc::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
for( sal_uInt16 i = 0; i < nCols; ++i )
{
SwTableBox* pBox = rBoxes[ i ];
- sal_Bool bChgSz = sal_False;
+ bool bChgSz = false;
if( pTAFmt )
{
@@ -1162,7 +1162,7 @@ const SwTable* SwDoc::TextToTable( const std::vector<
std::vector<SwNodeRange> >
if( pStt->nContent.GetIndex() )
SplitNode( *pStt, false );
- sal_Bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
+ bool bEndCntnt = 0 != pEnd->nContent.GetIndex();
// Do not split at the End of a Line (except at the End of the Doc)
if( bEndCntnt )
@@ -1971,7 +1971,7 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes,
bool bColumn )
aSelBoxes[0]->GetSttIdx()-1 == nTmpIdx1 &&
nTmpIdx2 == pTblNd->EndOfSectionIndex() )
{
- sal_Bool bNewTxtNd = sal_False;
+ bool bNewTxtNd = false;
// Is it alone in a FlyFrame?
SwNodeIndex aIdx( *pTblNd, -1 );
const SwStartNode* pSttNd = aIdx.GetNode().GetStartNode();
@@ -1993,7 +1993,7 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes,
bool bColumn )
}
// No Fly? Thus Header or Footer: always leave a TextNode
// We can forget about Undo then!
- bNewTxtNd = sal_True;
+ bNewTxtNd = true;
}
}
@@ -2363,7 +2363,7 @@ void SwTableNode::MakeFrms(const SwNodeIndex & rIdx )
OSL_ENSURE( pNode, "No ContentNode or CopyNode and new Node is identical");
- sal_Bool bBefore = rIdx < GetIndex();
+ bool bBefore = rIdx < GetIndex();
SwNode2Layout aNode2Layout( *this, rIdx.GetIndex() );
@@ -2427,7 +2427,7 @@ void SwTableNode::DelFrms()
SwTabFrm *pFrm = aIter.First();
while ( pFrm )
{
- sal_Bool bAgain = sal_False;
+ bool bAgain = false;
{
if ( !pFrm->IsFollow() )
{
@@ -2450,7 +2450,7 @@ void SwTableNode::DelFrms()
}
pFrm->Cut();
delete pFrm;
- bAgain = sal_True;
+ bAgain = true;
}
}
pFrm = bAgain ? aIter.First() : aIter.Next();
@@ -3252,7 +3252,7 @@ sal_Bool SwDoc::SplitTable( const SwPosition& rPos,
sal_uInt16 eHdlnMode,
return 0 != pNew;
}
-static sal_Bool lcl_ChgTblSize( SwTable& rTbl )
+static bool lcl_ChgTblSize( SwTable& rTbl )
{
// The Attribute must not be set via the Modify or else all Boxes are
// set back to 0.
@@ -3261,9 +3261,9 @@ static sal_Bool lcl_ChgTblSize( SwTable& rTbl )
SwFmtFrmSize aTblMaxSz( pFmt->GetFrmSize() );
if( USHRT_MAX == aTblMaxSz.GetWidth() )
- return sal_False;
+ return false;
- sal_Bool bLocked = pFmt->IsModifyLocked();
+ bool bLocked = pFmt->IsModifyLocked();
pFmt->LockModify();
aTblMaxSz.SetWidth( 0 );
@@ -3283,7 +3283,7 @@ static sal_Bool lcl_ChgTblSize( SwTable& rTbl )
if( !bLocked ) // Release the Lock if appropriate
pFmt->UnlockModify();
- return sal_True;
+ return true;
}
class _SplitTable_Para
@@ -3651,20 +3651,20 @@ struct _SetAFmtTabPara
};
// Forward declare so that the Lines and Boxes can use recursion
-static sal_Bool lcl_SetAFmtBox(_FndBox &, _SetAFmtTabPara *pSetPara);
-static sal_Bool lcl_SetAFmtLine(_FndLine &, _SetAFmtTabPara *pPara);
+static bool lcl_SetAFmtBox(_FndBox &, _SetAFmtTabPara *pSetPara);
+static bool lcl_SetAFmtLine(_FndLine &, _SetAFmtTabPara *pPara);
-static sal_Bool lcl_SetAFmtLine(_FndLine & rLine, _SetAFmtTabPara *pPara)
+static bool lcl_SetAFmtLine(_FndLine & rLine, _SetAFmtTabPara *pPara)
{
for (_FndBoxes::iterator it = rLine.GetBoxes().begin();
it != rLine.GetBoxes().end(); ++it)
{
lcl_SetAFmtBox(*it, pPara);
}
- return sal_True;
+ return true;
}
-static sal_Bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
+static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
{
if (!rBox.GetUpper()->GetUpper()) // Box on first level?
{
@@ -3715,7 +3715,7 @@ static sal_Bool lcl_SetAFmtBox( _FndBox & rBox,
_SetAFmtTabPara *pSetPara )
if (!rBox.GetUpper()->GetUpper()) // a BaseLine
++pSetPara->nCurBox;
- return sal_True;
+ return true;
}
@@ -4011,13 +4011,14 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
SwUndoTblNumFmt* pUndo = 0;
- sal_Bool bIsEmptyTxtNd, bChgd = sal_True;
+ sal_Bool bIsEmptyTxtNd;
+ bool bChgd = true;
sal_uInt32 nFmtIdx;
double fNumber;
if( rBox.HasNumCntnt( fNumber, nFmtIdx, bIsEmptyTxtNd ) )
{
if( !rBox.IsNumberChanged() )
- bChgd = sal_False;
+ bChgd = false;
else
{
if (GetIDocumentUndoRedo().DoesUndo())
@@ -4113,7 +4114,7 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool
bCallUpdate )
pBoxFmt->ResetFmtAttr( nWhich1, RES_BOXATR_VALUE );
}
else
- bChgd = sal_False;
+ bChgd = false;
}
if( bChgd )
@@ -4311,7 +4312,7 @@ sal_Bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const
SwSelBoxes& rBoxes,
}
SwDoc* pCpyDoc = (SwDoc*)pSrcTblNd->GetDoc();
- sal_Bool bDelCpyDoc = pCpyDoc == this;
+ bool bDelCpyDoc = pCpyDoc == this;
if( bDelCpyDoc )
{
@@ -4409,7 +4410,7 @@ sal_Bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const
SwSelBoxes& rBoxes,
sal_Bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
{
- sal_Bool bChgd = sal_False;
+ bool bChgd = false;
SwUndoAttrTbl *const pUndo = (GetIDocumentUndoRedo().DoesUndo())
? new SwUndoAttrTbl( *rTbl.GetTableNode() )
: 0;
@@ -4421,7 +4422,7 @@ sal_Bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
if( pBoxFmt->GetProtect().IsCntntProtected() )
{
pBoxFmt->ResetFmtAttr( RES_PROTECT );
- bChgd = sal_True;
+ bChgd = true;
}
}
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index a0f59b7..5916ee2 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -68,7 +68,7 @@ extern void ClearFEShellTabCols();
//siehe auch swtable.cxx
#define COLFUZZY 20L
-inline sal_Bool IsSame( long nA, long nB ) { return Abs(nA-nB) <= COLFUZZY; }
+inline bool IsSame( long nA, long nB ) { return Abs(nA-nB) <= COLFUZZY; }
class SwTblFmtCmp
{
@@ -131,8 +131,8 @@ static void lcl_GetStartEndCell( const SwCursor& rCrsr,
prEnd = pMarkFrm ? pMarkFrm->GetUpper() : 0;
}
-static sal_Bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
- sal_Bool bAllCrsr = sal_False )
+static bool lcl_GetBoxSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
+ bool bAllCrsr = false )
{
const SwTableCursor* pTblCrsr =
dynamic_cast<const SwTableCursor*>(&rCursor);
@@ -176,17 +176,17 @@ inline void InsertLine( std::vector<SwTableLine*>&
rLineArr, SwTableLine* pLine
//-----------------------------------------------------------------------------
-static sal_Bool lcl_IsAnLower( const SwTableLine *pLine, const SwTableLine
*pAssumed )
+static bool lcl_IsAnLower( const SwTableLine *pLine, const SwTableLine
*pAssumed )
{
const SwTableLine *pTmp = pAssumed->GetUpper() ?
pAssumed->GetUpper()->GetUpper() : 0;
while ( pTmp )
{
if ( pTmp == pLine )
- return sal_True;
+ return true;
pTmp = pTmp->GetUpper() ? pTmp->GetUpper()->GetUpper() : 0;
}
- return sal_False;
+ return false;
}
//-----------------------------------------------------------------------------
@@ -201,9 +201,9 @@ struct LinesAndTable
};
-sal_Bool _FindLine( _FndLine & rLine, LinesAndTable* pPara );
+bool _FindLine( _FndLine & rLine, LinesAndTable* pPara );
-sal_Bool _FindBox( _FndBox & rBox, LinesAndTable* pPara )
+bool _FindBox( _FndBox & rBox, LinesAndTable* pPara )
{
if (!rBox.GetLines().empty())
{
@@ -230,17 +230,17 @@ sal_Bool _FindBox( _FndBox & rBox, LinesAndTable* pPara )
::InsertLine( pPara->rLines,
static_cast<SwTableLine*>(rBox.GetBox()->GetUpper()));
}
- return sal_True;
+ return true;
}
-sal_Bool _FindLine( _FndLine& rLine, LinesAndTable* pPara )
+bool _FindLine( _FndLine& rLine, LinesAndTable* pPara )
{
for (_FndBoxes::iterator it = rLine.GetBoxes().begin();
it != rLine.GetBoxes().end(); ++it)
{
_FindBox(*it, pPara);
}
- return sal_True;
+ return true;
}
static void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor&
rCursor, bool bRemoveLines )
@@ -653,13 +653,13 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const
SfxItemSet& rSet )
pSetBox = 0;
}
- sal_Bool bFirst = sal_True;
+ bool bFirst = true;
for ( sal_uInt16 i = 0; i < aUnions.size(); ++i )
{
SwSelUnion *pUnion = &aUnions[i];
SwTabFrm *pTab = pUnion->GetTable();
const SwRect &rUnion = pUnion->GetUnion();
- const sal_Bool bLast = i == aUnions.size() - 1 ? sal_True :
sal_False;
+ const bool bLast = (i == aUnions.size() - 1);
std::vector<SwCellFrm*> aCellArr;
aCellArr.reserve( 255 );
@@ -795,7 +795,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const
SfxItemSet& rSet )
}
}
- bFirst = sal_False;
+ bFirst = false;
}
SwHTMLTableLayout *pTableLayout = rTable.GetHTMLTableLayout();
@@ -942,8 +942,8 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor,
SfxItemSet& rSet ) const
SwSelUnion *pUnion = &aUnions[i];
const SwTabFrm *pTab = pUnion->GetTable();
const SwRect &rUnion = pUnion->GetUnion();
- const sal_Bool bFirst = i == 0 ? sal_True : sal_False;
- const sal_Bool bLast = i == aUnions.size() - 1 ? sal_True :
sal_False;
+ const bool bFirst = i == 0;
+ const bool bLast = (i == aUnions.size() - 1);
std::vector<SwCellFrm*> aCellArr;
aCellArr.reserve(255);
@@ -1128,7 +1128,7 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const
SfxPoolItem &rNew )
{
SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
SwSelBoxes aBoxes;
- if( pTblNd && ::lcl_GetBoxSel( rCursor, aBoxes, sal_True ) )
+ if( pTblNd && ::lcl_GetBoxSel( rCursor, aBoxes, true ) )
{
SwTable& rTable = pTblNd->GetTable();
if (GetIDocumentUndoRedo().DoesUndo())
@@ -1181,7 +1181,7 @@ sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor,
SfxPoolItem& rToFill ) cons
if( pTblNd && lcl_GetBoxSel( rCursor, aBoxes ))
{
bRet = sal_True;
- sal_Bool bOneFound = sal_False;
+ bool bOneFound = false;
const sal_uInt16 nWhich = rToFill.Which();
for (size_t i = 0; i < aBoxes.size(); ++i)
{
@@ -1194,7 +1194,7 @@ sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor,
SfxPoolItem& rToFill ) cons
if( !bOneFound )
{
(SvxBrushItem&)rToFill = rBack;
- bOneFound = sal_True;
+ bOneFound = true;
}
else if( rToFill != rBack )
bRet = sal_False;
@@ -1208,7 +1208,7 @@ sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor,
SfxPoolItem& rToFill ) cons
if( !bOneFound )
{
(SvxFrameDirectionItem&)rToFill = rDir;
- bOneFound = sal_True;
+ bOneFound = true;
}
else if( rToFill != rDir )
bRet = sal_False;
@@ -1220,7 +1220,7 @@ sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor,
SfxPoolItem& rToFill ) cons
if( !bOneFound )
{
(SwFmtVertOrient&)rToFill = rOrient;
- bOneFound = sal_True;
+ bOneFound = true;
}
else if( rToFill != rOrient )
bRet = sal_False;
@@ -1400,7 +1400,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16>
&rToFill, const SwTabCols
const long nCLeft = (pCell->Frm().*fnRect->fnGetLeft)();
const long nCRight = (pCell->Frm().*fnRect->fnGetRight)();
- sal_Bool bNotInCols = sal_True;
+ bool bNotInCols = true;
for ( sal_uInt16 i = 0; i <= rCols.Count(); ++i )
{
@@ -1431,7 +1431,7 @@ static void lcl_CalcColValues( std::vector<sal_uInt16>
&rToFill, const SwTabCols
//Wir wollen nicht allzu genau hinsehen.
if ( ::IsSame(nCLeft, nLeftA) && ::IsSame(nCRight,
nRightA))
{
- bNotInCols = sal_False;
+ bNotInCols = false;
if ( bWishValues )
{
const sal_uInt16 nWish = ::lcl_CalcCellFit( pCell
);
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 779dad5..a473084 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -787,13 +787,13 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel(
sal_uInt8 nLvl ) const
{
sal_uInt16 nPos;
SwNode* pNd = (SwNode*)this;
- sal_Bool bCheckFirst = sal_False;
+ bool bCheckFirst = false;
if( !rONds.Seek_Entry( pNd, &nPos ))
{
if( nPos )
nPos = nPos-1;
else
- bCheckFirst = sal_True;
+ bCheckFirst = true;
}
if( bCheckFirst )
@@ -830,7 +830,7 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8
nLvl ) const
return pRet;
}
-inline sal_Bool IsValidNextPrevNd( const SwNode& rNd )
+inline bool IsValidNextPrevNd( const SwNode& rNd )
{
return ND_TABLENODE == rNd.GetNodeType() ||
( ND_CONTENTNODE & rNd.GetNodeType() ) ||
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 31c3deb..2c291ee 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -953,7 +953,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
// then make it by your self
if( !bInSwapIn )
{
- sal_Bool bIsModifyLocked = IsModifyLocked();
+ bool bIsModifyLocked = IsModifyLocked();
LockModify();
SwapIn( sal_False );
if( !bIsModifyLocked )
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 5d105ef..6dbda4f 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -300,9 +300,9 @@ public:
virtual void UndoImpl( ::sw::UndoRedoContext & );
virtual void RedoImpl( ::sw::UndoRedoContext & );
- void AddBoxBefore( const SwTableBox& rBox, sal_Bool bDelCntnt );
+ void AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt );
void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx,
- sal_Bool bDelCntnt );
+ bool bDelCntnt );
sal_Bool IsEmpty() const;
bool InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, sal_uInt16 nCnt );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 413b7ef..32bcfc8 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -260,7 +260,7 @@ SwTable::SwTable( SwTableFmt* pFmt )
pTableNode( 0 ),
nGrfsThatResize( 0 ),
nRowsToRepeat( 1 ),
- bModifyLocked( sal_False ),
+ bModifyLocked( false ),
bNewModel( sal_True )
{
// default value set in the options
@@ -274,7 +274,7 @@ SwTable::SwTable( const SwTable& rTable )
eTblChgMode( rTable.eTblChgMode ),
nGrfsThatResize( 0 ),
nRowsToRepeat( rTable.GetRowsToRepeat() ),
- bModifyLocked( sal_False ),
+ bModifyLocked( false ),
bNewModel( rTable.bNewModel )
{
}
@@ -2373,7 +2373,7 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld,
const SfxPoolItem* pNew )
if( bIsNumFmt )
{
// directly assign value - without
Modify
- int bIsLockMod = IsModifyLocked();
+ bool bIsLockMod = IsModifyLocked();
LockModify();
SetFmtAttr( SwTblBoxValue( fVal ));
if( !bIsLockMod )
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 1af7fc0..7a057d9 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2647,7 +2647,7 @@ void SwUndoTblCpyTbl::RedoImpl(::sw::UndoRedoContext &
rContext)
_DEBUG_REDLINE( &rDoc )
}
-void SwUndoTblCpyTbl::AddBoxBefore( const SwTableBox& rBox, sal_Bool bDelCntnt
)
+void SwUndoTblCpyTbl::AddBoxBefore( const SwTableBox& rBox, bool bDelCntnt )
{
if( !pArr->empty() && !bDelCntnt )
return;
@@ -2676,7 +2676,7 @@ void SwUndoTblCpyTbl::AddBoxBefore( const SwTableBox&
rBox, sal_Bool bDelCntnt )
_DEBUG_REDLINE( pDoc )
}
-void SwUndoTblCpyTbl::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex&
rIdx, sal_Bool bDelCntnt )
+void SwUndoTblCpyTbl::AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex&
rIdx, bool bDelCntnt )
{
_UndoTblCpyTbl_Entry* pEntry = &(*pArr).back();
@@ -2905,7 +2905,7 @@ void SwUndoSplitTbl::UndoImpl(::sw::UndoRedoContext &
rContext)
{
SwSelBoxes aSelBoxes;
SwTableBox* pBox = rTbl.GetTblBox( nTblNode + nOffset + 1 );
- rTbl.SelLineFromBox( pBox, aSelBoxes, sal_True );
+ rTbl.SelLineFromBox( pBox, aSelBoxes, true );
_FndBox aTmpBox( 0, 0 );
aTmpBox.SetTableLines( aSelBoxes, rTbl );
aTmpBox.DelFrms( rTbl );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 644b1e5..a7af68e 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1892,7 +1892,7 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat(
sal_Bool bProtected,
sal_Bool bMayShare,
sal_Bool& bNew,
- sal_Bool* pModifyLocked )
+ bool* pModifyLocked )
{
if ( pSharedBoxFormats == NULL )
pSharedBoxFormats = new map_BoxFmt();
@@ -2061,7 +2061,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
// Share formats!
OUString sStyleName = pCell->GetStyleName();
- sal_Bool bModifyLocked;
+ bool bModifyLocked;
sal_Bool bNew;
SwTableBoxFmt *pBoxFmt2 = GetSharedBoxFormat(
pBox, sStyleName, nColWidth, pCell->IsProtected(),
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index d87d068..ac5dd73 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -139,7 +139,7 @@ class SwXMLTableContext : public XMLTextTableContext
sal_Bool bProtected, /// is cell protected?
sal_Bool bMayShare, /// may the format be shared (no value, formula...)
sal_Bool& bNew, /// true, if the format it not from the cache
- sal_Bool* pModifyLocked ); /// if set, call pBox->LockModify() and
return old lock status
+ bool* pModifyLocked ); /// if set, call pBox->LockModify() and return
old lock status
public:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
