[Libreoffice-commits] core.git: 5 commits - sw/source
Matteo Casalin
matteo.casalin at yahoo.com
Sat Feb 8 07:56:46 PST 2014
sw/source/core/text/itratr.cxx | 40 ++++++++++----------
sw/source/core/text/itratr.hxx | 12 +++---
sw/source/core/text/pordrop.hxx | 4 +-
sw/source/core/text/porexp.cxx | 32 ++++++++--------
sw/source/core/text/porexp.hxx | 20 +++++-----
sw/source/core/text/porfld.cxx | 78 ++++++++++++++++++++--------------------
sw/source/core/text/porfld.hxx | 68 +++++++++++++++++-----------------
sw/source/core/text/porfly.cxx | 24 ++++++------
sw/source/core/text/porfly.hxx | 14 +++----
sw/source/core/text/porftn.hxx | 12 +++---
sw/source/core/text/porglue.cxx | 6 +--
sw/source/core/text/porglue.hxx | 2 -
sw/source/core/text/porhyph.hxx | 16 ++++----
sw/source/core/text/porlay.cxx | 8 ++--
sw/source/core/text/porlay.hxx | 2 -
sw/source/core/text/porlin.cxx | 12 +++---
sw/source/core/text/porlin.hxx | 4 +-
sw/source/core/text/porref.cxx | 5 +-
sw/source/core/text/porref.hxx | 2 -
sw/source/core/text/porrst.cxx | 12 +++---
sw/source/core/text/porrst.hxx | 6 +--
sw/source/core/text/portab.hxx | 2 -
sw/source/core/text/portox.cxx | 5 +-
sw/source/core/text/portox.hxx | 2 -
sw/source/core/text/portxt.cxx | 28 ++++++--------
sw/source/core/text/portxt.hxx | 14 +++----
sw/source/core/text/txtdrop.cxx | 31 +++++++--------
sw/source/core/text/txtftn.cxx | 22 +++++------
sw/source/core/text/txthyph.cxx | 36 +++++++++---------
sw/source/core/text/txttab.cxx | 2 -
30 files changed, 258 insertions(+), 263 deletions(-)
New commits:
commit e4f982f583816c9702d926ebe2ca1e97eb3bd4e1
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 8 01:28:46 2014 +0100
sal_Bool to bool
Change-Id: I7472b6fad91fc349dc4cea2b490cb6cb7796fd34
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 7f350a1..bba0074 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -65,7 +65,7 @@ bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
// resetting
rInf.SetFly( 0 );
rInf.Width( rInf.RealWidth() );
- rInf.GetParaPortion()->SetFly( sal_True );
+ rInf.GetParaPortion()->SetFly( true );
// trailing blank:
if( rInf.GetIdx() < rInf.GetTxt().getLength() && 1 < rInf.GetIdx()
@@ -130,7 +130,7 @@ bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
}
}
- rInf.GetParaPortion()->SetFly( sal_True );
+ rInf.GetParaPortion()->SetFly( true );
return bFull;
}
@@ -262,8 +262,8 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
long nFlyAsc, long nFlyDesc,
objectpositioning::AsCharFlags nFlags ) :
pContact( pFly ),
- bDraw( sal_False ),
- bMax( sal_False ),
+ bDraw( false ),
+ bMax( false ),
nAlign( 0 )
{
OSL_ENSURE( pFly, "SwFlyCntPortion::SwFlyCntPortion: no SwFlyInCntFrm!" );
@@ -280,8 +280,8 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
long nFlyAsc, long nFlyDesc,
objectpositioning::AsCharFlags nFlags ) :
pContact( pDrawContact ),
- bDraw( sal_True ),
- bMax( sal_False ),
+ bDraw( true ),
+ bMax( false ),
nAlign( 0 )
{
OSL_ENSURE( pDrawContact, "SwFlyCntPortion::SwFlyCntPortion: no SwDrawContact!" );
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 207cf0b..61967b0 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -54,8 +54,8 @@ class SwFlyCntPortion : public SwLinePortion
{
void *pContact; // bDraw ? DrawContact : FlyInCntFrm
Point aRef; // Relatively to this point we calculate the AbsPos
- sal_Bool bDraw : 1; // DrawContact?
- sal_Bool bMax : 1; // Line adjustment and height == line height
+ bool bDraw : 1; // DrawContact?
+ bool bMax : 1; // Line adjustment and height == line height
sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom
virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
@@ -77,11 +77,11 @@ public:
inline SwDrawContact *GetDrawContact() { return (SwDrawContact*)pContact; }
inline const SwDrawContact* GetDrawContact() const
{ return (SwDrawContact*)pContact; }
- inline sal_Bool IsDraw() const { return bDraw; }
- inline sal_Bool IsMax() const { return bMax; }
+ inline bool IsDraw() const { return bDraw; }
+ inline bool IsMax() const { return bMax; }
inline sal_uInt8 GetAlign() const { return nAlign; }
inline void SetAlign( sal_uInt8 nNew ) { nAlign = nNew; }
- inline void SetMax( sal_Bool bNew ) { bMax = bNew; }
+ inline void SetMax( bool bNew ) { bMax = bNew; }
// OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
void SetBase( const SwTxtFrm& rFrm, const Point &rBase,
long nLnAscent, long nLnDescent,
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 5daec4a..55e541f 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -69,7 +69,7 @@ public:
class SwSoftHyphPortion : public SwHyphPortion
{
- sal_Bool bExpand;
+ bool bExpand;
KSHORT nViewWidth;
KSHORT nHyphWidth;
@@ -80,8 +80,8 @@ public:
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
- inline void SetExpand( const sal_Bool bNew ) { bExpand = bNew; }
- sal_Bool IsExpand() const { return bExpand; }
+ inline void SetExpand( const bool bNew ) { bExpand = bNew; }
+ bool IsExpand() const { return bExpand; }
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 4f8f345..539da8e 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -450,7 +450,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
if( pPos->IsFlyCntPortion() &&
((SwFlyCntPortion*)pPos)->GetAlign() )
{
- ((SwFlyCntPortion*)pPos)->SetMax( sal_False );
+ ((SwFlyCntPortion*)pPos)->SetMax( false );
if( !pFlyCnt || pPos->Height() > pFlyCnt->Height() )
pFlyCnt = (SwFlyCntPortion*)pPos;
}
@@ -490,7 +490,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
{
if( pFlyCnt->Height() == Height() )
{
- pFlyCnt->SetMax( sal_True );
+ pFlyCnt->SetMax( true );
if( Height() > nMaxDescent + nAscent )
{
if( 3 == pFlyCnt->GetAlign() ) // Bottom
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 4ac0846..2b8bb08 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -431,7 +431,7 @@ void SwHyphStrPortion::HandlePortion( SwPortionHandler& rPH ) const
SwLinePortion *SwSoftHyphPortion::Compress() { return this; }
SwSoftHyphPortion::SwSoftHyphPortion() :
- bExpand(sal_False), nViewWidth(0), nHyphWidth(0)
+ bExpand(false), nViewWidth(0), nHyphWidth(0)
{
SetLen(1);
SetWhichPor( POR_SOFTHYPH );
@@ -533,9 +533,9 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
}
rInf.SetSoftHyphPos(0);
- SetExpand( sal_True );
+ SetExpand( true );
bFull = SwHyphPortion::Format( rInf );
- SetExpand( sal_False );
+ SetExpand( false );
if( !bFull )
{
// default-maessig besitzen wir keine Breite, aber eine Hoehe
@@ -554,7 +554,7 @@ void SwSoftHyphPortion::FormatEOL( SwTxtFormatInfo &rInf )
{
if( !IsExpand() )
{
- SetExpand( sal_True );
+ SetExpand( true );
if( rInf.GetLast() == this )
rInf.SetLast( FindPrevPortion( rInf.GetRoot() ) );
commit 7e798c2a0019e103f784aae10018d98667fae481
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 8 01:22:32 2014 +0100
sal_Bool to bool
Change-Id: Iae2f4cd32edd8f995ed644d35edd333fd212dc5a
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 93261c0..074ad88 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -70,15 +70,15 @@ void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld )
OSL_ENSURE( pFld, "TakeNextOffset: Missing Source" );
nNextOffset = pFld->GetNextOffset();
aExpand = aExpand.replaceAt( 0, nNextOffset, "" );
- bFollow = sal_True;
+ bFollow = true;
}
SwFldPortion::SwFldPortion( const OUString &rExpand, SwFont *pFont, bool bPlaceHold )
: aExpand(rExpand), pFnt(pFont), nNextOffset(0), nNextScriptChg(COMPLETE_STRING), nViewWidth(0)
- , bFollow( sal_False ), bLeft( sal_False), bHide( sal_False)
- , bCenter (sal_False), bHasFollow( sal_False )
- , bAnimated( sal_False), bNoPaint( sal_False)
- , bReplace( sal_False), bPlaceHolder( bPlaceHold )
+ , bFollow( false ), bLeft( false), bHide( false)
+ , bCenter (false), bHasFollow( false )
+ , bAnimated( false), bNoPaint( false)
+ , bReplace( false), bPlaceHolder( bPlaceHold )
, m_bNoLength( false )
, m_nAttrFldType(0)
{
@@ -143,8 +143,8 @@ class SwFldSlot
OUString aTxt;
sal_Int32 nIdx;
sal_Int32 nLen;
- sal_Bool bOn;
SwTxtFormatInfo *pInf;
+ bool bOn;
public:
SwFldSlot( const SwTxtFormatInfo* pNew, const SwFldPortion *pPor );
~SwFldSlot();
@@ -328,7 +328,7 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
// So komisch es aussieht, die Abfrage auf GetLen() muss wegen der
// ExpandPortions _hinter_ aDiffTxt (vgl. SoftHyphs)
- // sal_False returnen wegen SetFull ...
+ // false returnen wegen SetFull ...
if( !nFullLen )
{
// nicht Init(), weil wir Hoehe und Ascent brauchen
@@ -405,8 +405,8 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
SwFont *pNewFnt = new SwFont( *rInf.GetFont() );
pFld->SetFont( pNewFnt );
}
- pFld->SetFollow( sal_True );
- SetHasFollow( sal_True );
+ pFld->SetFollow( true );
+ SetHasFollow( true );
// In nNextOffset steht bei einem neuangelegten Feld zunaechst
// der Offset, an dem es selbst im Originalstring beginnt.
// Wenn beim Formatieren ein FollowFeld angelegt wird, wird
@@ -497,8 +497,8 @@ bool SwHiddenPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) con
SwNumberPortion::SwNumberPortion( const OUString &rExpand,
SwFont *pFont,
- const sal_Bool bLft,
- const sal_Bool bCntr,
+ const bool bLft,
+ const bool bCntr,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive )
: SwFldPortion( rExpand, pFont ),
@@ -508,7 +508,7 @@ SwNumberPortion::SwNumberPortion( const OUString &rExpand,
{
SetWhichPor( POR_NUMBER );
SetLeft( bLft );
- SetHide( sal_False );
+ SetHide( false );
SetCenter( bCntr );
}
@@ -534,7 +534,7 @@ SwFldPortion *SwNumberPortion::Clone( const OUString &rExpand ) const
bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
{
- SetHide( sal_False );
+ SetHide( false );
const bool bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
// a numbering portion can be contained in a rotated portion!!!
@@ -586,7 +586,7 @@ bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
{
nDiff = rInf.Width();
if ( bFly )
- SetHide( sal_True );
+ SetHide( true );
}
// A numbering portion can be inside a SwRotatedPortion. Then the
@@ -613,7 +613,7 @@ void SwNumberPortion::FormatEOL( SwTxtFormatInfo& )
// If one of these is numbered but does not fit to the line,
// it calls this function, causing a loop because both the number
// portion and the fly portion go to the next line
-// SetHide( sal_True );
+// SetHide( true );
}
void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
@@ -740,8 +740,8 @@ static sal_Char const sDoubleSpace[] = " ";
SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
const OUString& rBulletFollowedBy,
SwFont *pFont,
- const sal_Bool bLft,
- const sal_Bool bCntr,
+ const bool bLft,
+ const bool bCntr,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive )
: SwNumberPortion( OUString(cBullet) + rBulletFollowedBy,
@@ -761,15 +761,15 @@ SwGrfNumPortion::SwGrfNumPortion(
const OUString& rGraphicFollowedBy,
const SvxBrushItem* pGrfBrush,
const SwFmtVertOrient* pGrfOrient, const Size& rGrfSize,
- const sal_Bool bLft, const sal_Bool bCntr, const KSHORT nMinDst,
+ const bool bLft, const bool bCntr, const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive ) :
SwNumberPortion( rGraphicFollowedBy, NULL, bLft, bCntr, nMinDst,
bLabelAlignmentPosAndSpaceModeActive ),
pBrush( new SvxBrushItem(RES_BACKGROUND) ), nId( 0 )
{
SetWhichPor( POR_GRFNUM );
- SetAnimated( sal_False );
- bReplace = sal_False;
+ SetAnimated( false );
+ bReplace = false;
if( pGrfBrush )
{
*pBrush = *pGrfBrush;
@@ -777,7 +777,7 @@ SwGrfNumPortion::SwGrfNumPortion(
if( pGraph )
SetAnimated( pGraph->IsAnimated() );
else
- bReplace = sal_True;
+ bReplace = true;
}
if( pGrfOrient )
{
@@ -793,7 +793,7 @@ SwGrfNumPortion::SwGrfNumPortion(
nFixWidth = Width();
nGrfHeight = rGrfSize.Height() + 2 * GRFNUM_SECURE;
Height( KSHORT(nGrfHeight) );
- bNoPaint = sal_False;
+ bNoPaint = false;
}
SwGrfNumPortion::~SwGrfNumPortion()
@@ -811,7 +811,7 @@ void SwGrfNumPortion::StopAnimation( OutputDevice* pOut )
bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
{
- SetHide( sal_False );
+ SetHide( false );
// Width( nFixWidth );
KSHORT nFollowedByWidth( 0 );
if ( mbLabelAlignmentPosAndSpaceModeActive )
@@ -834,7 +834,7 @@ bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
if( bFly )
{
SetLen( 0 );
- SetNoPaint( sal_True );
+ SetNoPaint( true );
rInf.SetNumDone( false );
return true;
}
@@ -861,7 +861,7 @@ bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
{
nDiff = rInf.Width();
if( bFly )
- SetHide( sal_True );
+ SetHide( true );
}
if( Width() < nDiff )
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index b698015..f6c13a5 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -41,14 +41,14 @@ protected:
sal_Int32 nNextOffset; // Offset of the follow in the original string
sal_Int32 nNextScriptChg;
KSHORT nViewWidth; // Screen width for empty fields
- sal_Bool bFollow : 1; // 2nd or later part of a field
- sal_Bool bLeft : 1; // Used by SwNumberPortion
- sal_Bool bHide : 1; // Used by SwNumberPortion
- sal_Bool bCenter : 1; // Used by SwNumberPortion
- sal_Bool bHasFollow : 1; // Continues on the next line
- sal_Bool bAnimated : 1; // Used by SwGrfNumPortion
- sal_Bool bNoPaint : 1; // Used by SwGrfNumPortion
- sal_Bool bReplace : 1; // Used by SwGrfNumPortion
+ bool bFollow : 1; // 2nd or later part of a field
+ bool bLeft : 1; // Used by SwNumberPortion
+ bool bHide : 1; // Used by SwNumberPortion
+ bool bCenter : 1; // Used by SwNumberPortion
+ bool bHasFollow : 1; // Continues on the next line
+ bool bAnimated : 1; // Used by SwGrfNumPortion
+ bool bNoPaint : 1; // Used by SwGrfNumPortion
+ bool bReplace : 1; // Used by SwGrfNumPortion
const bool bPlaceHolder : 1;
bool m_bNoLength : 1; // HACK for meta suffix (no CH_TXTATR)
@@ -78,20 +78,20 @@ public:
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- inline sal_Bool IsFollow() const { return bFollow; }
- inline void SetFollow( sal_Bool bNew ) { bFollow = bNew; }
+ inline bool IsFollow() const { return bFollow; }
+ inline void SetFollow( bool bNew ) { bFollow = bNew; }
- inline sal_Bool IsLeft() const { return bLeft; }
- inline void SetLeft( sal_Bool bNew ) { bLeft = bNew; }
+ inline bool IsLeft() const { return bLeft; }
+ inline void SetLeft( bool bNew ) { bLeft = bNew; }
- inline sal_Bool IsHide() const { return bHide; }
- inline void SetHide( sal_Bool bNew ) { bHide = bNew; }
+ inline bool IsHide() const { return bHide; }
+ inline void SetHide( bool bNew ) { bHide = bNew; }
- inline sal_Bool IsCenter() const { return bCenter; }
- inline void SetCenter( sal_Bool bNew ) { bCenter = bNew; }
+ inline bool IsCenter() const { return bCenter; }
+ inline void SetCenter( bool bNew ) { bCenter = bNew; }
- inline sal_Bool HasFollow() const { return bHasFollow; }
- inline void SetHasFollow( sal_Bool bNew ) { bHasFollow = bNew; }
+ inline bool HasFollow() const { return bHasFollow; }
+ inline void SetHasFollow( bool bNew ) { bHasFollow = bNew; }
inline sal_Int32 GetNextOffset() const { return nNextOffset; }
inline void SetNextOffset( sal_Int32 nNew ) { nNextOffset = nNew; }
@@ -144,8 +144,8 @@ protected:
public:
SwNumberPortion( const OUString &rExpand,
SwFont *pFnt,
- const sal_Bool bLeft,
- const sal_Bool bCenter,
+ const bool bLeft,
+ const bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
@@ -169,8 +169,8 @@ public:
SwBulletPortion( const sal_Unicode cCh,
const OUString& rBulletFollowedBy,
SwFont *pFnt,
- const sal_Bool bLeft,
- const sal_Bool bCenter,
+ const bool bLeft,
+ const bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
OUTPUT_OPERATOR
@@ -193,8 +193,8 @@ public:
const SvxBrushItem* pGrfBrush,
const SwFmtVertOrient* pGrfOrient,
const Size& rGrfSize,
- const sal_Bool bLeft,
- const sal_Bool bCenter,
+ const bool bLeft,
+ const bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
~SwGrfNumPortion();
@@ -206,10 +206,10 @@ public:
void StopAnimation( OutputDevice* pOut );
- inline sal_Bool IsAnimated() const { return bAnimated; }
- inline void SetAnimated( sal_Bool bNew ) { bAnimated = bNew; }
- inline sal_Bool DontPaint() const { return bNoPaint; }
- inline void SetNoPaint( sal_Bool bNew ) { bNoPaint = bNew; }
+ inline bool IsAnimated() const { return bAnimated; }
+ inline void SetAnimated( bool bNew ) { bAnimated = bNew; }
+ inline bool DontPaint() const { return bNoPaint; }
+ inline void SetNoPaint( bool bNew ) { bNoPaint = bNew; }
inline void SetRelPos( SwTwips nNew ) { nYPos = nNew; }
inline void SetId( long nNew ) const
{ ((SwGrfNumPortion*)this)->nId = nNew; }
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 38a0440..6d2bb51 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -60,7 +60,7 @@ class SwFtnNumPortion : public SwNumberPortion
{
public:
SwFtnNumPortion( const OUString &rExpand, SwFont *pFntL )
- : SwNumberPortion( rExpand, pFntL, sal_True, sal_False, 0, false )
+ : SwNumberPortion( rExpand, pFntL, true, false, 0, false )
{ SetWhichPor( POR_FTNNUM ); }
OUTPUT_OPERATOR
commit 1c70ea4bce74996594068e9efc9d0d4f9acca395
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 8 00:04:52 2014 +0100
sal_Bool to bool
Change-Id: Ia3b89bc6c51874e66e5923b5f2a0352967b6ec41
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 4c9f659..d530ed8 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -79,7 +79,7 @@ class SwDropPortion : public SwTxtPortion
short nX; // X PaintOffset
short nY; // Y Offset
- sal_Bool FormatTxt( SwTxtFormatInfo &rInf );
+ bool FormatTxt( SwTxtFormatInfo &rInf );
void PaintTxt( const SwTxtPaintInfo &rInf ) const;
inline void Fix( const KSHORT nNew ) { nFix = nNew; }
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index d1353aa..cfcbd8c 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -74,7 +74,7 @@ bool SwExpandPortion::Format( SwTxtFormatInfo &rInf )
// So komisch es aussieht, die Abfrage auf GetLen() muss wegen der
// ExpandPortions _hinter_ aDiffTxt (vgl. SoftHyphs)
- // sal_False returnen wegen SetFull ...
+ // false returnen wegen SetFull ...
if( !nFullLen )
{
// nicht Init(), weil wir Hoehe und Ascent brauchen
@@ -137,7 +137,7 @@ SwLinePortion *SwBlankPortion::Compress() { return this; }
// Komplikationen bei Flys...
MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
- sal_Int32 nIdx, sal_Bool bUnderFlow ) const
+ sal_Int32 nIdx, bool bUnderFlow ) const
{
if( rInf.StopUnderFlow() )
return 0;
@@ -189,7 +189,7 @@ MSHORT SwBlankPortion::MayUnderFlow( const SwTxtFormatInfo &rInf,
void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
{
- MSHORT nMay = MayUnderFlow( rInf, rInf.GetIdx() - nLineLength, sal_True );
+ MSHORT nMay = MayUnderFlow( rInf, rInf.GetIdx() - nLineLength, true );
if( nMay )
{
if( nMay > 1 )
@@ -259,7 +259,7 @@ void SwBlankPortion::HandlePortion( SwPortionHandler& rPH ) const
* class SwPostItsPortion
*************************************************************************/
-SwPostItsPortion::SwPostItsPortion( sal_Bool bScrpt )
+SwPostItsPortion::SwPostItsPortion( bool bScrpt )
: bScript( bScrpt )
{
nLineLength = 1;
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index e31517a..8b420bb 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -65,7 +65,7 @@ public:
virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
MSHORT MayUnderFlow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
- sal_Bool bUnderFlow ) const;
+ bool bUnderFlow ) const;
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const;
@@ -79,14 +79,14 @@ public:
class SwPostItsPortion : public SwExpandPortion
{
- sal_Bool bScript;
+ bool bScript;
public:
- SwPostItsPortion( sal_Bool bScrpt );
+ SwPostItsPortion( bool bScrpt );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual bool Format( SwTxtFormatInfo &rInf );
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- sal_Bool IsScript() const { return bScript; }
+ bool IsScript() const { return bScript; }
OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index ec6e922..e60d9c8 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
* the position is calculated from the values in rInf
*************************************************************************/
-static sal_Bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf,
+static bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf,
sal_uInt16 nWidth, sal_uInt16 nHeight )
{
const SwTxtFly *pTxtFly = rInf.GetTxtFly();
@@ -63,7 +63,7 @@ static sal_Bool lcl_IsDropFlyInter( const SwTxtFormatInfo &rInf,
return aRect.HasArea();
}
- return sal_False;
+ return false;
}
/*************************************************************************
@@ -168,7 +168,7 @@ MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
Boundary aBound =
g_pBreakIt->GetBreakIter()->getWordBoundary( GetTxt(), 0,
- g_pBreakIt->GetLocale( eLanguage ), WordType::DICTIONARY_WORD, sal_True );
+ g_pBreakIt->GetLocale( eLanguage ), WordType::DICTIONARY_WORD, true );
nEnd = aBound.endPos;
}
@@ -401,20 +401,19 @@ void SwDropPortion::Paint( const SwTxtPaintInfo &rInf ) const
*************************************************************************/
-sal_Bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
+bool SwDropPortion::FormatTxt( SwTxtFormatInfo &rInf )
{
const sal_Int32 nOldLen = GetLen();
const sal_Int32 nOldInfLen = rInf.GetLen();
- const sal_Bool bFull = SwTxtPortion::Format( rInf );
- if( bFull )
- {
- // sieht zwar Scheisse aus, aber was soll man schon machen?
- rInf.SetUnderFlow( 0 );
- Truncate();
- SetLen( nOldLen );
- rInf.SetLen( nOldInfLen );
- }
- return bFull;
+ if (!SwTxtPortion::Format( rInf ))
+ return false;
+
+ // sieht zwar Scheisse aus, aber was soll man schon machen?
+ rInf.SetUnderFlow( 0 );
+ Truncate();
+ SetLen( nOldLen );
+ rInf.SetLen( nOldInfLen );
+ return true;
}
/*************************************************************************
commit cb0d8ba5faf75268654031fa29a809fc01978eaa
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Feb 7 23:49:13 2014 +0100
sal_Bool to bool
Change-Id: Ia381958971bce86e3ab3eefe3445b491552e908b
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index ea5c972..4c9f659 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -92,7 +92,7 @@ public:
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
void PaintDrop( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 3689755..d1353aa 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -33,12 +33,12 @@ sal_Int32 SwExpandPortion::GetCrsrOfst( const MSHORT nOfst ) const
* virtual SwExpandPortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwExpandPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
+bool SwExpandPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
{
rTxt = OUString();
// Nicht etwa: return 0 != rTxt.Len();
// Weil: leere Felder ersetzen CH_TXTATR gegen einen Leerstring
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -67,7 +67,7 @@ SwPosSize SwExpandPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
// 5010: Exp und Tabs
-sal_Bool SwExpandPortion::Format( SwTxtFormatInfo &rInf )
+bool SwExpandPortion::Format( SwTxtFormatInfo &rInf )
{
SwTxtSlot aDiffTxt( &rInf, this, true, false );
const sal_Int32 nFullLen = rInf.GetLen();
@@ -79,7 +79,7 @@ sal_Bool SwExpandPortion::Format( SwTxtFormatInfo &rInf )
{
// nicht Init(), weil wir Hoehe und Ascent brauchen
Width(0);
- return sal_False;
+ return false;
}
return SwTxtPortion::Format( rInf );
}
@@ -211,9 +211,9 @@ void SwBlankPortion::FormatEOL( SwTxtFormatInfo &rInf )
*************************************************************************/
// 7771: UnderFlows weiterreichen und selbst ausloesen!
-sal_Bool SwBlankPortion::Format( SwTxtFormatInfo &rInf )
+bool SwBlankPortion::Format( SwTxtFormatInfo &rInf )
{
- const sal_Bool bFull = rInf.IsUnderFlow() || SwExpandPortion::Format( rInf );
+ const bool bFull = rInf.IsUnderFlow() || SwExpandPortion::Format( rInf );
if( bFull && MayUnderFlow( rInf, rInf.GetIdx(), rInf.IsUnderFlow() ) )
{
Truncate();
@@ -239,10 +239,10 @@ void SwBlankPortion::Paint( const SwTxtPaintInfo &rInf ) const
* virtual SwBlankPortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
+bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo&, OUString &rTxt ) const
{
rTxt = OUString(cChar);
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -283,9 +283,9 @@ KSHORT SwPostItsPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
* virtual SwPostItsPortion::Format()
*************************************************************************/
-sal_Bool SwPostItsPortion::Format( SwTxtFormatInfo &rInf )
+bool SwPostItsPortion::Format( SwTxtFormatInfo &rInf )
{
- sal_Bool bRet = SwLinePortion::Format( rInf );
+ const bool bRet = SwLinePortion::Format( rInf );
// 32749: PostIts sollen keine Auswirkung auf Zeilenhoehe etc. haben
SetAscent( 1 );
Height( 1 );
@@ -296,13 +296,13 @@ sal_Bool SwPostItsPortion::Format( SwTxtFormatInfo &rInf )
* virtual SwPostItsPortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwPostItsPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwPostItsPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
if( rInf.OnWin() && rInf.GetOpt().IsPostIts() )
rTxt = OUString(' ');
else
rTxt = OUString();
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 59c8fa2..e31517a 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -30,9 +30,9 @@ class SwExpandPortion : public SwTxtPortion
{
public:
inline SwExpandPortion() { SetWhichPor( POR_EXP ); }
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
@@ -60,9 +60,9 @@ public:
void SetMulti( bool bNew ) { bMulti = bNew; }
virtual SwLinePortion *Compress();
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
MSHORT MayUnderFlow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
sal_Bool bUnderFlow ) const;
@@ -83,9 +83,9 @@ class SwPostItsPortion : public SwExpandPortion
public:
SwPostItsPortion( sal_Bool bScrpt );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
sal_Bool IsScript() const { return bScript; }
OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 7495788..93261c0 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -287,11 +287,11 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf )
}
}
-sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
{
// Scope wegen aDiffTxt::DTOR!
sal_Int32 nRest;
- sal_Bool bFull;
+ bool bFull = false;
bool bEOL = false;
long nTxtRest = rInf.GetTxt().getLength() - rInf.GetIdx();
{
@@ -377,7 +377,7 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf )
// field portion. They are handled via the HookChar mechanism.
switch( aNew[0] )
{
- case CH_BREAK : bFull = sal_True;
+ case CH_BREAK : bFull = true;
// no break
case ' ' :
case CH_TAB :
@@ -435,7 +435,7 @@ void SwFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-sal_Bool SwFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
rTxt = aExpand;
if( rTxt.isEmpty() && rInf.OnWin() &&
@@ -443,7 +443,7 @@ sal_Bool SwFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) co
SwViewOption::IsFieldShadings() &&
!HasFollow() )
rTxt = OUString(' ');
- return sal_True;
+ return true;
}
void SwFldPortion::HandlePortion( SwPortionHandler& rPH ) const
@@ -486,7 +486,7 @@ void SwHiddenPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-sal_Bool SwHiddenPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwHiddenPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
// Nicht auf IsHidden() abfragen !
return SwFldPortion::GetExpTxt( rInf, rTxt );
@@ -532,10 +532,10 @@ SwFldPortion *SwNumberPortion::Clone( const OUString &rExpand ) const
// eingibt, bis die Zeile ueberlaeuft.
// Man muss die Fly-Ausweichmanoever beachten!
-sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
+bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
{
SetHide( sal_False );
- const sal_Bool bFull = SwFldPortion::Format( rInf );
+ const bool bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
// a numbering portion can be contained in a rotated portion!!!
nFixWidth = rInf.IsMulti() ? Height() : Width();
@@ -809,7 +809,7 @@ void SwGrfNumPortion::StopAnimation( OutputDevice* pOut )
( (Graphic*) pBrush->GetGraphic() )->StopAnimation( pOut, nId );
}
-sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
+bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
{
SetHide( sal_False );
// Width( nFixWidth );
@@ -821,7 +821,7 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
SetLen( 0 );
}
Width( nFixWidth + nFollowedByWidth );
- const sal_Bool bFull = rInf.Width() < rInf.X() + Width();
+ const bool bFull = rInf.Width() < rInf.X() + Width();
const bool bFly = rInf.GetFly() ||
( rInf.GetLast() && rInf.GetLast()->IsFlyPortion() );
SetAscent( static_cast<sal_uInt16>(GetRelPos() > 0 ? GetRelPos() : 0) );
@@ -836,7 +836,7 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
SetLen( 0 );
SetNoPaint( sal_True );
rInf.SetNumDone( false );
- return sal_True;
+ return true;
}
}
rInf.SetNumDone( true );
@@ -1132,13 +1132,13 @@ void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
+bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
{
sal_Int32 nCount = aExpand.getLength();
if( !nCount )
{
Width( 0 );
- return sal_False;
+ return false;
}
OSL_ENSURE( nCount < 7, "Too much combined characters" );
@@ -1276,7 +1276,7 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
}
// Does the combined portion fit the line?
- const sal_Bool bFull = rInf.Width() < rInf.X() + Width();
+ const bool bFull = rInf.Width() < rInf.X() + Width();
if( bFull )
{
if( rInf.GetLineStart() == rInf.GetIdx() && (!rInf.GetLast()->InFldGrp()
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 0770edf..b698015 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -69,8 +69,8 @@ public:
inline const SwFont *GetFont() const { return pFnt; }
inline OUString GetExp() const { return aExpand; }
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
// Empty fields are also allowed
@@ -123,7 +123,7 @@ public:
: SwFldPortion( rExpand, pFntL )
{ SetLen(1); SetWhichPor( POR_HIDDEN ); }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
// Field cloner for SplitGlue
virtual SwFldPortion *Clone( const OUString &rExpand ) const;
@@ -150,7 +150,7 @@ public:
const bool bLabelAlignmentPosAndSpaceModeActive );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
// Field cloner for SplitGlue
virtual SwFldPortion *Clone( const OUString &rExpand ) const;
@@ -199,7 +199,7 @@ public:
const bool bLabelAlignmentPosAndSpaceModeActive );
~SwGrfNumPortion();
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
void SetBase( long nLnAscent, long nLnDescent,
long nFlyAscent, long nFlyDescent );
@@ -242,7 +242,7 @@ class SwCombinedPortion : public SwFldPortion
public:
SwCombinedPortion( const OUString &rExpand );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index e5e385d..7f350a1 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -47,7 +47,7 @@ void SwFlyPortion::Paint( const SwTxtPaintInfo& ) const
{
}
-sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
{
OSL_ENSURE( Fix() >= rInf.X(), "SwFlyPortion::Format" );
// tabs must be expanded (Bug 8537)
@@ -87,14 +87,14 @@ sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
PrtWidth( nNewWidth - rInf.Width() );
SetFixWidth( PrtWidth() );
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
{
- sal_Bool bFull = rInf.Width() < rInf.X() + PrtWidth();
+ bool bFull = rInf.Width() < rInf.X() + PrtWidth();
if( bFull )
{
@@ -114,7 +114,7 @@ sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
if( nLeft == rInf.X() && ! rInf.GetFly() )
{
Width( rInf.Width() );
- bFull = sal_False; // so that notes can still be placed in this line
+ bFull = false; // so that notes can still be placed in this line
}
else
{
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 80ef418..207cf0b 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -41,7 +41,7 @@ public:
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
OUTPUT_OPERATOR
};
@@ -89,7 +89,7 @@ public:
objectpositioning::AsCharFlags nFlags );
sal_Int32 GetFlyCrsrOfst( const KSHORT nOfst, const Point &rPoint,
SwPosition *pPos, SwCrsrMoveState* pCMS ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index ec05631..38a0440 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -41,9 +41,9 @@ public:
KSHORT& Orig() { return nOrigHeight; }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
// #i98418#
void SetPreferredScriptType( sal_uInt8 nPreferredScriptType );
@@ -75,9 +75,9 @@ class SwQuoVadisPortion : public SwFldPortion
OUString aErgo;
public:
SwQuoVadisPortion( const OUString &rExp, const OUString& rStr );
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
void SetNumber( const OUString& rStr ) { aErgo = rStr; }
const OUString GetQuoTxt() const { return aExpand; }
@@ -101,7 +101,7 @@ class SwErgoSumPortion : public SwFldPortion
public:
SwErgoSumPortion( const OUString &rExp, const OUString& rStr );
virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
// Field cloner for SplitGlue
virtual SwFldPortion *Clone( const OUString &rExpand ) const;
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index b57195b..b5f057a 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -66,7 +66,7 @@ SwPosSize SwGluePortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
* virtual SwGluePortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwGluePortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwGluePortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
if( GetLen() && rInf.OnWin() &&
rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
@@ -74,9 +74,9 @@ sal_Bool SwGluePortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) c
OUStringBuffer aBuf;
comphelper::string::padToLength(aBuf, GetLen(), CH_BULLET);
rTxt = aBuf.makeStringAndClear();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
/*************************************************************************
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index 1c6ef74..4da5ae2 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -47,7 +47,7 @@ public:
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 32e6128..5daec4a 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -32,8 +32,8 @@ public:
{
SetWhichPor( POR_HYPH );
}
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf );
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const;
@@ -55,7 +55,7 @@ public:
SetWhichPor( POR_HYPHSTR );
}
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const;
@@ -75,10 +75,10 @@ class SwSoftHyphPortion : public SwHyphPortion
public:
SwSoftHyphPortion();
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
virtual SwLinePortion *Compress();
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
inline void SetExpand( const sal_Bool bNew ) { bExpand = bNew; }
sal_Bool IsExpand() const { return bExpand; }
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 851aba8..4f8f345 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -188,13 +188,13 @@ SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
// For special treatment of empty lines
-sal_Bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
+bool SwLineLayout::Format( SwTxtFormatInfo &rInf )
{
if( GetLen() )
return SwTxtPortion::Format( rInf );
Height( rInf.GetTxtHeight() );
- return sal_True;
+ return true;
}
/*************************************************************************
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index bc61fd5..3ea78dc 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -174,7 +174,7 @@ public:
{ return _GetHangingMargin(); }
// For special treatment for empty lines
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
//
// STUFF FOR JUSTIFIED ALIGNMENT
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index f299df4..a9d9dc7 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -287,13 +287,13 @@ SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
* virtual SwLinePortion::Format()
*************************************************************************/
-sal_Bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
+bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
{
if( rInf.X() > rInf.Width() )
{
Truncate();
rInf.SetUnderFlow( this );
- return sal_True;
+ return true;
}
const SwLinePortion *pLast = rInf.GetLast();
@@ -308,9 +308,9 @@ sal_Bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
if( nNewWidth > rInf.Width() )
PrtWidth( nNewWidth - rInf.Width() );
rInf.GetLast()->FormatEOL( rInf );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
/*************************************************************************
@@ -376,9 +376,9 @@ long SwLinePortion::CalcSpacing( long , const SwTxtSizeInfo & ) const
* virtual SwLinePortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo &, OUString & ) const
+bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo &, OUString & ) const
{
- return sal_False;
+ return false;
}
/*************************************************************************
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 2c90548..cf5a9ff 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -169,13 +169,13 @@ public:
virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0;
void PrePaint( const SwTxtPaintInfo &rInf, const SwLinePortion *pLast ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
// Is called for the line's last portion
virtual void FormatEOL( SwTxtFormatInfo &rInf );
void Move( SwTxtPaintInfo &rInf );
// For SwTxtSlot
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
// For SwFldPortion, SwSoftHyphPortion
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
diff --git a/sw/source/core/text/porref.cxx b/sw/source/core/text/porref.cxx
index 0cb2538..5b8dab6 100644
--- a/sw/source/core/text/porref.cxx
+++ b/sw/source/core/text/porref.cxx
@@ -72,10 +72,9 @@ KSHORT SwIsoRefPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
* virtual SwIsoRefPortion::Format()
*************************************************************************/
-sal_Bool SwIsoRefPortion::Format( SwTxtFormatInfo &rInf )
+bool SwIsoRefPortion::Format( SwTxtFormatInfo &rInf )
{
- const sal_Bool bFull = SwLinePortion::Format( rInf );
- return bFull;
+ return SwLinePortion::Format( rInf );
}
/*************************************************************************
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 4ace502..553faee 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -43,7 +43,7 @@ class SwIsoRefPortion : public SwRefPortion
public:
SwIsoRefPortion();
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual SwLinePortion *Compress();
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 10e9fec..021bff1 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -102,7 +102,7 @@ void SwBreakPortion::Paint( const SwTxtPaintInfo &rInf ) const
* virtual SwBreakPortion::Format()
*************************************************************************/
-sal_Bool SwBreakPortion::Format( SwTxtFormatInfo &rInf )
+bool SwBreakPortion::Format( SwTxtFormatInfo &rInf )
{
const SwLinePortion *pRoot = rInf.GetRoot();
Width( 0 );
@@ -110,7 +110,7 @@ sal_Bool SwBreakPortion::Format( SwTxtFormatInfo &rInf )
SetAscent( pRoot->GetAscent() );
if ( rInf.GetIdx()+1 == rInf.GetTxt().getLength() )
rInf.SetNewLine( true );
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -499,12 +499,12 @@ void SwHiddenTextPortion::Paint( const SwTxtPaintInfo & rInf) const
* virtual SwHiddenTextPortion::Format()
*************************************************************************/
-sal_Bool SwHiddenTextPortion::Format( SwTxtFormatInfo &rInf )
+bool SwHiddenTextPortion::Format( SwTxtFormatInfo &rInf )
{
Width( 0 );
rInf.GetTxtFrm()->HideFootnotes( rInf.GetIdx(), rInf.GetIdx() + GetLen() );
- return sal_False;
+ return false;
};
/*************************************************************************
@@ -559,14 +559,14 @@ void SwControlCharPortion::Paint( const SwTxtPaintInfo &rInf ) const
* virtual SwControlCharPortion::Format()
*************************************************************************/
-sal_Bool SwControlCharPortion::Format( SwTxtFormatInfo &rInf )
+bool SwControlCharPortion::Format( SwTxtFormatInfo &rInf )
{
const SwLinePortion* pRoot = rInf.GetRoot();
Width( 0 );
Height( pRoot->Height() );
SetAscent( pRoot->GetAscent() );
- return sal_False;
+ return false;
}
/*************************************************************************
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index de5f2fd..1761569 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -49,7 +49,7 @@ public:
// Returns 0 if we have no usable data
virtual SwLinePortion *Compress();
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
@@ -137,7 +137,7 @@ public:
{ SetWhichPor( POR_HIDDEN_TXT ); SetLen( nLen ); }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
};
/*************************************************************************
@@ -161,7 +161,7 @@ public:
}
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const;
};
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 2082712..b504280 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -36,7 +36,7 @@ class SwTabPortion : public SwFixPortion
public:
SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
sal_Bool PostFormat( SwTxtFormatInfo &rInf );
inline sal_Bool IsFilled() const { return 0 != cFill; }
diff --git a/sw/source/core/text/portox.cxx b/sw/source/core/text/portox.cxx
index 5e1c9f7..7b92f0b 100644
--- a/sw/source/core/text/portox.cxx
+++ b/sw/source/core/text/portox.cxx
@@ -74,10 +74,9 @@ KSHORT SwIsoToxPortion::GetViewWidth( const SwTxtSizeInfo &rInf ) const
* virtual SwIsoToxPortion::Format()
*************************************************************************/
-sal_Bool SwIsoToxPortion::Format( SwTxtFormatInfo &rInf )
+bool SwIsoToxPortion::Format( SwTxtFormatInfo &rInf )
{
- const sal_Bool bFull = SwLinePortion::Format( rInf );
- return bFull;
+ return SwLinePortion::Format( rInf );
}
/*************************************************************************
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index a80183b..dc4db1a 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -44,7 +44,7 @@ class SwIsoToxPortion : public SwToxPortion
public:
SwIsoToxPortion();
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual SwLinePortion *Compress();
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 4b72ac0..9529b21 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -459,7 +459,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
-sal_Bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
+bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
{
if( rInf.X() > rInf.Width() || (!GetLen() && !InExpGrp()) )
{
@@ -468,7 +468,7 @@ sal_Bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
SetLen( 0 );
SetAscent( 0 );
SetPortion( NULL ); // ????
- return sal_True;
+ return true;
}
OSL_ENSURE( rInf.RealWidth() || (rInf.X() == rInf.Width()),
@@ -599,9 +599,9 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const
-sal_Bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &, OUString & ) const
+bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &, OUString & ) const
{
- return sal_False;
+ return false;
}
/*************************************************************************
@@ -711,14 +711,14 @@ SwTxtInputFldPortion::SwTxtInputFldPortion()
}
-sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
+bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf )
{
mbContainsInputFieldStart =
rInf.GetChar( rInf.GetIdx() ) == CH_TXT_ATR_INPUTFIELDSTART;
mbContainsInputFieldEnd =
rInf.GetChar( rInf.GetIdx() + rInf.GetLen() - 1 ) == CH_TXT_ATR_INPUTFIELDEND;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( rInf.GetLen() == 1
&& ( mbContainsInputFieldStart || mbContainsInputFieldEnd ) )
{
@@ -777,7 +777,7 @@ void SwTxtInputFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
}
}
-sal_Bool SwTxtInputFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwTxtInputFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
sal_Int32 nIdx = rInf.GetIdx();
sal_Int32 nLen = rInf.GetLen();
@@ -792,7 +792,7 @@ sal_Bool SwTxtInputFldPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &r
}
rTxt = rInf.GetTxt().copy( nIdx, std::min( nLen, rInf.GetTxt().getLength() - nIdx ) );
- return sal_True;
+ return true;
}
@@ -889,7 +889,7 @@ void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const
-sal_Bool SwHolePortion::Format( SwTxtFormatInfo &rInf )
+bool SwHolePortion::Format( SwTxtFormatInfo &rInf )
{
return rInf.IsFull() || rInf.X() >= rInf.Width();
}
@@ -909,11 +909,10 @@ void SwFieldMarkPortion::Paint( const SwTxtPaintInfo & /*rInf*/) const
//SwTxtPortion::Paint(rInf);
}
-sal_Bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
+bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
{
- sal_Bool ret=0;
Width(0);
- return ret;
+ return false;
}
namespace {
@@ -976,9 +975,8 @@ void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const
}
}
-sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf )
+bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf )
{
- sal_Bool ret = 0;
SwTxtNode *pNd = const_cast < SwTxtNode * >( rInf.GetTxtFrm( )->GetTxtNode( ) );
const SwDoc *doc = pNd->GetDoc( );
SwIndex aIndex( pNd, rInf.GetIdx( ) );
@@ -1007,7 +1005,7 @@ sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf )
assert( false ); // unknown type...
}
}
- return ret;
+ return false;
}
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 75c5f35..bd6336b 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -40,11 +40,11 @@ public:
inline SwTxtPortion(){ SetWhichPor( POR_TXT ); }
SwTxtPortion( const SwLinePortion &rPortion );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
// Counts the spaces for justified paragraph
@@ -65,10 +65,10 @@ class SwTxtInputFldPortion : public SwTxtPortion
public:
SwTxtInputFldPortion();
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
private:
@@ -89,7 +89,7 @@ public:
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
virtual SwLinePortion *Compress();
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
// Accessibility: pass information about this portion to the PortionHandler
@@ -105,7 +105,7 @@ class SwFieldMarkPortion : public SwTxtPortion
inline SwFieldMarkPortion() : SwTxtPortion()
{ }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
};
class SwFieldFormPortion : public SwTxtPortion
@@ -114,7 +114,7 @@ class SwFieldFormPortion : public SwTxtPortion
inline SwFieldFormPortion() : SwTxtPortion()
{ }
virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf );
};
#endif
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 1b33110..ec6e922 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -1021,9 +1021,9 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
* virtual Format()
*************************************************************************/
-sal_Bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
+bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
{
- sal_Bool bFull = sal_False;
+ bool bFull = false;
Fix( (sal_uInt16)rInf.X() );
SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() );
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index f32e0a0..3e2c875 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1415,17 +1415,17 @@ SwFtnPortion::SwFtnPortion( const OUString &rExpand,
* SwFtnPortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwFtnPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
+bool SwFtnPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
{
rTxt = aExpand;
- return sal_True;
+ return true;
}
/*************************************************************************
* virtual SwFtnPortion::Format()
*************************************************************************/
-sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
+bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
{
// #i98418#
// SwFtnSave aFtnSave( rInf, pFtn );
@@ -1434,7 +1434,7 @@ sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
// this flag indicates, that a footnote is allowed to trigger
// an underflow during SwTxtGuess::Guess
rInf.SetFakeLineStart( rInf.GetIdx() > rInf.GetLineStart() );
- sal_Bool bFull = SwFldPortion::Format( rInf );
+ const bool bFull = SwFldPortion::Format( rInf );
rInf.SetFakeLineStart( false );
SetAscent( rInf.GetAscent() );
Height( rInf.GetTxtHeight() );
@@ -1496,11 +1496,11 @@ SwQuoVadisPortion::SwQuoVadisPortion( const OUString &rExp, const OUString& rStr
* virtual SwQuoVadisPortion::Format()
*************************************************************************/
-sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
+bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
{
// erster Versuch, vielleicht passt der Text
CheckScript( rInf );
- sal_Bool bFull = SwFldPortion::Format( rInf );
+ bool bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
if( bFull )
@@ -1527,14 +1527,14 @@ sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
* virtual SwQuoVadisPortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwQuoVadisPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
+bool SwQuoVadisPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
{
rTxt = aExpand;
// if this QuoVadisPortion has a follow, the follow is responsible for
// the ergo text.
if ( ! HasFollow() )
rTxt += aErgo;
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -1594,9 +1594,9 @@ sal_Int32 SwErgoSumPortion::GetCrsrOfst( const KSHORT ) const
* virtual SwErgoSumPortion::Format()
*************************************************************************/
-sal_Bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
+bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
{
- sal_Bool bFull = SwFldPortion::Format( rInf );
+ const bool bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
rInf.SetErgoDone( true );
@@ -1609,7 +1609,7 @@ sal_Bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
// We return false in order to get some text into the current line,
// even if it's full (better than looping)
- return sal_False;
+ return false;
}
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 9e7da94..4ac0846 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -365,10 +365,10 @@ sal_Bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
* virtual SwHyphPortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, OUString &rTxt ) const
+bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, OUString &rTxt ) const
{
rTxt = "-";
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -385,7 +385,7 @@ void SwHyphPortion::HandlePortion( SwPortionHandler& rPH ) const
* virtual SwHyphPortion::Format()
*************************************************************************/
-sal_Bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
+bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
{
const SwLinePortion *pLast = rInf.GetLast();
Height( pLast->Height() );
@@ -393,10 +393,10 @@ sal_Bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
OUString aTxt;
if( !GetExpTxt( rInf, aTxt ) )
- return sal_False;
+ return false;
PrtWidth( rInf.GetTxtSize( aTxt ).Width() );
- const sal_Bool bFull = rInf.Width() <= rInf.X() + PrtWidth();
+ const bool bFull = rInf.Width() <= rInf.X() + PrtWidth();
if( bFull && !rInf.IsUnderFlow() ) {
Truncate();
rInf.SetUnderFlow( this );
@@ -409,10 +409,10 @@ sal_Bool SwHyphPortion::Format( SwTxtFormatInfo &rInf )
* virtual SwHyphStrPortion::GetExpTxt()
*************************************************************************/
-sal_Bool SwHyphStrPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
+bool SwHyphStrPortion::GetExpTxt( const SwTxtSizeInfo &, OUString &rTxt ) const
{
rTxt = aExpand;
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -490,15 +490,15 @@ void SwSoftHyphPortion::Paint( const SwTxtPaintInfo &rInf ) const
* 4) {Zuc} ruft Hyphenate => {Zuk}{-}{ker}
*/
-sal_Bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
+bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
{
- sal_Bool bFull = sal_True;
+ bool bFull = true;
// special case for old german spelling
if( rInf.IsUnderFlow() )
{
if( rInf.GetSoftHyphPos() )
- return sal_True;
+ return true;
const bool bHyph = rInf.ChgHyph( true );
if( rInf.IsHyphenate() )
@@ -529,7 +529,7 @@ sal_Bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
Truncate();
rInf.SetUnderFlow( this );
}
- return sal_True;
+ return true;
}
rInf.SetSoftHyphPos(0);
@@ -563,7 +563,7 @@ void SwSoftHyphPortion::FormatEOL( SwTxtFormatInfo &rInf )
const sal_Int32 nOldIdx = rInf.GetIdx();
rInf.X( rInf.X() - PrtWidth() );
rInf.SetIdx( rInf.GetIdx() - GetLen() );
- const sal_Bool bFull = SwHyphPortion::Format( rInf );
+ const bool bFull = SwHyphPortion::Format( rInf );
nHyphWidth = Width();
// 6976: Eine truebe Sache: Wir werden erlaubterweise breiter,
@@ -586,7 +586,7 @@ void SwSoftHyphPortion::FormatEOL( SwTxtFormatInfo &rInf )
* - wenn wir vor einem (echten/emuliertem) Zeilenumbruch stehen
*************************************************************************/
-sal_Bool SwSoftHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
+bool SwSoftHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const
{
if( IsExpand() || ( rInf.OnWin() && rInf.GetOpt().IsSoftHyph() ) ||
( GetPortion() && ( GetPortion()->InFixGrp() ||
@@ -595,7 +595,7 @@ sal_Bool SwSoftHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt
{
return SwHyphPortion::GetExpTxt( rInf, rTxt );
}
- return sal_False;
+ return false;
}
/*************************************************************************
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 1e5eb63..225f040 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -331,7 +331,7 @@ SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const sal_Unicode cFillCh
-sal_Bool SwTabPortion::Format( SwTxtFormatInfo &rInf )
+bool SwTabPortion::Format( SwTxtFormatInfo &rInf )
{
SwTabPortion *pLastTab = rInf.GetLastTab();
if( pLastTab == this )
commit 5c95b277c68a27d91f591b676f1846c6eda04f79
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Feb 7 00:43:21 2014 +0100
sal_Bool to bool
Change-Id: Ie1306dc6b079c3d5204733470b69f45cdc96b04e
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index a49c049..26341a4 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -65,7 +65,7 @@ void SwAttrIter::Chg( SwTxtAttr *pHt )
{
OSL_ENSURE( pHt && pFnt, "No attribute of font available for change");
if( pRedln && pRedln->IsOn() )
- pRedln->ChangeTxtAttr( pFnt, *pHt, sal_True );
+ pRedln->ChangeTxtAttr( pFnt, *pHt, true );
else
aAttrHandler.PushAndChg( *pHt, *pFnt );
nChgCnt++;
@@ -80,7 +80,7 @@ void SwAttrIter::Rst( SwTxtAttr *pHt )
OSL_ENSURE( pHt && pFnt, "No attribute of font available for reset");
// get top from stack after removing pHt
if( pRedln && pRedln->IsOn() )
- pRedln->ChangeTxtAttr( pFnt, *pHt, sal_False );
+ pRedln->ChangeTxtAttr( pFnt, *pHt, false );
else
aAttrHandler.PopAndChg( *pHt, *pFnt );
nChgCnt--;
@@ -120,14 +120,14 @@ SwTxtAttr *SwAttrIter::GetAttr( const sal_Int32 nPosition ) const
* SwAttrIter::SeekAndChg()
*************************************************************************/
-sal_Bool SwAttrIter::SeekAndChgAttrIter( const sal_Int32 nNewPos, OutputDevice* pOut )
+bool SwAttrIter::SeekAndChgAttrIter( const sal_Int32 nNewPos, OutputDevice* pOut )
{
- sal_Bool bChg = nStartIndex && nNewPos == nPos ? pFnt->IsFntChg() : Seek( nNewPos );
+ bool bChg = nStartIndex && nNewPos == nPos ? pFnt->IsFntChg() : Seek( nNewPos );
if ( pLastOut != pOut )
{
pLastOut = pOut;
- pFnt->SetFntChg( sal_True );
- bChg = sal_True;
+ pFnt->SetFntChg( true );
+ bChg = true;
}
if( bChg )
{
@@ -142,7 +142,7 @@ sal_Bool SwAttrIter::SeekAndChgAttrIter( const sal_Int32 nNewPos, OutputDevice*
return bChg;
}
-sal_Bool SwAttrIter::IsSymbol( const sal_Int32 nNewPos )
+bool SwAttrIter::IsSymbol( const sal_Int32 nNewPos )
{
Seek( nNewPos );
if ( !nChgCnt && !nPropFont )
@@ -155,7 +155,7 @@ sal_Bool SwAttrIter::IsSymbol( const sal_Int32 nNewPos )
* SwAttrIter::SeekStartAndChg()
*************************************************************************/
-sal_Bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const sal_Bool bParaFont )
+bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFont )
{
if ( pRedln && pRedln->ExtOn() )
pRedln->LeaveExtend( *pFnt, 0 );
@@ -190,12 +190,12 @@ sal_Bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* pOut, const sal_Bool
}
}
- sal_Bool bChg = pFnt->IsFntChg();
+ bool bChg = pFnt->IsFntChg();
if ( pLastOut != pOut )
{
pLastOut = pOut;
- pFnt->SetFntChg( sal_True );
- bChg = sal_True;
+ pFnt->SetFntChg( true );
+ bChg = true;
}
if( bChg )
{
@@ -259,7 +259,7 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
* SwAttrIter::Seek()
*************************************************************************/
-sal_Bool SwAttrIter::Seek( const sal_Int32 nNewPos )
+bool SwAttrIter::Seek( const sal_Int32 nNewPos )
{
if ( pRedln && pRedln->ExtOn() )
pRedln->LeaveExtend( *pFnt, nNewPos );
@@ -374,21 +374,21 @@ public:
void NewWord() { nWordAdd = nWordWidth = 0; }
};
-static sal_Bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &rTxt,
+static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &rTxt,
sal_Int32 nIdx, sal_Int32 nEnd )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
while( nIdx < nEnd )
{
sal_Int32 nStop = nIdx;
- sal_Bool bClear;
+ bool bClear = false;
LanguageType eLang = pFnt->GetLanguage();
if( g_pBreakIt->GetBreakIter().is() )
{
bClear = CH_BLANK == rTxt[ nStop ];
Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary( rTxt, nIdx,
g_pBreakIt->GetLocale( eLang ),
- WordType::DICTIONARY_WORD, sal_True ) );
+ WordType::DICTIONARY_WORD, true ) );
nStop = aBndry.endPos;
if( nIdx <= aBndry.startPos && nIdx && nIdx-1 != rArg.nNoLineBreak )
rArg.NewWord();
@@ -421,7 +421,7 @@ static sal_Bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUStri
if( (long)rArg.rAbsMin < rArg.nWordWidth )
rArg.rAbsMin = rArg.nWordWidth;
rArg.Minimum( rArg.nWordWidth + rArg.nWordAdd );
- bRet = sal_True;
+ bRet = true;
}
nIdx = nStop;
}
@@ -603,7 +603,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
rAbsMin = 0;
const SvxLRSpaceItem &rSpace = GetSwAttrSet().GetLRSpace();
- long nLROffset = rSpace.GetTxtLeft() + GetLeftMarginWithNum( sal_True );
+ long nLROffset = rSpace.GetTxtLeft() + GetLeftMarginWithNum( true );
short nFLOffs;
// Bei Numerierung ist ein neg. Erstzeileneinzug vermutlich
// bereits gefuellt...
@@ -697,7 +697,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
{
OUString sTmp( cChar );
SwDrawTextInfo aDrawInf( const_cast<SwViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()),
- *pOut, 0, sTmp, 0, 1, 0, sal_False );
+ *pOut, 0, sTmp, 0, 1, 0, false );
nAktWidth = aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
aArg.nWordWidth += nAktWidth;
aArg.nRowWidth += nAktWidth;
@@ -856,7 +856,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
Boundary aBound =
g_pBreakIt->GetBreakIter()->getWordBoundary( GetTxt(), nStt,
g_pBreakIt->GetLocale( aIter.GetFnt()->GetLanguage() ),
- WordType::DICTIONARY_WORD, sal_True );
+ WordType::DICTIONARY_WORD, true );
if ( nStt == aBound.startPos )
{
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 2a02086..3edc31f 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -99,19 +99,19 @@ public:
// char position.
sal_Int32 GetNextAttr( ) const;
/// Enables the attributes used at char pos nPos in the logical font
- sal_Bool Seek( const sal_Int32 nPos );
+ bool Seek( const sal_Int32 nPos );
// Creates the font at the specified position via Seek() and checks
// if it's a symbol font.
- sal_Bool IsSymbol( const sal_Int32 nPos );
+ bool IsSymbol( const sal_Int32 nPos );
- /** Executes ChgPhysFnt if Seek() returns sal_True
+ /** Executes ChgPhysFnt if Seek() returns true
* and change font to merge character border with neighbours.
**/
- sal_Bool SeekAndChgAttrIter( const sal_Int32 nPos, OutputDevice* pOut );
- sal_Bool SeekStartAndChgAttrIter( OutputDevice* pOut, const sal_Bool bParaFont = sal_False );
+ bool SeekAndChgAttrIter( const sal_Int32 nPos, OutputDevice* pOut );
+ bool SeekStartAndChgAttrIter( OutputDevice* pOut, const bool bParaFont = false );
// Do we have an attribute change at all?
- sal_Bool HasHints() const { return 0 != pHints; }
+ bool HasHints() const { return 0 != pHints; }
// Returns the attribute for a position
SwTxtAttr *GetAttr( const sal_Int32 nPos ) const;
More information about the Libreoffice-commits
mailing list