[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 3 08:25:58 PDT 2012
sw/inc/pam.hxx | 12 ++++++------
sw/source/core/crsr/crsrsh.cxx | 30 +++++++++++++++---------------
sw/source/core/crsr/crstrvl.cxx | 10 +++++-----
sw/source/core/crsr/findattr.cxx | 6 +++---
sw/source/core/crsr/findtxt.cxx | 4 ++--
sw/source/core/crsr/pam.cxx | 36 ++++++++++++++++++------------------
sw/source/core/crsr/swcrsr.cxx | 22 +++++++++++-----------
sw/source/core/crsr/trvlfnfl.cxx | 4 ++--
sw/source/core/crsr/trvlreg.cxx | 4 ++--
sw/source/core/crsr/trvltbl.cxx | 11 ++++++-----
sw/source/core/crsr/unocrsr.cxx | 6 +++---
sw/source/core/inc/pamtyp.hxx | 2 +-
12 files changed, 74 insertions(+), 73 deletions(-)
New commits:
commit f0b5e02b323ac7520c9e1ec77ba603291e7ed325
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Oct 4 00:15:11 2012 +0900
sal_Bool to bool
Change-Id: I6a4c4f4c8129100770ca976d508ca3a98e67a846
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 3f49310..83e3489 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -74,12 +74,12 @@ struct SW_DLLPUBLIC SwPosition
*/
SwDoc * GetDoc() const;
- sal_Bool operator < (const SwPosition &) const;
- sal_Bool operator > (const SwPosition &) const;
- sal_Bool operator <=(const SwPosition &) const;
- sal_Bool operator >=(const SwPosition &) const;
- sal_Bool operator ==(const SwPosition &) const;
- sal_Bool operator !=(const SwPosition &) const;
+ bool operator < (const SwPosition &) const;
+ bool operator > (const SwPosition &) const;
+ bool operator <=(const SwPosition &) const;
+ bool operator >=(const SwPosition &) const;
+ bool operator ==(const SwPosition &) const;
+ bool operator !=(const SwPosition &) const;
};
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e026f9b..f37a4b7 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -491,7 +491,7 @@ sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool bAPI)
if( pBlockCrsr )
pBlockCrsr->clearPoints();
- const sal_Bool bWasAtLM =
+ const bool bWasAtLM =
( 0 == _GetCrsr()->GetPoint()->nContent.GetIndex() );
sal_Bool bRet = pTmpCrsr->LeftRightMargin( bLeft, bAPI );
@@ -1160,11 +1160,11 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
// always switch off all cursors when painting
SwRect aRect( rRect );
- sal_Bool bVis = sal_False;
+ bool bVis = false;
// if a cursor is visible then hide the SV cursor
if( pVisCrsr->IsVisible() && !aRect.IsOver( aCharRect ) )
{
- bVis = sal_True;
+ bVis = true;
pVisCrsr->Hide();
}
@@ -1512,7 +1512,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
// are we perhaps in a protected / hidden Section ?
{
SwShellCrsr* pShellCrsr = getShellCrsr( true );
- sal_Bool bChgState = sal_True;
+ bool bChgState = true;
const SwSectionNode* pSectNd = pShellCrsr->GetNode()->FindSectionNode();
if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() ||
( !IsReadOnlyAvailable() &&
@@ -1526,7 +1526,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
// everything protected/hidden -> special mode
if( bAllProtect && !IsReadOnlyAvailable() &&
pSectNd->GetSection().IsProtectFlag() )
- bChgState = sal_False;
+ bChgState = false;
else
{
eMvState = MV_NONE; // state for cursor travelling
@@ -1590,15 +1590,15 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
SwRect aOld( aCharRect );
- sal_Bool bFirst = sal_True;
+ bool bFirst = true;
SwCntntFrm *pFrm;
int nLoopCnt = 100;
SwShellCrsr* pShellCrsr = getShellCrsr( true );
do {
- sal_Bool bAgainst;
+ bool bAgainst;
do {
- bAgainst = sal_False;
+ bAgainst = false;
pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
&pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False );
// if the Frm doesn't exist anymore, the complete Layout has to be
@@ -1624,13 +1624,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
!pDoc->GetDocShell()->IsReadOnly() || bAllProtect ) )
{
// look for a valid position
- sal_Bool bChgState = sal_True;
+ bool bChgState = true;
if( !FindValidCntntNode(!HasDrawView() ||
0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
{
// everything is protected / hidden -> special Mode
if( bAllProtect )
- bChgState = sal_False;
+ bChgState = false;
else
{
eMvState = MV_NONE; // state for crusor travelling
@@ -1655,7 +1655,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
CallChgLnk(); // notify UI!
}
bAllProtect = sal_False;
- bAgainst = sal_True; // look for the right Frm again
+ bAgainst = true; // look for the right Frm again
}
}
} while( bAgainst );
@@ -1710,7 +1710,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
break;
}
aOld = aCharRect;
- bFirst = sal_False;
+ bFirst = false;
// update cursor Points to the new Positions
pShellCrsr->GetPtPos().X() = aCharRect.Left();
@@ -2418,7 +2418,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
SwPaM *pTmpDel = 0, *pTmp = *ppDelRing;
// search over the whole ring
- sal_Bool bGoNext;
+ bool bGoNext;
do {
const SwPosition *pTmpStt = pTmp->Start(),
*pTmpEnd = pTmp->GetPoint() == pTmpStt ?
@@ -2435,7 +2435,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
if( *pStt < *pTmpEnd )
pTmpDel = pTmp;
- bGoNext = sal_True;
+ bGoNext = true;
if( pTmpDel ) // is the pam in area -> delete
{
sal_Bool bDelete = sal_True;
@@ -2445,7 +2445,7 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
{
if( sal_True == ( bDelete = GoNextCrsr() ))
{
- bGoNext = sal_False;
+ bGoNext = false;
pTmp = (SwPaM*)pTmp->GetNext();
}
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 50f44f9..0b454ed 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -686,7 +686,7 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
SwTxtFld * pTxtFld = static_cast<SwTxtFld *>(
pTNd->GetTxtAttrForCharAt(rPos.nContent.GetIndex(),
RES_TXTATR_FIELD));
- sal_Bool bDelFld = 0 == pTxtFld;
+ bool bDelFld = 0 == pTxtFld;
if( bDelFld )
{
SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
@@ -1957,7 +1957,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect
sal_uInt16 nSeqNo = pTmp->GetSeqNo();
if( nSeqNo && bSelect )
{
- sal_Bool bCheck = sal_False;
+ bool bCheck = false;
int nLoopCnt = 2;
sal_uInt16 nArrSavPos = nArrPos;
@@ -1979,7 +1979,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect
const SwPosition *pNStt = pNextPam->Start(),
*pNEnd = pNextPam->End();
- sal_Bool bDel = sal_True;
+ bool bDel = true;
switch( ::ComparePosition( *pCStt, *pCEnd,
*pNStt, *pNEnd ))
{
@@ -2014,7 +2014,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect
break;
default:
- bDel = sal_False;
+ bDel = false;
}
if( bDel )
@@ -2039,7 +2039,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect
{
// create new cursor
CreateCrsr();
- bCheck = sal_True;
+ bCheck = true;
}
nArrPos = nFndPos;
}
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 7e85288..8572f9c 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -557,7 +557,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
}
}
- sal_Bool bContinue = sal_False;
+ bool bContinue = false;
if( SFX_ITEM_DONTCARE == eState )
{
// Will the attribute become valid?
@@ -573,7 +573,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
else if( pCmp->nStt > aTmp.nStt ) // extend?
pCmp->nStt = aTmp.nStt;
- bContinue = sal_True;
+ bContinue = true;
}
}
// Will the attribute become valid?
@@ -581,7 +581,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
{
pFndArr[ nWhch - nArrStart ] = aTmp;
++nFound;
- bContinue = sal_True;
+ bContinue = true;
}
// then is has to go on the stack
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 7bdbe36..ade7b39 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -138,7 +138,7 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart, xub_StrLen& rEnd,
// simply removed if first. If at the end, we keep the
// replacement and remove afterwards all at a string's
// end (might be normal 0x7f).
- sal_Bool bEmpty = RES_TXTATR_FIELD != pHt->Which() ||
+ bool bEmpty = RES_TXTATR_FIELD != pHt->Which() ||
!(static_cast<SwTxtFld const*>(pHt)
->GetFld().GetFld()->ExpandField(true).Len());
if ( bEmpty && nStart == nAkt )
@@ -636,7 +636,7 @@ sal_uLong SwCursor::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNot
pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_REPLACE, NULL );
}
- sal_Bool bSearchSel = 0 != (rSearchOpt.searchFlag & SearchFlags::REG_NOT_BEGINOFLINE);
+ bool bSearchSel = 0 != (rSearchOpt.searchFlag & SearchFlags::REG_NOT_BEGINOFLINE);
if( bSearchSel )
eFndRngs = (FindRanges)(eFndRngs | FND_IN_SEL);
SwFindParaText aSwFindParaText( rSearchOpt, bSearchInNotes, bReplace, *this );
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index e1eef09..81ac674 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -92,10 +92,10 @@ SwPosition &SwPosition::operator=(const SwPosition &rPos)
}
-sal_Bool SwPosition::operator<(const SwPosition &rPos) const
+bool SwPosition::operator<(const SwPosition &rPos) const
{
if( nNode < rPos.nNode )
- return sal_True;
+ return true;
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -108,17 +108,17 @@ sal_Bool SwPosition::operator<(const SwPosition &rPos) const
}
else // by convention position with no index is smaller
{
- return (pOtherReg) ? sal_True : sal_False;
+ return (pOtherReg) ? true : false;
}
}
- return sal_False;
+ return false;
}
-sal_Bool SwPosition::operator>(const SwPosition &rPos) const
+bool SwPosition::operator>(const SwPosition &rPos) const
{
if(nNode > rPos.nNode )
- return sal_True;
+ return true;
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -131,17 +131,17 @@ sal_Bool SwPosition::operator>(const SwPosition &rPos) const
}
else // by convention position with no index is smaller
{
- return (pThisReg) ? sal_True : sal_False;
+ return (pThisReg) ? true : false;
}
}
- return sal_False;
+ return false;
}
-sal_Bool SwPosition::operator<=(const SwPosition &rPos) const
+bool SwPosition::operator<=(const SwPosition &rPos) const
{
if(nNode < rPos.nNode )
- return sal_True;
+ return true;
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -154,17 +154,17 @@ sal_Bool SwPosition::operator<=(const SwPosition &rPos) const
}
else // by convention position with no index is smaller
{
- return (pThisReg) ? sal_False : sal_True;
+ return (pThisReg) ? false : true;
}
}
- return sal_False;
+ return false;
}
-sal_Bool SwPosition::operator>=(const SwPosition &rPos) const
+bool SwPosition::operator>=(const SwPosition &rPos) const
{
if(nNode > rPos.nNode )
- return sal_True;
+ return true;
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -177,14 +177,14 @@ sal_Bool SwPosition::operator>=(const SwPosition &rPos) const
}
else // by convention position with no index is smaller
{
- return (pOtherReg) ? sal_False : sal_True;
+ return (pOtherReg) ? false : true;
}
}
- return sal_False;
+ return false;
}
-sal_Bool SwPosition::operator==(const SwPosition &rPos) const
+bool SwPosition::operator==(const SwPosition &rPos) const
{
return (nNode == rPos.nNode)
// GetIndexReg may be null for FLY_AT_PARA frame anchor position
@@ -193,7 +193,7 @@ sal_Bool SwPosition::operator==(const SwPosition &rPos) const
}
-sal_Bool SwPosition::operator!=(const SwPosition &rPos) const
+bool SwPosition::operator!=(const SwPosition &rPos) const
{
return (nNode != rPos.nNode)
// GetIndexReg may be null for FLY_AT_PARA frame anchor position
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index d698865..fa15093 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -68,7 +68,7 @@ struct _PercentHdl
{
SwDocShell* pDSh;
sal_uLong nActPos;
- sal_Bool bBack, bNodeIdx;
+ bool bBack, bNodeIdx;
_PercentHdl( sal_uLong nStt, sal_uLong nEnd, SwDocShell* pSh )
: pDSh( pSh )
@@ -87,13 +87,13 @@ struct _PercentHdl
sal_uLong nStt, nEnd;
if( rPam.GetPoint()->nNode == rPam.GetMark()->nNode )
{
- bNodeIdx = sal_False;
+ bNodeIdx = false;
nStt = rPam.GetMark()->nContent.GetIndex();
nEnd = rPam.GetPoint()->nContent.GetIndex();
}
else
{
- bNodeIdx = sal_True;
+ bNodeIdx = true;
nStt = rPam.GetMark()->nNode.GetIndex();
nEnd = rPam.GetPoint()->nNode.GetIndex();
}
@@ -1063,7 +1063,7 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
{
- sal_Bool bIsStart = sal_True;
+ bool bIsStart = true;
SwCntntNode* pCNd = 0;
SwNodes& rNds = GetDoc()->GetNodes();
@@ -1077,7 +1077,7 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
case DOCPOS_END:
rPos.nNode = rNds.GetEndOfContent();
pCNd = rNds.GoPrevious( &rPos.nNode );
- bIsStart = sal_False;
+ bIsStart = false;
break;
case DOCPOS_OTHERSTART:
@@ -1088,7 +1088,7 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
case DOCPOS_OTHEREND:
rPos.nNode = *rNds.GetEndOfContent().StartOfSectionNode();
pCNd = rNds.GoPrevious( &rPos.nNode );
- bIsStart = sal_False;
+ bIsStart = false;
break;
default:
rPos = *GetPoint();
@@ -1753,7 +1753,7 @@ sal_Bool SwCursor::UpDown( sal_Bool bUp, sal_uInt16 nCnt,
Point* pPt, long nUpDownX )
{
SwTableCursor* pTblCrsr = dynamic_cast<SwTableCursor*>(this);
- sal_Bool bAdjustTableCrsr = sal_False;
+ bool bAdjustTableCrsr = false;
// If the point/mark of the table cursor in the same box then set cursor to
// beginning of the box
@@ -1762,7 +1762,7 @@ sal_Bool SwCursor::UpDown( sal_Bool bUp, sal_uInt16 nCnt,
{
if ( End() != GetPoint() )
Exchange();
- bAdjustTableCrsr = sal_True;
+ bAdjustTableCrsr = true;
}
sal_Bool bRet = sal_False;
@@ -2156,11 +2156,11 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
SwPaM* pCur = pAktCrsr;
do {
size_t nPos;
- sal_Bool bDel = sal_False;
+ bool bDel = false;
pSttNd = pCur->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
if( !pCur->HasMark() || !pSttNd ||
pSttNd != pCur->GetMark()->nNode.GetNode().FindTableBoxStartNode() )
- bDel = sal_True;
+ bDel = true;
else if( lcl_SeekEntry( aTmp, pSttNd, nPos ))
{
@@ -2186,7 +2186,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
aTmp.erase( aTmp.begin() + nPos );
}
else
- bDel = sal_True;
+ bDel = true;
pCur = (SwPaM*)pCur->GetNext();
if( bDel )
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index c81fd6a..5355769 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -86,13 +86,13 @@ sal_Bool SwCrsrShell::GotoFtnTxt()
const SwFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(),
_GetCrsr()->Start() );
const SwFtnBossFrm* pFtnBoss;
- sal_Bool bSkip = pFrm && pFrm->IsInFtn();
+ bool bSkip = pFrm && pFrm->IsInFtn();
while( pFrm && 0 != ( pFtnBoss = pFrm->FindFtnBossFrm() ) )
{
if( 0 != ( pFrm = pFtnBoss->FindFtnCont() ) )
{
if( bSkip )
- bSkip = sal_False;
+ bSkip = false;
else
{
const SwCntntFrm* pCnt = static_cast<const SwLayoutFrm*>
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 84ab0f0..bfef7e0 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -148,7 +148,7 @@ sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
return sal_False;
SwPosition* pPos = rCurCrsr.GetPoint();
- sal_Bool bMoveBackward = fnPosRegion == fnMoveBackward;
+ bool bMoveBackward = fnPosRegion == fnMoveBackward;
SwCntntNode* pCNd;
if( bMoveBackward )
@@ -182,7 +182,7 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
SwPosition* pPos = rCurCrsr.GetPoint();
xub_StrLen nCurrCnt = pPos->nContent.GetIndex();
- sal_Bool bMoveBackward = fnPosRegion == fnMoveBackward;
+ bool bMoveBackward = fnPosRegion == fnMoveBackward;
do {
SwCntntNode* pCNd;
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 1544c06..84804f6 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -666,7 +666,8 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
SwShellCrsr* pCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
- sal_Bool bCheckPos, bRet;
+ bool bCheckPos;
+ sal_Bool bRet;
sal_uLong nPtNd = 0;
xub_StrLen nPtCnt = 0;
@@ -678,11 +679,11 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
pCurCrsr->SwSelPaintRects::Hide();
pTblCrsr->SetMark();
pCrsr = pTblCrsr;
- bCheckPos = sal_False;
+ bCheckPos = false;
}
else
{
- bCheckPos = sal_True;
+ bCheckPos = true;
nPtNd = pCrsr->GetPoint()->nNode.GetIndex();
nPtCnt = pCrsr->GetPoint()->nContent.GetIndex();
}
@@ -873,13 +874,13 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
SwStartNode* pSttNd = pPos->nNode.GetNode().FindSttNodeByType( SwTableBoxStartNode );
- sal_Bool bCheckBox = sal_False;
+ bool bCheckBox = false;
if( pSttNd && pBoxIdx )
{
if( pSttNd == &pBoxIdx->GetNode() )
pSttNd = 0;
else
- bCheckBox = sal_True;
+ bCheckBox = true;
}
else
bCheckBox = 0 != pBoxIdx;
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index a1342a9..43f3d71 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -117,8 +117,8 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags )
*pNewSttNd = rPtIdx.GetNode().StartOfSectionNode();
if( pOldSttNd != pNewSttNd )
{
- sal_Bool bMoveDown = GetSavePos()->nNode < rPtIdx.GetIndex();
- sal_Bool bValidPos = sal_False;
+ bool bMoveDown = GetSavePos()->nNode < rPtIdx.GetIndex();
+ bool bValidPos = false;
// search the correct surrounded start node - which the index
// can't leave.
@@ -172,7 +172,7 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags )
}
}
else
- bValidPos = sal_True;
+ bValidPos = true;
} while ( pInvalidNode );
}
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 422be7a..83dd971 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -67,7 +67,7 @@ typedef sal_Bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
typedef SwCntntNode* (*GoNds)( SwNodeIndex*, sal_Bool );
typedef void (*GoDoc)( SwPosition* );
typedef void (*GoSection)( SwPosition* );
-typedef sal_Bool (SwPosition:: *CmpOp)( const SwPosition& ) const;
+typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const;
typedef const SwTxtAttr* (*GetHint)( const SwpHints&, sal_uInt16&, xub_StrLen );
typedef int (utl::TextSearch:: *SearchTxt)( const String&, xub_StrLen*,
xub_StrLen*, ::com::sun::star::util::SearchResult* );
More information about the Libreoffice-commits
mailing list