summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/text/pordrop.hxx2
-rw-r--r--sw/source/core/text/porexp.cxx24
-rw-r--r--sw/source/core/text/porexp.hxx12
-rw-r--r--sw/source/core/text/porfld.cxx28
-rw-r--r--sw/source/core/text/porfld.hxx12
-rw-r--r--sw/source/core/text/porfly.cxx12
-rw-r--r--sw/source/core/text/porfly.hxx4
-rw-r--r--sw/source/core/text/porftn.hxx10
-rw-r--r--sw/source/core/text/porglue.cxx6
-rw-r--r--sw/source/core/text/porglue.hxx2
-rw-r--r--sw/source/core/text/porhyph.hxx10
-rw-r--r--sw/source/core/text/porlay.cxx4
-rw-r--r--sw/source/core/text/porlay.hxx2
-rw-r--r--sw/source/core/text/porlin.cxx12
-rw-r--r--sw/source/core/text/porlin.hxx4
-rw-r--r--sw/source/core/text/porref.cxx5
-rw-r--r--sw/source/core/text/porref.hxx2
-rw-r--r--sw/source/core/text/porrst.cxx12
-rw-r--r--sw/source/core/text/porrst.hxx6
-rw-r--r--sw/source/core/text/portab.hxx2
-rw-r--r--sw/source/core/text/portox.cxx5
-rw-r--r--sw/source/core/text/portox.hxx2
-rw-r--r--sw/source/core/text/portxt.cxx28
-rw-r--r--sw/source/core/text/portxt.hxx14
-rw-r--r--sw/source/core/text/txtdrop.cxx4
-rw-r--r--sw/source/core/text/txtftn.cxx22
-rw-r--r--sw/source/core/text/txthyph.cxx28
-rw-r--r--sw/source/core/text/txttab.cxx2
28 files changed, 136 insertions, 140 deletions
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index ea5c972e9dad..4c9f6590090c 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 36897558bec2..d1353aada6b5 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 59c8fa2326a1..e31517a512c0 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 74957889b832..93261c0b4a66 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 0770edf3e167..b698015a14a9 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 e5e385d9f3f3..7f350a1b3797 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 80ef4184f944..207cf0bc78ff 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 ec05631674d1..38a044006dd4 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 b57195b5b2f4..b5f057a0a107 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 1c6ef747effb..4da5ae294618 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 32e6128c931c..5daec4a7596d 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 851aba81d56e..4f8f34560e78 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 bc61fd5806e7..3ea78dce8d17 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 f299df446613..a9d9dc7c7323 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 2c90548cb462..cf5a9ff983f8 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 0cb2538251fe..5b8dab6c6abd 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 4ace502be56a..553faee334b3 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 10e9fec297b8..021bff136d7e 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 de5f2fdb03b6..17615690839f 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 2082712378cb..b5042809a63a 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 5e1c9f703c29..7b92f0b17c6d 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 a80183bfc337..dc4db1a7068b 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 4b72ac05ad75..9529b21c30cf 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 75c5f35f7f99..bd6336b97ba0 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 1b3311068bd8..ec6e922fe32a 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 f32e0a0e13e5..3e2c875d7086 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 9e7da94b31ce..4ac0846cbdd7 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 1e5eb634f54a..225f040e28c7 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 )