summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-04 11:19:31 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-04 11:35:55 +0100
commit2db45ef2b58058fd850e69432a6b4634fa3e278f (patch)
tree867ea59dbd6e6fa4f1f71066f3ac3761463599bd /sw
parentae394876e7e49505efd1be514ec3893ed53d0e08 (diff)
bool improvements
Change-Id: I294d197028d5ddf0642fadef05600accd91d0725
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/frmcrsr.cxx4
-rw-r--r--sw/source/core/text/frmform.cxx20
-rw-r--r--sw/source/core/text/redlnitr.cxx2
-rw-r--r--sw/source/core/text/txtdrop.cxx4
4 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index e832de4a7882..df406905e120 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -722,7 +722,7 @@ sal_Bool SwTxtFrm::LeftMargin(SwPaM *pPam) const
}
}
pPam->GetPoint()->nContent = SwIndex( pFrm->GetTxtNode(), nIndx );
- SwTxtCursor::SetRightMargin( sal_False );
+ SwTxtCursor::SetRightMargin( false );
return sal_True;
}
@@ -1342,7 +1342,7 @@ sal_Bool SwTxtFrm::UnitDown(SwPaM *pPam, const SwTwips nOffset,
const SwTxtFrm *pFrm = GetAdjFrmAtPos((SwTxtFrm*)this, *(pPam->GetPoint()),
SwTxtCursor::IsRightMargin() );
const sal_Bool bRet = pFrm->_UnitDown( pPam, nOffset, bSetInReadOnly );
- SwTxtCursor::SetRightMargin( sal_False );
+ SwTxtCursor::SetRightMargin( false );
return bRet;
}
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 51a2796266a6..d6e8c8cb3ac7 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -608,7 +608,7 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
GetFollow()->ManipOfst( 0 );
if ( CalcFollow( nNewOfst ) ) // CalcFollow only at the end, we do a SetOfst there
- rLine.SetOnceMore( sal_True );
+ rLine.SetOnceMore( true );
}
}
@@ -1202,7 +1202,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
if( !rLine.IsUnclipped() || nOldBottom > rRepaint.Bottom() )
{
rRepaint.Bottom( nOldBottom - 1 );
- rLine.SetUnclipped( sal_True );
+ rLine.SetUnclipped( true );
}
}
if( rLine.GetCurr()->IsClipping() && rLine.IsFlyInCntBase() )
@@ -1214,7 +1214,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
if( !rLine.IsUnclipped() || nTmpBottom > rRepaint.Bottom() )
{
rRepaint.Bottom( nTmpBottom - 1 );
- rLine.SetUnclipped( sal_True );
+ rLine.SetUnclipped( true );
}
}
else
@@ -1222,7 +1222,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
if( !rLine.IsUnclipped() || nBottom > rRepaint.Bottom() )
{
rRepaint.Bottom( nBottom - 1 );
- rLine.SetUnclipped( sal_False );
+ rLine.SetUnclipped( false );
}
}
SwTwips nRght = std::max( nOldWidth, pNew->Width() +
@@ -1283,7 +1283,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
OSL_ENSURE( ! IsVertical() || IsSwapped(),"SwTxtFrm::_Format with unswapped frame" );
SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
- rLine.SetUnclipped( sal_False );
+ rLine.SetUnclipped( false );
// That was too complicated for the C30: aString( GetTxt() );
const OUString &rString = GetTxtNode()->GetTxt();
@@ -1574,7 +1574,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
rLine.GetCurr()->GetNext() )
{
rLine.TruncLines();
- rLine.SetTruncLines( sal_True );
+ rLine.SetTruncLines( true );
}
}
@@ -1587,7 +1587,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
}
if( rRepaint.HasArea() )
SetRepaint();
- rLine.SetTruncLines( sal_False );
+ rLine.SetTruncLines( false );
if( nOldBottom ) // We check whether paragraphs that need scrolling can
// be shrunk, so that they don't need scrolling anymore
{
@@ -1620,7 +1620,7 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
rInf.Init();
rLine.Top();
if( !rLine.GetDropFmt() )
- rLine.SetOnceMore( sal_False );
+ rLine.SetOnceMore( false );
SwCharRange aRange( 0, rInf.GetTxt().getLength() );
*(pPara->GetReformat()) = aRange;
_Format( rLine, rInf );
@@ -1709,13 +1709,13 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
SVX_ADJUST_BLOCK != aLine.GetAdjust() )
{
aLine.CalcDropAdjust();
- aLine.SetPaintDrop( sal_True );
+ aLine.SetPaintDrop( true );
}
if( aLine.IsPaintDrop() )
{
aLine.CalcDropRepaint();
- aLine.SetPaintDrop( sal_False );
+ aLine.SetPaintDrop( false );
}
}
}
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index eb7c45ff6af3..13b3bf9f97f4 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -65,7 +65,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
// set font to vertical if frame layout is vertical
bool bVertLayout = false;
- bool bRTL = sal_False;
+ bool bRTL = false;
if ( pFrm )
{
if ( pFrm->IsVertical() )
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 19207b2e14a9..1b3311068bd8 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -604,7 +604,7 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
// font is used.
if ( GetDropLines() < 2 )
{
- ((SwTxtFormatter*)this)->SetPaintDrop( sal_True );
+ ((SwTxtFormatter*)this)->SetPaintDrop( true );
return pDropPor;
}
@@ -650,7 +650,7 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
pCurrPart = pPart;
}
- ((SwTxtFormatter*)this)->SetPaintDrop( sal_True );
+ ((SwTxtFormatter*)this)->SetPaintDrop( true );
return pDropPor;
}