[Libreoffice-commits] core.git: 13 commits - svtools/source sw/source
Matteo Casalin
matteo.casalin at yahoo.com
Mon Feb 3 14:02:06 PST 2014
svtools/source/brwbox/brwbox3.cxx | 4
sw/source/core/text/atrhndl.hxx | 8 -
sw/source/core/text/atrstck.cxx | 45 ++++----
sw/source/core/text/frmcrsr.cxx | 6 -
sw/source/core/text/frmform.cxx | 2
sw/source/core/text/guess.cxx | 22 ++--
sw/source/core/text/guess.hxx | 2
sw/source/core/text/inftxt.cxx | 143 ++++++++++++++--------------
sw/source/core/text/inftxt.hxx | 191 ++++++++++++++++++--------------------
sw/source/core/text/itradj.cxx | 4
sw/source/core/text/itrcrsr.cxx | 16 +--
sw/source/core/text/itrform2.cxx | 176 +++++++++++++++++------------------
sw/source/core/text/itrform2.hxx | 52 +++++-----
sw/source/core/text/itrpaint.cxx | 67 ++++---------
sw/source/core/text/itrpaint.hxx | 12 +-
sw/source/core/text/itrtxt.cxx | 35 +++---
sw/source/core/text/itrtxt.hxx | 58 +++++------
sw/source/core/text/porexp.cxx | 4
sw/source/core/text/porfld.cxx | 8 -
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/porglue.cxx | 6 -
sw/source/core/text/porlay.cxx | 9 -
sw/source/core/text/pormulti.cxx | 137 +++++++++++++--------------
sw/source/core/text/pormulti.hxx | 66 ++++++-------
sw/source/core/text/porrst.cxx | 4
sw/source/core/text/portxt.cxx | 20 +--
sw/source/core/text/portxt.hxx | 2
sw/source/core/text/redlnitr.cxx | 6 -
sw/source/core/text/txtdrop.cxx | 11 --
sw/source/core/text/txtfrm.cxx | 10 -
sw/source/core/text/txtftn.cxx | 14 +-
sw/source/core/text/txthyph.cxx | 88 ++++++++---------
sw/source/core/text/txttab.cxx | 6 -
33 files changed, 600 insertions(+), 636 deletions(-)
New commits:
commit f89e7188cc29e12579d1bfd34c8a1a90279fa5f1
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Mon Feb 3 22:55:04 2014 +0100
Method Reset is not defined: remove its declaration
Change-Id: I53066104aeb5df72fab05755cb3d885095b8bc5a
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index e44d8e7..520dddc 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -744,9 +744,6 @@ public:
// Dropcaps called by SwTxtFormatter::CTOR
const SwFmtDrop *GetDropFmt() const;
- // Resets the FormatInfo back to its original state
- void Reset( const SwTxtFrm *pFrame); // , const sal_Bool bAll );
-
// Sets the last SwKernPortion as pLast, if it is followed by empty portions
bool LastKernPortion();
commit c99c443bf92d3e44d17df12548b2b23346d094fd
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Mon Feb 3 22:29:45 2014 +0100
sal_Bool to bool
Change-Id: I2bb29dd158e07d3fad924e9877b02435574f4d29
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index c570d91..51a2796 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1937,7 +1937,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
SwFrmSwapper aSwapper( this, sal_True );
SwTxtFrmLocker aLock(this);
- SwTxtFormatInfo aInf( this, sal_False, sal_True );
+ SwTxtFormatInfo aInf( this, false, true );
if( 0 != aInf.MaxHyph() ) // Respect MaxHyphen!
return sal_False;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 6aa466c..73bbd5e 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -89,7 +89,7 @@ using namespace ::com::sun::star::beans;
#define DRAW_SPECIAL_OPTIONS_ROTATE 2
#ifdef DBG_UTIL
-sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
+bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
#endif
SwLineInfo::SwLineInfo()
@@ -444,6 +444,11 @@ sal_Int32 SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
return m_pFnt->GetTxtBreak( aDrawInf, nLineWidth );
}
+bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos )
+{
+ return pTxtNode->GetTxtAttrForCharAt(nPos);
+}
+
void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPaint )
{
CtorInitTxtSizeInfo( pFrame );
@@ -496,7 +501,7 @@ extern Color aGlobalRetoucheColor;
* Returns if the current background color is dark.
*************************************************************************/
-static sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
+static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
{
const Color* pCol = rInf.GetFont()->GetBackColor();
if( ! pCol || COL_TRANSPARENT == pCol->GetColor() )
@@ -510,7 +515,7 @@ static sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
// See implementation in /core/layout/paintfrm.cxx
// There is a background color, if there is a background brush and
// its color is *not* "no fill"/"auto fill".
- if( rInf.GetTxtFrm()->GetBackgroundBrush( pItem, pFillStyleItem, pFillGradientItem, pCol, aOrigBackRect, sal_False ) )
+ if( rInf.GetTxtFrm()->GetBackgroundBrush( pItem, pFillStyleItem, pFillGradientItem, pCol, aOrigBackRect, false ) )
{
if ( !pCol )
pCol = &pItem->GetColor();
@@ -536,9 +541,9 @@ static sal_Bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf )
void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor,
const sal_Int32 nStart, const sal_Int32 nLength,
- const sal_Bool bKern, const sal_Bool bWrong,
- const sal_Bool bSmartTag,
- const sal_Bool bGrammarCheck ) // SMARTTAGS
+ const bool bKern, const bool bWrong,
+ const bool bSmartTag,
+ const bool bGrammarCheck ) // SMARTTAGS
{
if( !nLength )
return;
@@ -589,10 +594,10 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor
sal_Bool bCfgIsAutoGrammar = sal_False;
SvtLinguConfig().GetProperty( UPN_IS_GRAMMAR_AUTO ) >>= bCfgIsAutoGrammar;
- const sal_Bool bBullet = OnWin() && GetOpt().IsBlank() && IsNoSymbol();
- const sal_Bool bTmpWrong = bWrong && OnWin() && GetOpt().IsOnlineSpell();
- const sal_Bool bTmpGrammarCheck = bGrammarCheck && OnWin() && bCfgIsAutoGrammar && GetOpt().IsOnlineSpell();
- const sal_Bool bTmpSmart = bSmartTag && OnWin() && !GetOpt().IsPagePreview() && SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS
+ const bool bBullet = OnWin() && GetOpt().IsBlank() && IsNoSymbol();
+ const bool bTmpWrong = bWrong && OnWin() && GetOpt().IsOnlineSpell();
+ const bool bTmpGrammarCheck = bGrammarCheck && OnWin() && bCfgIsAutoGrammar && GetOpt().IsOnlineSpell();
+ const bool bTmpSmart = bSmartTag && OnWin() && !GetOpt().IsPagePreview() && SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS
OSL_ENSURE( GetParaPortion(), "No paragraph!");
SwDrawTextInfo aDrawInf( m_pFrm->getRootFrm()->GetCurrShell(), *m_pOut, pSI, rText, nStart, nLength,
@@ -738,9 +743,9 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor,
}
// Adjust x coordinate if we are inside a bidi portion
- const sal_Bool bFrmDir = GetTxtFrm()->IsRightToLeft();
- bool bCounterDir = ( ! bFrmDir && DIR_RIGHT2LEFT == GetDirection() ) ||
- ( bFrmDir && DIR_LEFT2RIGHT == GetDirection() );
+ const bool bFrmDir = GetTxtFrm()->IsRightToLeft();
+ const bool bCounterDir = ( !bFrmDir && DIR_RIGHT2LEFT == GetDirection() ) ||
+ ( bFrmDir && DIR_LEFT2RIGHT == GetDirection() );
if ( bCounterDir )
aPoint.A() -= aSize.Width();
@@ -911,8 +916,8 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
((SwTxtPaintInfo&)rInf).SetPos( aOldPos );
}
-void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic,
- sal_Bool bRetouche ) const
+void SwTxtPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic,
+ bool bRetouche ) const
{
if ( OnWin() || !bRetouche )
{
@@ -1003,7 +1008,7 @@ void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
}
}
-void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, sal_Bool bScript ) const
+void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
{
if( OnWin() && m_pOpt->IsPostIts() )
{
@@ -1103,7 +1108,7 @@ void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
pOut->SetLineColor();
}
- DrawRect( aIntersect, sal_True );
+ DrawRect( aIntersect, true );
pOut->Pop();
}
}
@@ -1178,7 +1183,7 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
pTmpOut->SetFillColor(aFillColor);
pTmpOut->SetLineColor();
- DrawRect( aIntersect, sal_True, sal_False );
+ DrawRect( aIntersect, true, false );
pTmpOut->Pop();
}
@@ -1302,7 +1307,7 @@ const PropertyValues & SwTxtFormatInfo::GetHyphValues() const
return aHyphVals;
}
-sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
+bool SwTxtFormatInfo::InitHyph( const bool bAutoHyphen )
{
const SwAttrSet& rAttrSet = GetTxtFrm()->GetTxtNode()->GetSwAttrSet();
SetHanging( rAttrSet.GetHangingPunctuation().GetValue() );
@@ -1310,7 +1315,7 @@ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
SetForbiddenChars( rAttrSet.GetForbiddenRule().GetValue() );
const SvxHyphenZoneItem &rAttr = rAttrSet.GetHyphenZone();
MaxHyph() = rAttr.GetMaxHyphens();
- sal_Bool bAuto = bAutoHyphen || rAttr.IsHyphen();
+ const bool bAuto = bAutoHyphen || rAttr.IsHyphen();
if( bAuto || bInterHyph )
{
const sal_Int16 nMinimalLeading = std::max(rAttr.GetMinLead(), sal_uInt8(2));
@@ -1320,8 +1325,8 @@ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyphen )
return bAuto;
}
-void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool bNewInterHyph,
- const sal_Bool bNewQuick, const sal_Bool bTst )
+void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const bool bNewInterHyph,
+ const bool bNewQuick, const bool bTst )
{
CtorInitTxtPaintInfo( pNewFrm, SwRect() );
@@ -1334,10 +1339,10 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b
nMinWordLength = 0;
bAutoHyph = InitHyph();
- bIgnoreFly = sal_False;
- bFakeLineStart = sal_False;
- bShift = sal_False;
- bDropInit = sal_False;
+ bIgnoreFly = false;
+ bFakeLineStart = false;
+ bShift = false;
+ bDropInit = false;
bTestFormat = bTst;
nLeft = 0;
nRight = 0;
@@ -1359,22 +1364,23 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const sal_Bool b
* If we do not do interactive hyphenation, we only hyphenate if ParaFmt is
* set to automatic hyphenation.
*************************************************************************/
-sal_Bool SwTxtFormatInfo::IsHyphenate() const
+bool SwTxtFormatInfo::IsHyphenate() const
{
if( !bInterHyph && !bAutoHyph )
- return sal_False;
+ return false;
LanguageType eTmp = GetFont()->GetLanguage();
if( LANGUAGE_DONTKNOW == eTmp || LANGUAGE_NONE == eTmp )
- return sal_False;
+ return false;
uno::Reference< XHyphenator > xHyph = ::GetHyphenator();
- if (bInterHyph && xHyph.is())
+ if (!xHyph.is())
+ return false;
+
+ if (bInterHyph)
SvxSpellWrapper::CheckHyphLang( xHyph, eTmp );
- if( !xHyph.is() || !xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) ) )
- return sal_False;
- return sal_True;
+ return xHyph->hasLocale( g_pBreakIt->GetLocale(eTmp) );
}
/*************************************************************************
@@ -1396,7 +1402,7 @@ void SwTxtFormatInfo::Init()
// Not initialized: pRest, nLeft, nRight, nFirst, nRealWidth
X(0);
bArrowDone = bFull = bFtnDone = bErgoDone = bNumDone = bNoEndHyph =
- bNoMidHyph = bStop = bNewLine = bUnderFlow = bTabOverflow = sal_False;
+ bNoMidHyph = bStop = bNewLine = bUnderFlow = bTabOverflow = false;
// generally we do not allow number portions in follows, except...
if ( GetTxtFrm()->IsFollow() )
@@ -1439,7 +1445,7 @@ void SwTxtFormatInfo::Init()
SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
SwLineLayout& rLay, SwTwips nActWidth ) : SwTxtPaintInfo( rInf ),
- bTabOverflow( sal_False )
+ bTabOverflow( false )
{
pRoot = &rLay;
pLast = &rLay;
@@ -1464,23 +1470,23 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
nMinLeading = 0;
nMinTrailing = 0;
nMinWordLength = 0;
- bFull = sal_False;
- bFtnDone = sal_True;
- bErgoDone = sal_True;
- bNumDone = sal_True;
- bArrowDone = sal_True;
- bStop = sal_False;
- bNewLine = sal_True;
- bShift = sal_False;
- bUnderFlow = sal_False;
- bInterHyph = sal_False;
- bAutoHyph = sal_False;
- bDropInit = sal_False;
+ bFull = false;
+ bFtnDone = true;
+ bErgoDone = true;
+ bNumDone = true;
+ bArrowDone = true;
+ bStop = false;
+ bNewLine = true;
+ bShift = false;
+ bUnderFlow = false;
+ bInterHyph = false;
+ bAutoHyph = false;
+ bDropInit = false;
bQuick = rInf.bQuick;
- bNoEndHyph = sal_False;
- bNoMidHyph = sal_False;
- bIgnoreFly = sal_False;
- bFakeLineStart = sal_False;
+ bNoEndHyph = false;
+ bNoMidHyph = false;
+ bIgnoreFly = false;
+ bFakeLineStart = false;
cTabDecimal = 0;
cHookChar = 0;
@@ -1489,23 +1495,20 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
SetMulti( true );
SetFirstMulti( rInf.IsFirstMulti() );
}
-sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
+
+bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
{
- KSHORT nHeight = pCurr->GetRealHeight();
- SwLinePortion *pPor = pCurr->GetPortion();
- sal_Bool bRet = sal_False;
- while( pPor )
+ const KSHORT nHeight = pCurr->GetRealHeight();
+ for( SwLinePortion *pPor = pCurr->GetPortion(); pPor; pPor = pPor->GetPortion() )
{
if( pPor->IsFtnPortion() && nHeight > ((SwFtnPortion*)pPor)->Orig() )
{
- bRet = sal_True;
SetLineHeight( nHeight );
SetLineNettoHeight( pCurr->Height() );
- break;
+ return true;
}
- pPor = pPor->GetPortion();
}
- return bRet;
+ return false;
}
sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
@@ -1604,15 +1607,15 @@ sal_Int32 SwTxtFormatInfo::ScanPortionEnd( const sal_Int32 nStart,
return i;
}
-sal_Bool SwTxtFormatInfo::LastKernPortion()
+bool SwTxtFormatInfo::LastKernPortion()
{
if( GetLast() )
{
- if( GetLast()->IsKernPortion() )
- return sal_True;
+ if( GetLast()->IsKernPortion() )
+ return true;
if( GetLast()->Width() || ( GetLast()->GetLen() &&
!GetLast()->IsHolePortion() ) )
- return sal_False;
+ return false;
}
SwLinePortion* pPor = GetRoot();
SwLinePortion *pKern = NULL;
@@ -1627,9 +1630,9 @@ sal_Bool SwTxtFormatInfo::LastKernPortion()
if( pKern )
{
SetLast( pKern );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
SwTxtSlot::SwTxtSlot(
@@ -1646,7 +1649,7 @@ SwTxtSlot::SwTxtSlot(
if( pCh )
{
aTxt = OUString( pCh, strlen(pCh), RTL_TEXTENCODING_MS_1252 );
- bOn = sal_True;
+ bOn = true;
}
else
bOn = pPor->GetExpTxt( *pNew, aTxt );
@@ -1737,7 +1740,7 @@ SwFontSave::SwFontSave( const SwTxtSizeInfo &rInf, SwFont *pNew,
( pNew->GetBackColor() && pFnt->GetBackColor() &&
( *pNew->GetBackColor() != *pFnt->GetBackColor() ) ) )
{
- pNew->SetTransparent( sal_True );
+ pNew->SetTransparent( true );
pNew->SetAlign( ALIGN_BASELINE );
pInf->SetFont( pNew );
}
@@ -1820,9 +1823,9 @@ SwDefFontSave::~SwDefFontSave()
}
}
-sal_Bool SwTxtFormatInfo::ChgHyph( const sal_Bool bNew )
+bool SwTxtFormatInfo::ChgHyph( const bool bNew )
{
- const sal_Bool bOld = bAutoHyph;
+ const bool bOld = bAutoHyph;
if( bAutoHyph != bNew )
{
bAutoHyph = bNew;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index d5f1d37..e44d8e7 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -67,7 +67,7 @@ class SwWrongList;
#ifdef DBG_UTIL
#define OPTDBG( rInf ) (rInf).IsOptDbg()
#else
-#define OPTDBG( rInf ) sal_False
+#define OPTDBG( rInf ) false
#endif
/*************************************************************************
@@ -102,7 +102,7 @@ public:
// vertical alignment
inline sal_uInt16 GetVertAlign() const { return nVertAlign; }
- inline bool HasSpecialAlign( sal_Bool bVert ) const
+ inline bool HasSpecialAlign( bool bVert ) const
{ return bVert ?
( SvxParaVertAlignItem::BASELINE != nVertAlign ) :
( SvxParaVertAlignItem::BASELINE != nVertAlign &&
@@ -276,7 +276,7 @@ public:
inline void SetSnapToGrid( const bool bN ) { m_bSnapToGrid = bN; }
inline sal_uInt8 GetDirection() const { return m_nDirection; }
inline void SetDirection( const sal_uInt8 nNew ) { m_nDirection = nNew; }
- inline sal_Bool IsRotated() const { return 0 != ( 1 & m_nDirection ); }
+ inline bool IsRotated() const { return ( 1 & m_nDirection ); }
inline SwViewShell *GetVsh() { return m_pVsh; }
inline const SwViewShell *GetVsh() const { return m_pVsh; }
@@ -338,7 +338,7 @@ public:
friend SvStream & WriteSwTxtSizeInfo( SvStream &rOS, const SwTxtSizeInfo &rInf );
// No Bullets for the symbol font!
- inline sal_Bool IsNoSymbol() const
+ inline bool IsNoSymbol() const
{ return RTL_TEXTENCODING_SYMBOL != m_pFnt->GetCharSet( m_pFnt->GetActual() ); }
void NoteAnimation() const;
@@ -347,9 +347,9 @@ public:
inline SwTxtFrm *GetTxtFrm() { return m_pFrm; }
inline const SwTxtFrm *GetTxtFrm() const { return m_pFrm; }
- inline sal_Bool HasHint( sal_Int32 nPos ) const
+ inline bool HasHint( sal_Int32 nPos ) const
{ return _HasHint( m_pFrm->GetTxtNode(), nPos ); }
- static sal_Bool _HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos );
+ static bool _HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos );
// If Kana Compression is enabled, a minimum and maximum portion width
// is calculated. We format lines with minimal size and share remaining
@@ -373,9 +373,9 @@ public:
{
m_aMaxWidth.clear();
};
- inline sal_Bool CompressLine()
+ inline bool CompressLine()
{
- return (sal_Bool)!m_aMaxWidth.empty();
+ return !m_aMaxWidth.empty();
};
//
@@ -392,7 +392,7 @@ public:
? (*m_pKanaComp)[m_nKanaIdx] : 0; }
#ifdef DBG_UTIL
- sal_Bool IsOptDbg() const;
+ bool IsOptDbg() const;
#endif
};
@@ -415,9 +415,9 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
MSHORT nSpaceIdx;
void _DrawText( const OUString &rText, const SwLinePortion &rPor,
const sal_Int32 nIdx, const sal_Int32 nLen,
- const sal_Bool bKern, const sal_Bool bWrong = sal_False,
- const sal_Bool bSmartTag = sal_False,
- const sal_Bool bGrammarCheck = sal_False ); // SMARTTAGS
+ const bool bKern, const bool bWrong = false,
+ const bool bSmartTag = false,
+ const bool bGrammarCheck = false ); // SMARTTAGS
SwTxtPaintInfo &operator=(const SwTxtPaintInfo&);
void _NotifyURL( const SwLinePortion &rPor ) const;
@@ -460,21 +460,21 @@ public:
inline void DrawText( const OUString &rText, const SwLinePortion &rPor,
const sal_Int32 nIdx = 0,
const sal_Int32 nLen = COMPLETE_STRING,
- const sal_Bool bKern = sal_False) const;
+ const bool bKern = false) const;
inline void DrawText( const SwLinePortion &rPor, const sal_Int32 nLen,
- const sal_Bool bKern = sal_False ) const;
+ const bool bKern = false ) const;
inline void DrawMarkedText( const SwLinePortion &rPor, const sal_Int32 nLen,
- const sal_Bool bKern,
- const sal_Bool bWrong,
- const sal_Bool bSmartTags,
- const sal_Bool bGrammarCheck ) const;
+ const bool bKern,
+ const bool bWrong,
+ const bool bSmartTags,
+ const bool bGrammarCheck ) const;
- void DrawRect( const SwRect &rRect, sal_Bool bNoGraphic = sal_False,
- sal_Bool bRetouche = sal_True ) const;
+ void DrawRect( const SwRect &rRect, bool bNoGraphic = false,
+ bool bRetouche = true ) const;
void DrawTab( const SwLinePortion &rPor ) const;
void DrawLineBreak( const SwLinePortion &rPor ) const;
void DrawRedArrow( const SwLinePortion &rPor ) const;
- void DrawPostIts( const SwLinePortion &rPor, sal_Bool bScript ) const;
+ void DrawPostIts( const SwLinePortion &rPor, bool bScript ) const;
void DrawBackground( const SwLinePortion &rPor ) const;
void DrawViewOpt( const SwLinePortion &rPor, const MSHORT nWhich ) const;
void DrawBackBrush( const SwLinePortion &rPor ) const;
@@ -574,41 +574,41 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
sal_Int16 nMinTrailing; // minimum number of chars after hyphenation point
sal_Int16 nMinWordLength; // minimum length of word to be hyphenated
- sal_Bool bFull : 1; // Line is full
- sal_Bool bFtnDone : 1; // Ftn already formatted
- sal_Bool bErgoDone : 1; // ErgoDone already formatted
- sal_Bool bNumDone : 1; // bNumDone already formatted
- sal_Bool bArrowDone : 1; // Arrow to the left for scrolling paragraphs
- sal_Bool bStop : 1; // Cancel immediately, discarding the line
- sal_Bool bNewLine : 1; // Format another line
- sal_Bool bShift : 1; // Position change: Repaint until further notice
- sal_Bool bUnderFlow : 1; // Context: UnderFlow() ?
- sal_Bool bInterHyph: 1; // Interactive hyphenation?
- sal_Bool bAutoHyph : 1; // Automatic hyphenation?
- sal_Bool bDropInit : 1; // Set DropWidth
- sal_Bool bQuick : 1; // FormatQuick()
- sal_Bool bNoEndHyph : 1; // Switch off hyphenation at the line end (due to MaxHyphens)
- sal_Bool bNoMidHyph : 1; // Switch off hyphenation before flys (due to MaxHyphens)
- sal_Bool bIgnoreFly: 1; // FitToContent ignores flys
- sal_Bool bFakeLineStart: 1; // String has been replaced by field portion
+ bool bFull : 1; // Line is full
+ bool bFtnDone : 1; // Ftn already formatted
+ bool bErgoDone : 1; // ErgoDone already formatted
+ bool bNumDone : 1; // bNumDone already formatted
+ bool bArrowDone : 1; // Arrow to the left for scrolling paragraphs
+ bool bStop : 1; // Cancel immediately, discarding the line
+ bool bNewLine : 1; // Format another line
+ bool bShift : 1; // Position change: Repaint until further notice
+ bool bUnderFlow : 1; // Context: UnderFlow() ?
+ bool bInterHyph : 1; // Interactive hyphenation?
+ bool bAutoHyph : 1; // Automatic hyphenation?
+ bool bDropInit : 1; // Set DropWidth
+ bool bQuick : 1; // FormatQuick()
+ bool bNoEndHyph : 1; // Switch off hyphenation at the line end (due to MaxHyphens)
+ bool bNoMidHyph : 1; // Switch off hyphenation before flys (due to MaxHyphens)
+ bool bIgnoreFly : 1; // FitToContent ignores flys
+ bool bFakeLineStart : 1; // String has been replaced by field portion
// info structure only pretends that we are at
// the beginning of a line
- sal_Bool bTabOverflow; // Tabs are expanding after the end margin
+ bool bTabOverflow : 1; // Tabs are expanding after the end margin
+ bool bTestFormat : 1; // Test formatting from WouldFit, no notification etc.
sal_Unicode cTabDecimal; // the current decimal delimiter
sal_Unicode cHookChar; // For tabs in fields etc.
sal_uInt8 nMaxHyph; // Max. line count of followup hyphenations
- sal_Bool bTestFormat; // Test formatting from WouldFit, no notification etc.
// Hyphenating ...
- sal_Bool InitHyph( const sal_Bool bAuto = sal_False );
- sal_Bool _CheckFtnPortion( SwLineLayout* pCurr );
+ bool InitHyph( const bool bAuto = false );
+ bool _CheckFtnPortion( SwLineLayout* pCurr );
public:
- void CtorInitTxtFormatInfo( SwTxtFrm *pFrm, const sal_Bool bInterHyph = sal_False,
- const sal_Bool bQuick = sal_False, const sal_Bool bTst = sal_False );
- inline SwTxtFormatInfo(SwTxtFrm *pFrame,const sal_Bool bInterHyphL=sal_False,
- const sal_Bool bQuickL = sal_False, const sal_Bool bTst = sal_False )
+ void CtorInitTxtFormatInfo( SwTxtFrm *pFrm, const bool bInterHyph = false,
+ const bool bQuick = false, const bool bTst = false );
+ inline SwTxtFormatInfo(SwTxtFrm *pFrame, const bool bInterHyphL = false,
+ const bool bQuickL = false, const bool bTst = false)
{ CtorInitTxtFormatInfo( pFrame, bInterHyphL, bQuickL, bTst ); }
// For the formatting inside a double line in a line (multi-line portion)
@@ -644,35 +644,35 @@ public:
inline void SetRoot( SwLineLayout *pNew ) { pRoot = pNew; }
inline SwLinePortion *GetLast() { return pLast; }
inline void SetLast( SwLinePortion *pNewLast ) { pLast = pNewLast; }
- inline sal_Bool IsFull() const { return bFull; }
- inline void SetFull( const sal_Bool bNew ) { bFull = bNew; }
- inline sal_Bool IsHyphForbud() const
+ inline bool IsFull() const { return bFull; }
+ inline void SetFull( const bool bNew ) { bFull = bNew; }
+ inline bool IsHyphForbud() const
{ return pFly ? bNoMidHyph : bNoEndHyph; }
- inline void SetHyphForbud( const sal_Bool bNew )
+ inline void SetHyphForbud( const bool bNew )
{ if ( pFly ) bNoMidHyph = bNew; else bNoEndHyph = bNew; }
inline void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid )
{ bNoEndHyph = (nMaxHyph && bEnd >= nMaxHyph);
bNoMidHyph = (nMaxHyph && bMid >= nMaxHyph); }
- inline sal_Bool IsIgnoreFly() const { return bIgnoreFly; }
- inline void SetIgnoreFly( const sal_Bool bNew ) { bIgnoreFly = bNew; }
- inline sal_Bool IsFakeLineStart() const { return bFakeLineStart; }
- inline void SetFakeLineStart( const sal_Bool bNew ) { bFakeLineStart = bNew; }
- inline sal_Bool IsStop() const { return bStop; }
- inline void SetStop( const sal_Bool bNew ) { bStop = bNew; }
+ inline bool IsIgnoreFly() const { return bIgnoreFly; }
+ inline void SetIgnoreFly( const bool bNew ) { bIgnoreFly = bNew; }
+ inline bool IsFakeLineStart() const { return bFakeLineStart; }
+ inline void SetFakeLineStart( const bool bNew ) { bFakeLineStart = bNew; }
+ inline bool IsStop() const { return bStop; }
+ inline void SetStop( const bool bNew ) { bStop = bNew; }
inline SwLinePortion *GetRest() { return pRest; }
inline void SetRest( SwLinePortion *pNewRest ) { pRest = pNewRest; }
- inline sal_Bool IsNewLine() const { return bNewLine; }
- inline void SetNewLine( const sal_Bool bNew ) { bNewLine = bNew; }
- inline sal_Bool IsShift() const { return bShift; }
- inline void SetShift( const sal_Bool bNew ) { bShift = bNew; }
- inline sal_Bool IsInterHyph() const { return bInterHyph; }
- inline sal_Bool IsAutoHyph() const { return bAutoHyph; }
- inline sal_Bool IsUnderFlow() const { return bUnderFlow; }
- inline void ClrUnderFlow() { bUnderFlow = sal_False; }
- inline sal_Bool IsDropInit() const { return bDropInit; }
- inline void SetDropInit( const sal_Bool bNew ) { bDropInit = bNew; }
- inline sal_Bool IsQuick() const { return bQuick; }
- inline sal_Bool IsTest() const { return bTestFormat; }
+ inline bool IsNewLine() const { return bNewLine; }
+ inline void SetNewLine( const bool bNew ) { bNewLine = bNew; }
+ inline bool IsShift() const { return bShift; }
+ inline void SetShift( const bool bNew ) { bShift = bNew; }
+ inline bool IsInterHyph() const { return bInterHyph; }
+ inline bool IsAutoHyph() const { return bAutoHyph; }
+ inline bool IsUnderFlow() const { return bUnderFlow; }
+ inline void ClrUnderFlow() { bUnderFlow = false; }
+ inline bool IsDropInit() const { return bDropInit; }
+ inline void SetDropInit( const bool bNew ) { bDropInit = bNew; }
+ inline bool IsQuick() const { return bQuick; }
+ inline bool IsTest() const { return bTestFormat; }
inline sal_Int32 GetLineStart() const { return nLineStart; }
inline void SetLineStart( const sal_Int32 nNew ) { nLineStart = nNew; }
@@ -686,7 +686,7 @@ public:
inline const SwLinePortion *GetUnderFlow() const { return pUnderFlow; }
inline SwLinePortion *GetUnderFlow() { return pUnderFlow; }
inline void SetUnderFlow( SwLinePortion *pNew )
- { pUnderFlow = pNew; bUnderFlow = sal_True; }
+ { pUnderFlow = pNew; bUnderFlow = true; }
inline sal_Int32 GetSoftHyphPos() const { return nSoftHyphPos; }
inline void SetSoftHyphPos( const sal_Int32 nNew ) { nSoftHyphPos = nNew; }
@@ -713,21 +713,21 @@ public:
inline sal_Unicode GetHookChar() const { return cHookChar; }
// Done-Flags
- inline sal_Bool IsFtnDone() const { return bFtnDone; }
- inline void SetFtnDone( const sal_Bool bNew ) { bFtnDone = bNew; }
- inline sal_Bool IsErgoDone() const { return bErgoDone; }
- inline void SetErgoDone( const sal_Bool bNew ) { bErgoDone = bNew; }
- inline sal_Bool IsNumDone() const { return bNumDone; }
- inline void SetNumDone( const sal_Bool bNew ) { bNumDone = bNew; }
- inline sal_Bool IsArrowDone() const { return bArrowDone; }
- inline void SetArrowDone( const sal_Bool bNew ) { bArrowDone = bNew; }
+ inline bool IsFtnDone() const { return bFtnDone; }
+ inline void SetFtnDone( const bool bNew ) { bFtnDone = bNew; }
+ inline bool IsErgoDone() const { return bErgoDone; }
+ inline void SetErgoDone( const bool bNew ) { bErgoDone = bNew; }
+ inline bool IsNumDone() const { return bNumDone; }
+ inline void SetNumDone( const bool bNew ) { bNumDone = bNew; }
+ inline bool IsArrowDone() const { return bArrowDone; }
+ inline void SetArrowDone( const bool bNew ) { bArrowDone = bNew; }
// For SwTxtPortion::Hyphenate
- inline sal_Bool IsSoftHyph( const sal_Int32 nPos ) const;
- sal_Bool ChgHyph( const sal_Bool bNew );
+ inline bool IsSoftHyph( const sal_Int32 nPos ) const;
+ bool ChgHyph( const bool bNew );
// Should the hyphenate helper be discarded?
- sal_Bool IsHyphenate() const;
+ bool IsHyphenate() const;
inline sal_Int32 GetUnderScorePos() const { return nUnderScorePos; }
inline void SetUnderScorePos( sal_Int32 nNew ) { nUnderScorePos = nNew; }
@@ -738,7 +738,7 @@ public:
const com::sun::star::beans::PropertyValues &
GetHyphValues() const;
- sal_Bool CheckFtnPortion( SwLineLayout* pCurr )
+ bool CheckFtnPortion( SwLineLayout* pCurr )
{ return IsFtnInside() && _CheckFtnPortion( pCurr ); }
// Dropcaps called by SwTxtFormatter::CTOR
@@ -748,7 +748,7 @@ public:
void Reset( const SwTxtFrm *pFrame); // , const sal_Bool bAll );
// Sets the last SwKernPortion as pLast, if it is followed by empty portions
- sal_Bool LastKernPortion();
+ bool LastKernPortion();
// Looks for tabs, TabDec, TXTATR and BRK from nIdx until nEnd.
// Return: Position; sets cHookChar if necessary
@@ -756,8 +756,8 @@ public:
friend SvStream & WriteSwTxtFormatInfo( SvStream &rOS, const SwTxtFormatInfo &rInf );
- inline void SetTabOverflow( sal_Bool bOverflow ) { bTabOverflow = bOverflow; }
- inline sal_Bool IsTabOverflow( ) { return bTabOverflow; }
+ inline void SetTabOverflow( bool bOverflow ) { bTabOverflow = bOverflow; }
+ inline bool IsTabOverflow() { return bTabOverflow; }
};
/*************************************************************************
@@ -777,7 +777,7 @@ class SwTxtSlot
SwWrongList* pTempList;
sal_Int32 nIdx;
sal_Int32 nLen;
- sal_Bool bOn;
+ bool bOn;
protected:
SwTxtSizeInfo *pInf;
public:
@@ -786,7 +786,7 @@ public:
SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, bool bTxtLen,
bool bExgLists, const sal_Char *pCh = NULL );
~SwTxtSlot();
- inline sal_Bool IsOn() const { return bOn; }
+ inline bool IsOn() const { return bOn; }
};
/*************************************************************************
@@ -866,23 +866,23 @@ inline void SwTxtPaintInfo::SetPaintOfst( const SwTwips nNew )
inline void SwTxtPaintInfo::DrawText( const OUString &rText,
const SwLinePortion &rPor,
const sal_Int32 nStart, const sal_Int32 nLength,
- const sal_Bool bKern ) const
+ const bool bKern ) const
{
((SwTxtPaintInfo*)this)->_DrawText( rText, rPor, nStart, nLength, bKern );
}
inline void SwTxtPaintInfo::DrawText( const SwLinePortion &rPor,
- const sal_Int32 nLength, const sal_Bool bKern ) const
+ const sal_Int32 nLength, const bool bKern ) const
{
((SwTxtPaintInfo*)this)->_DrawText( *m_pTxt, rPor, m_nIdx, nLength, bKern );
}
inline void SwTxtPaintInfo::DrawMarkedText( const SwLinePortion &rPor,
const sal_Int32 nLength,
- const sal_Bool bKern,
- const sal_Bool bWrong,
- const sal_Bool bSmartTags,
- const sal_Bool bGrammarCheck ) const
+ const bool bKern,
+ const bool bWrong,
+ const bool bSmartTags,
+ const bool bGrammarCheck ) const
{
((SwTxtPaintInfo*)this)->_DrawText( *m_pTxt, rPor, m_nIdx, nLength, bKern, bWrong, bSmartTags, bGrammarCheck );
}
@@ -903,10 +903,10 @@ inline const SwAttrSet& SwTxtFormatInfo::GetCharAttr() const
inline void SwTxtFormatInfo::SetParaFtn()
{
- GetTxtFrm()->SetFtn( sal_True );
+ GetTxtFrm()->SetFtn( true );
}
-inline sal_Bool SwTxtFormatInfo::IsSoftHyph( const sal_Int32 nPos ) const
+inline bool SwTxtFormatInfo::IsSoftHyph( const sal_Int32 nPos ) const
{
return CHAR_SOFTHYPHEN == GetTxtFrm()->GetTxtNode()->GetTxt()[nPos];
}
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 66be8a5..3689755 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -112,10 +112,10 @@ void SwExpandPortion::Paint( const SwTxtPaintInfo &rInf ) const
// ST2
if ( rInf.GetSmartTags() || rInf.GetGrammarCheckList() )
- rInf.DrawMarkedText( *this, rInf.GetLen(), sal_False, sal_False,
+ rInf.DrawMarkedText( *this, rInf.GetLen(), false, false,
0 != rInf.GetSmartTags(), 0 != rInf.GetGrammarCheckList() );
else
- rInf.DrawText( *this, rInf.GetLen(), sal_False );
+ rInf.DrawText( *this, rInf.GetLen(), false );
if( GetJoinBorderWithPrev() || GetJoinBorderWithNext() )
*const_cast<SwTxtPaintInfo&>(rInf).GetFont() = aOldFont;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index b3fa0e8..7495788 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -182,7 +182,7 @@ SwFldSlot::~SwFldSlot()
pInf->SetTxt( *pOldTxt );
pInf->SetIdx( nIdx );
pInf->SetLen( nLen );
- pInf->SetFakeLineStart( sal_False );
+ pInf->SetFakeLineStart( false );
}
}
@@ -726,7 +726,7 @@ static sal_Char const sDoubleSpace[] = " ";
pThis->Width( nOldWidth - nSpaceOffs + 12 );
{
SwTxtSlot aDiffTxt( &aInf, this, true, false, sDoubleSpace );
- aInf.DrawText( *this, aInf.GetLen(), sal_True );
+ aInf.DrawText( *this, aInf.GetLen(), true );
}
}
pThis->Width( nOldWidth );
@@ -835,11 +835,11 @@ sal_Bool SwGrfNumPortion::Format( SwTxtFormatInfo &rInf )
{
SetLen( 0 );
SetNoPaint( sal_True );
- rInf.SetNumDone( sal_False );
+ rInf.SetNumDone( false );
return sal_True;
}
}
- rInf.SetNumDone( sal_True );
+ rInf.SetNumDone( true );
// long nDiff = rInf.Left() - rInf.First() + rInf.ForcedLeftMargin();
long nDiff = mbLabelAlignmentPosAndSpaceModeActive
? 0
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index b306a43..e5e385d 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -119,7 +119,7 @@ sal_Bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
else
{
if( !rInf.GetFly() )
- rInf.SetNewLine( sal_True );
+ rInf.SetNewLine( true );
Width(0);
SetAscent(0);
SetLen(0);
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index aea370b..b57195b 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -94,7 +94,7 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
comphelper::string::padToLength(aBuf, GetFixWidth() / GetLen(), ' ');
OUString aTxt(aBuf.makeStringAndClear());
SwTxtPaintInfo aInf( rInf, &aTxt );
- aInf.DrawText( *this, aTxt.getLength(), sal_True );
+ aInf.DrawText( *this, aTxt.getLength(), true );
}
if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
@@ -116,12 +116,12 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
aBulletPor.Width( aBulletSize.Width() );
aBulletPor.Height( aBulletSize.Height() );
aBulletPor.SetAscent( GetAscent() );
- aInf.DrawText( aBulletPor, aBullet.getLength(), sal_True );
+ aInf.DrawText( aBulletPor, aBullet.getLength(), true );
}
else
{
SwTxtSlot aSlot( &rInf, this, true, false );
- rInf.DrawText( *this, rInf.GetLen(), sal_True );
+ rInf.DrawText( *this, rInf.GetLen(), true );
}
}
}
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 72a175f..51e2bfc 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -111,7 +111,7 @@ sal_Bool SwBreakPortion::Format( SwTxtFormatInfo &rInf )
Height( pRoot->Height() );
SetAscent( pRoot->GetAscent() );
if ( rInf.GetIdx()+1 == rInf.GetTxt().getLength() )
- rInf.SetNewLine( sal_True );
+ rInf.SetNewLine( true );
return sal_True;
}
@@ -170,7 +170,7 @@ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
rInf.CalcRect( *this, &aClipRect, 0 );
SwSaveClip aClip( (OutputDevice*)rInf.GetOut() );
aClip.ChgClip( aClipRect, 0 );
- rInf.DrawText( aTxtDouble, *this, 0, 2, sal_True );
+ rInf.DrawText( aTxtDouble, *this, 0, 2, true );
}
}
}
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index a6871b4..4b72ac0 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -587,9 +587,9 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const
const bool bSmartTags = 0 != pSmarttags;
if ( bWrong || bSmartTags || bGrammarCheck )
- rInf.DrawMarkedText( *this, rInf.GetLen(), sal_False, bWrong, bSmartTags, bGrammarCheck );
+ rInf.DrawMarkedText( *this, rInf.GetLen(), false, bWrong, bSmartTags, bGrammarCheck );
else
- rInf.DrawText( *this, rInf.GetLen(), sal_False );
+ rInf.DrawText( *this, rInf.GetLen(), false );
}
}
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 3686c29..19207b2 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -133,11 +133,6 @@ SwDropPortion::~SwDropPortion()
pBlink->Delete( this );
}
-sal_Bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, sal_Int32 nPos )
-{
- return 0 != pTxtNode->GetTxtAttrForCharAt(nPos);
-}
-
/*************************************************************************
* SwTxtNode::GetDropLen()
*
@@ -1101,7 +1096,7 @@ sal_Bool SwDropPortion::Format( SwTxtFormatInfo &rInf )
bFull = SwTxtPortion::Format( rInf );
}
else
- rInf.SetDropInit( sal_True );
+ rInf.SetDropInit( true );
Height( rInf.GetTxtHeight() );
SetAscent( rInf.GetAscent() );
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index c98cd27..7031b54 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1873,7 +1873,7 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe
if ( pFrm->IsVertical() )
pFrm->SwapWidthAndHeight();
- SwTxtFormatInfo aInf( pFrm, sal_False, sal_True, sal_True );
+ SwTxtFormatInfo aInf( pFrm, false, true, true );
SwTxtFormatter aLine( pFrm, &aInf );
pFrm->_Format( aLine, aInf );
@@ -2123,8 +2123,8 @@ SwTwips SwTxtFrm::CalcFitToContent()
// #i31490#
SwTxtFrmLocker aLock( this );
- SwTxtFormatInfo aInf( this, sal_False, sal_True, sal_True );
- aInf.SetIgnoreFly( sal_True );
+ SwTxtFormatInfo aInf( this, false, true, true );
+ aInf.SetIgnoreFly( true );
SwTxtFormatter aLine( this, &aInf );
SwHookOut aHook( aInf );
@@ -2183,8 +2183,8 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset()
SwTxtFrmLocker aLock( this );
// simulate text formatting
- SwTxtFormatInfo aInf( this, sal_False, sal_True, sal_True );
- aInf.SetIgnoreFly( sal_True );
+ SwTxtFormatInfo aInf( this, false, true, true );
+ aInf.SetIgnoreFly( true );
SwTxtFormatter aLine( this, &aInf );
SwHookOut aHook( aInf );
aLine._CalcFitToContent();
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 6e66808..f32e0a0 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -910,7 +910,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
{
if( !pFtnCont )
{
- rInf.SetStop( sal_True );
+ rInf.SetStop( true );
UNDO_SWAP( pFrm )
return 0;
}
@@ -927,7 +927,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
SwFtnFrm* pTmpFrm = (SwFtnFrm*)pFtnC->Lower();
if( pTmpFrm && *pTmpFrm < pFtn )
{
- rInf.SetStop( sal_True );
+ rInf.SetStop( true );
UNDO_SWAP( pFrm )
return 0;
}
@@ -955,7 +955,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
// Wir sind in der letzte Zeile und die Fussnote
// ist auf eine andere Seite gewandert, dann wollen
// wir mit ...
- rInf.SetStop( sal_True );
+ rInf.SetStop( true );
UNDO_SWAP( pFrm )
return 0;
}
@@ -1435,7 +1435,7 @@ sal_Bool SwFtnPortion::Format( SwTxtFormatInfo &rInf )
// an underflow during SwTxtGuess::Guess
rInf.SetFakeLineStart( rInf.GetIdx() > rInf.GetLineStart() );
sal_Bool bFull = SwFldPortion::Format( rInf );
- rInf.SetFakeLineStart( sal_False );
+ rInf.SetFakeLineStart( false );
SetAscent( rInf.GetAscent() );
Height( rInf.GetTxtHeight() );
rInf.SetFtnDone( !bFull );
@@ -1561,7 +1561,7 @@ void SwQuoVadisPortion::Paint( const SwTxtPaintInfo &rInf ) const
rInf.DrawViewOpt( *this, POR_QUOVADIS );
SwTxtSlot aDiffTxt( &rInf, this, true, false );
SwFontSave aSave( rInf, pFnt );
- rInf.DrawText( *this, rInf.GetLen(), sal_True );
+ rInf.DrawText( *this, rInf.GetLen(), true );
}
}
@@ -1598,7 +1598,7 @@ sal_Bool SwErgoSumPortion::Format( SwTxtFormatInfo &rInf )
{
sal_Bool bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
- rInf.SetErgoDone( sal_True );
+ rInf.SetErgoDone( true );
// 8317: keine mehrzeiligen Felder bei QuoVadis und ErgoSum
if( bFull && rInf.GetRest() )
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index cb1a4fb..9e7da94 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -83,7 +83,7 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
if ( IsVertical() )
SwapWidthAndHeight();
- SwTxtFormatInfo aInf( this, sal_True ); // sal_True fuer interactive hyph!
+ SwTxtFormatInfo aInf( this, true ); // true for interactive hyph!
SwTxtFormatter aLine( this, &aInf );
aLine.CharToLine( rHyphInf.nStart );
// Wenn wir innerhalb des ersten Wortes einer Zeile stehen, so koennte
@@ -500,7 +500,7 @@ sal_Bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
if( rInf.GetSoftHyphPos() )
return sal_True;
- const sal_Bool bHyph = rInf.ChgHyph( sal_True );
+ const bool bHyph = rInf.ChgHyph( true );
if( rInf.IsHyphenate() )
{
rInf.SetSoftHyphPos( rInf.GetIdx() );
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index a466b66..1e5eb63 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -434,7 +434,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
{
bFull = false;
if ( bTabOverflow && !IsAutoTabStop() )
- rInf.SetTabOverflow( sal_True );
+ rInf.SetTabOverflow( true );
}
break;
@@ -620,7 +620,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
KSHORT nChar = Width() / nCharWidth;
OUStringBuffer aBuf;
comphelper::string::padToLength(aBuf, nChar, ' ');
- rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True);
+ rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, true);
}
}
@@ -639,7 +639,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
++nChar; // to avoid gaps (Bug 13430)
OUStringBuffer aBuf;
comphelper::string::padToLength(aBuf, nChar, cFill);
- rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, sal_True);
+ rInf.DrawText(aBuf.makeStringAndClear(), *this, 0, nChar, true);
}
}
}
commit 31ae7d511b6d6f643ee7f25388c0cc41c272d50f
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 19:54:50 2014 +0100
sal_Bool to bool
Change-Id: Ia0a2183a3175ce1285c8d46a03a69702cbb8685c
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 2866886..7524943 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -50,14 +50,14 @@ using namespace ::com::sun::star::linguistic2;
* otherwise possible break or hyphenation position is determined
*************************************************************************/
-sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
+bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
const KSHORT nPorHeight )
{
nCutPos = rInf.GetIdx();
// Empty strings are always 0
if( !rInf.GetLen() || rInf.GetTxt().isEmpty() )
- return sal_False;
+ return false;
OSL_ENSURE( rInf.GetIdx() < rInf.GetTxt().getLength(),
"+SwTxtGuess::Guess: invalid SwTxtFormatInfo" );
@@ -84,7 +84,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
nMaxLen = rInf.GetLen();
if( !nMaxLen )
- return sal_False;
+ return false;
KSHORT nItalic = 0;
if( ITALIC_NONE != rInf.GetFont()->GetItalic() && !rInf.NotEOL() )
@@ -145,7 +145,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
nBreakWidth += nLeftRightBorderSpace;
- return sal_True;
+ return true;
}
}
@@ -184,7 +184,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
rInf.GetTxtSize( &rSI, rInf.GetIdx(), nMaxLen, nMaxComp,
nBreakWidth, nMaxSizeDiff );
- // The following comparison should always give sal_True, otherwise
+ // The following comparison should always give true, otherwise
// there likely has been a pixel rounding error in GetTxtBreak
if ( nBreakWidth <= nLineWidth )
{
@@ -197,7 +197,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
nBreakWidth += nLeftRightBorderSpace;
- return sal_True;
+ return true;
}
}
@@ -207,7 +207,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
{
nBreakPos = rInf.GetIdx();
nCutPos = rInf.GetLen();
- return sal_False;
+ return false;
}
sal_Int32 nPorLen = 0;
@@ -347,12 +347,12 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
const ForbiddenCharacters aForbidden(
*rInf.GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->getForbiddenCharacters( aLang, true ) );
- const sal_Bool bAllowHanging = rInf.IsHanging() && ! rInf.IsMulti() &&
+ const bool bAllowHanging = rInf.IsHanging() && ! rInf.IsMulti() &&
! rPor.InFldGrp();
LineBreakUserOptions aUserOpt(
aForbidden.beginLine, aForbidden.endLine,
- rInf.HasForbiddenChars(), bAllowHanging, sal_False );
+ rInf.HasForbiddenChars(), bAllowHanging, false );
//! register listener to LinguServiceEvents now in order to get
//! notified about relevant changes in the future
@@ -523,7 +523,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
if( pHanging )
nBreakPos = nCutPos;
- return sal_False;
+ return false;
}
/*************************************************************************
@@ -540,7 +540,7 @@ bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
Boundary aBound =
g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nPos,
g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ),
- WordType::DICTIONARY_WORD, sal_True );
+ WordType::DICTIONARY_WORD, true );
nBreakStart = aBound.startPos;
sal_Int32 nWordLen = aBound.endPos - nBreakStart;
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 17b8480..dd6153f 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -47,7 +47,7 @@ public:
~SwTxtGuess() { delete pHanging; }
// true, if current portion still fits to current line
- sal_Bool Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
+ bool Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
const KSHORT nHeight );
bool AlternativeSpelling( const SwTxtFormatInfo &rInf, const sal_Int32 nPos );
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 3c460af..a6871b4 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -295,16 +295,16 @@ static bool lcl_HasContent( const SwFldPortion& rFld, SwTxtFormatInfo &rInf )
return rFld.GetExpTxt( rInf, aTxt ) && !aTxt.isEmpty();
}
-sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
+bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
{
// 5744: If only the hypen does not fit anymore, we still need to wrap
- // the word, or else return sal_True!
+ // the word, or else return true!
if( rInf.IsUnderFlow() && rInf.GetSoftHyphPos() )
{
// soft hyphen portion has triggered an underflow event because
// of an alternative spelling position
- sal_Bool bFull = sal_False;
- const sal_Bool bHyph = rInf.ChgHyph( sal_True );
+ bool bFull = false;
+ const bool bHyph = rInf.ChgHyph( true );
if( rInf.IsHyphenate() )
{
SwTxtGuess aGuess;
@@ -320,7 +320,7 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
}
SwTxtGuess aGuess;
- const sal_Bool bFull = !aGuess.Guess( *this, rInf, Height() );
+ const bool bFull = !aGuess.Guess( *this, rInf, Height() );
// these are the possible cases:
// A Portion fits to current line
@@ -372,9 +372,9 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
{
CreateHyphen( rInf, aGuess );
if ( rInf.GetFly() )
- rInf.GetRoot()->SetMidHyph( sal_True );
+ rInf.GetRoot()->SetMidHyph( true );
else
- rInf.GetRoot()->SetEndHyph( sal_True );
+ rInf.GetRoot()->SetEndHyph( true );
}
// case C1
// - Footnote portions with fake line start (i.e., not at beginning of line)
@@ -441,7 +441,7 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
( !bFirstPor || rInf.GetFly() || rInf.GetLast()->IsFlyPortion() ||
rInf.IsFirstMulti() ) &&
( !rInf.GetLast()->IsBlankPortion() || ((SwBlankPortion*)
- rInf.GetLast())->MayUnderFlow( rInf, rInf.GetIdx()-1, sal_True )))
+ rInf.GetLast())->MayUnderFlow( rInf, rInf.GetIdx()-1, true )))
{ // case C1 (former BreakUnderflow())
BreakUnderflow( rInf );
}
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index e45f1ac..75c5f35 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -34,7 +34,7 @@ class SwTxtPortion : public SwLinePortion
{
void BreakCut( SwTxtFormatInfo &rInf, const SwTxtGuess &rGuess );
void BreakUnderflow( SwTxtFormatInfo &rInf );
- sal_Bool _Format( SwTxtFormatInfo &rInf );
+ bool _Format( SwTxtFormatInfo &rInf );
public:
inline SwTxtPortion(){ SetWhichPor( POR_TXT ); }
commit ed68c388ef4f38ba8c5418f6a2bbc77733cfae42
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 19:13:04 2014 +0100
sal_Bool to bool
Change-Id: I353439bf7bd048423d30d0812f470b6ed1a29556
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index b8eb3d0..7cbbc41 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -95,15 +95,15 @@ private:
// a template, if we have to restart the attribute evaluation
SwFont* pFnt;
- sal_Bool bVertLayout;
+ bool bVertLayout;
// change font according to pool item
- void FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPush );
+ void FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush );
// push attribute to specified stack, returns true, if attribute has
// been pushed on top of stack (important for stacks containing different
// attributes with different priority and redlining)
- sal_Bool Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem );
+ bool Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem );
// apply top attribute on stack to font
void ActivateTop( SwFont& rFnt, sal_uInt16 nStackPos );
@@ -120,7 +120,7 @@ public:
void Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAttrSet,
const IDocumentSettingAccess& rIDocumentSettingAccess,
const SwViewShell* pShell, SwFont& rFnt,
- sal_Bool bVertLayout );
+ bool bVertLayout );
// remove everything from internal stacks, keep default data
void Reset( );
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 848f98b..d71ab45 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -195,7 +195,7 @@ bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr )
const SfxItemSet* pItemSet = CharFmt::GetItemSet( pAttr->GetAttr() );
if ( pItemSet )
- bRet = SFX_ITEM_SET == pItemSet->GetItemState( nWhich, sal_True );
+ bRet = SFX_ITEM_SET == pItemSet->GetItemState( nWhich, true );
return bRet;
}
@@ -240,7 +240,7 @@ static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr,
rInetAttr.SetVisited( false );
const SwCharFmt* pTmpFmt = ((SwTxtINetFmt&)rAttr).GetCharFmt();
const SfxPoolItem* pItem;
- pTmpFmt->GetItemState( RES_CHRATR_COLOR, sal_True, &pItem );
+ pTmpFmt->GetItemState( RES_CHRATR_COLOR, true, &pItem );
*pColor = ((SvxColorItem*)pItem)->GetValue();
rInetAttr.SetVisited( true );
}
@@ -383,8 +383,7 @@ sal_uInt16 SwAttrHandler::SwAttrStack::Pos( const SwTxtAttr& rAttr ) const
* SwAttrHandler::SwAttrHandler()
*************************************************************************/
-SwAttrHandler::SwAttrHandler() : mpShell( 0 ), pFnt( 0 ), bVertLayout( sal_False )
-
+SwAttrHandler::SwAttrHandler() : mpShell( 0 ), pFnt( 0 ), bVertLayout( false )
{
memset( pDefaultArray, 0, NUM_DEFAULT_VALUES * sizeof(SfxPoolItem*) );
}
@@ -406,13 +405,13 @@ void SwAttrHandler::Init( const SwAttrSet& rAttrSet,
mpShell = pSh;
for ( sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++ )
- pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, sal_True );
+ pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, true );
}
void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS,
const IDocumentSettingAccess& rIDocumentSettingAcces,
const SwViewShell* pSh,
- SwFont& rFnt, sal_Bool bVL )
+ SwFont& rFnt, bool bVL )
{
// initialize default array
memcpy( pDefaultArray, pPoolItem,
@@ -435,7 +434,7 @@ void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS,
if (isCHRATR(nWhich))
{
pDefaultArray[ StackPos[ nWhich ] ] = pItem;
- FontChg( *pItem, rFnt, sal_True );
+ FontChg( *pItem, rFnt, true );
}
if( aIter.IsAtEnd() )
@@ -487,10 +486,10 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
if ( lcl_ChgHyperLinkColor( rAttr, *pItem, mpShell, &aColor ) )
{
SvxColorItem aItemNext( aColor, RES_CHRATR_COLOR );
- FontChg( aItemNext, rFnt, sal_True );
+ FontChg( aItemNext, rFnt, true );
}
else
- FontChg( *pItem, rFnt, sal_True );
+ FontChg( *pItem, rFnt, true );
}
}
}
@@ -501,7 +500,7 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
{
if ( Push( rAttr, rAttr.GetAttr() ) )
// we let pItem change rFnt
- FontChg( rAttr.GetAttr(), rFnt, sal_True );
+ FontChg( rAttr.GetAttr(), rFnt, true );
}
}
@@ -509,14 +508,14 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
* SwAttrHandler::Push()
*************************************************************************/
-sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
+bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
{
OSL_ENSURE( rItem.Which() < RES_TXTATR_WITHEND_END,
"I do not want this attribute, nWhich >= RES_TXTATR_WITHEND_END" );
// robust
if ( RES_TXTATR_WITHEND_END <= rItem.Which() )
- return sal_False;
+ return false;
const sal_uInt16 nStack = StackPos[ rItem.Which() ];
@@ -529,13 +528,13 @@ sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
&& !lcl_ChgHyperLinkColor( *pTopAttr, rItem, mpShell, 0 ) ) )
{
aAttrStack[ nStack ].Push( rAttr );
- return sal_True;
+ return true;
}
const sal_uInt16 nPos = aAttrStack[ nStack ].Count();
OSL_ENSURE( nPos, "empty stack?" );
aAttrStack[ nStack ].Insert( rAttr, nPos - 1 );
- return sal_False;
+ return false;
}
/*************************************************************************
@@ -624,18 +623,18 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
if ( lcl_ChgHyperLinkColor( *pTopAt, *pItemNext, mpShell, &aColor ) )
{
SvxColorItem aItemNext( aColor, RES_CHRATR_COLOR );
- FontChg( aItemNext, rFnt, sal_False );
+ FontChg( aItemNext, rFnt, false );
}
else
- FontChg( *pItemNext, rFnt, sal_False );
+ FontChg( *pItemNext, rFnt, false );
}
else
- FontChg( pTopAt->GetAttr(), rFnt, sal_False );
+ FontChg( pTopAt->GetAttr(), rFnt, false );
}
// default value has to be set, we only have default values for char attribs
else if ( nStackPos < NUM_DEFAULT_VALUES )
- FontChg( *pDefaultArray[ nStackPos ], rFnt, sal_False );
+ FontChg( *pDefaultArray[ nStackPos ], rFnt, false );
else if ( RES_TXTATR_REFMARK == nAttr )
rFnt.GetRef()--;
else if ( RES_TXTATR_TOXMARK == nAttr )
@@ -649,7 +648,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
// ruby stack has no more attributes
// check, if an rotation attribute has to be applied
sal_uInt16 nTwoLineStack = StackPos[ RES_CHRATR_TWO_LINES ];
- sal_Bool bTwoLineAct = sal_False;
+ bool bTwoLineAct = false;
const SwTxtAttr* pTwoLineAttr = aAttrStack[ nTwoLineStack ].Top();
if ( pTwoLineAttr )
@@ -692,7 +691,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr )
* a font depending on the stack id.
*************************************************************************/
-void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPush )
+void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush )
{
switch ( rItem.Which() )
{
@@ -873,7 +872,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu
break;
sal_uInt16 nTwoLineStack = StackPos[ RES_CHRATR_TWO_LINES ];
- sal_Bool bTwoLineAct = sal_False;
+ bool bTwoLineAct = false;
const SwTxtAttr* pTwoLineAttr = aAttrStack[ nTwoLineStack ].Top();
if ( pTwoLineAttr )
@@ -899,9 +898,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu
// two line is activated, if
// 1. no ruby attribute is set and
// 2. attribute is active
- sal_Bool bTwoLineAct = ((SvxTwoLinesItem&)rItem).GetValue();
-
- if ( !bRuby && bTwoLineAct )
+ if ( !bRuby && ((SvxTwoLinesItem&)rItem).GetValue() )
{
rFnt.SetVertical( 0, bVertLayout );
break;
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 7870eaf..eb7c45f 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -64,13 +64,13 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
pFnt = new SwFont( *aFontAccess.Get()->GetFont() );
// set font to vertical if frame layout is vertical
- sal_Bool bVertLayout = sal_False;
- sal_Bool bRTL = sal_False;
+ bool bVertLayout = false;
+ bool bRTL = sal_False;
if ( pFrm )
{
if ( pFrm->IsVertical() )
{
- bVertLayout = sal_True;
+ bVertLayout = true;
pFnt->SetVertical( pFnt->GetOrientation(), sal_True );
}
bRTL = pFrm->IsRightToLeft();
commit b3059732a31e0b0a01c9bf69ebd89a8fe4439705
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 18:34:46 2014 +0100
sal_Bool to bool
Change-Id: I75ac690e9ad79e08df5682a403296f433a1e7fd5
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index b81064a..ea9ffe2 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -47,7 +47,7 @@ void SwTxtAdjuster::FormatBlock( )
const SwLinePortion *pFly = 0;
- sal_Bool bSkip = !IsLastBlock() &&
+ bool bSkip = !IsLastBlock() &&
nStart + pCurr->GetLen() >= GetInfo().GetTxt().getLength();
// Multi-line fields are tricky, because we need to check whether there are
@@ -61,7 +61,7 @@ void SwTxtAdjuster::FormatBlock( )
while( pPor && bSkip )
{
if( pPor->InTxtGrp() )
- bSkip = sal_False;
+ bSkip = false;
pPor = pPor->GetPortion();
}
pLay = bSkip ? pLay->GetNext() : 0;
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index e0e681a..ffbe4f6 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -50,7 +50,7 @@
// Not reentrant !!!
// is set in GetCharRect and is interpreted in UnitUp/Down.
-sal_Bool SwTxtCursor::bRightMargin = sal_False;
+bool SwTxtCursor::bRightMargin = false;
/*************************************************************************
@@ -418,11 +418,11 @@ void SwTxtCursor::CtorInitTxtCursor( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
// 1170: Ancient bug: Shift-End forgets the last character ...
-sal_Bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
+bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
SwCrsrMoveState* pCMS, const long nMax )
{
// 1170: Ambiguity of document positions
- bRightMargin = sal_True;
+ bRightMargin = true;
CharCrsrToLine(nOfst);
// Somehow twisted: nOfst names the position behind the last
@@ -431,7 +431,7 @@ sal_Bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
if( nOfst != GetStart() || !pCurr->GetLen() )
{
// 8810: Master line RightMargin, after that LeftMargin
- const sal_Bool bRet = GetCharRect( pOrig, nOfst, pCMS, nMax );
+ const bool bRet = GetCharRect( pOrig, nOfst, pCMS, nMax );
bRightMargin = nOfst >= GetEnd() && nOfst < GetInfo().GetTxt().getLength();
return bRet;
}
@@ -483,7 +483,7 @@ sal_Bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const sal_Int32 nOfst,
pCMS->aRealHeight.Y() = nPorHeight;
}
- return sal_True;
+ return true;
}
/*************************************************************************
@@ -899,7 +899,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
pCurr = pOldCurr;
nStart = nOldStart;
nY = nOldY;
- bPrev = sal_False;
+ bPrev = false;
return;
}
@@ -1198,7 +1198,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
* SwTxtCursor::GetCharRect()
*************************************************************************/
-sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
+bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
SwCrsrMoveState* pCMS, const long nMax )
{
CharCrsrToLine(nOfst);
@@ -1228,7 +1228,7 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
GetAdjusted();
const Point aCharPos( GetTopLeft() );
- sal_Bool bRet = sal_True;
+ bool bRet = true;
_GetCharRect( pOrig, nFindOfst, pCMS );
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 72d3127..d8cba62 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -50,10 +50,10 @@ void SwTxtIter::CtorInitTxtIter( SwTxtFrm *pNewFrm, SwTxtInfo *pNewInf )
aLineInf.CtorInitLineInfo( pNode->GetSwAttrSet(), *pNode );
nFrameStart = pFrm->Frm().Pos().Y() + pFrm->Prt().Pos().Y();
SwTxtIter::Init();
- if( pNode->GetSwAttrSet().GetRegister().GetValue() )
- bRegisterOn = pFrm->FillRegister( nRegStart, nRegDiff );
- else
- bRegisterOn = sal_False;
+
+ // Order is important: only execute FillRegister if GetValue!=0
+ bRegisterOn = pNode->GetSwAttrSet().GetRegister().GetValue()
+ && pFrm->FillRegister( nRegStart, nRegDiff );
}
/*************************************************************************
@@ -65,7 +65,7 @@ void SwTxtIter::Init()
pCurr = pInf->GetParaPortion();
nStart = pInf->GetTxtStart();
nY = nFrameStart;
- bPrev = sal_True;
+ bPrev = true;
pPrev = 0;
nLineNr = 1;
}
@@ -87,7 +87,7 @@ void SwTxtIter::CalcAscentAndHeight( KSHORT &rAscent, KSHORT &rHeight ) const
SwLineLayout *SwTxtIter::_GetPrev()
{
pPrev = 0;
- bPrev = sal_True;
+ bPrev = true;
SwLineLayout *pLay = pInf->GetParaPortion();
if( pCurr == pLay )
return 0;
@@ -117,7 +117,7 @@ const SwLineLayout *SwTxtIter::Prev()
_GetPrev();
if( pPrev )
{
- bPrev = sal_False;
+ bPrev = false;
pCurr = pPrev;
nStart = nStart - pCurr->GetLen();
nY = nY - GetLineHeight();
@@ -138,7 +138,7 @@ const SwLineLayout *SwTxtIter::Next()
if(pCurr->GetNext())
{
pPrev = pCurr;
- bPrev = sal_True;
+ bPrev = true;
nStart = nStart + pCurr->GetLen();
nY += GetLineHeight();
if( pCurr->GetLen() || ( nLineNr>1 && !pCurr->IsDummy() ) )
@@ -259,11 +259,11 @@ const SwLineLayout *SwTxtCursor::CharCrsrToLine( const sal_Int32 nPosition )
{
CharToLine( nPosition );
if( nPosition != nStart )
- bRightMargin = sal_False;
- sal_Bool bPrevious = bRightMargin && pCurr->GetLen() && GetPrev() &&
+ bRightMargin = false;
+ bool bPrevious = bRightMargin && pCurr->GetLen() && GetPrev() &&
GetPrev()->GetLen();
if( bPrevious && nPosition && CH_BREAK == GetInfo().GetChar( nPosition-1 ) )
- bPrevious = sal_False;
+ bPrevious = false;
return bPrevious ? PrevLine() : pCurr;
}
@@ -274,7 +274,7 @@ const SwLineLayout *SwTxtCursor::CharCrsrToLine( const sal_Int32 nPosition )
sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
const SwLinePortion* pPor,
sal_uInt16 nPorHeight, sal_uInt16 nPorAscent,
- const sal_Bool bAutoToCentered ) const
+ const bool bAutoToCentered ) const
{
if ( pPor )
{
@@ -285,12 +285,11 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
sal_uInt16 nOfst = rLine.GetRealHeight() - rLine.Height();
GETGRID( pFrm->FindPageFrm() )
- const sal_Bool bHasGrid = pGrid && GetInfo().SnapToGrid();
- if ( bHasGrid )
+ if ( pGrid && GetInfo().SnapToGrid() )
{
const sal_uInt16 nRubyHeight = pGrid->GetRubyHeight();
- const sal_Bool bRubyTop = ! pGrid->GetRubyTextBelow();
+ const bool bRubyTop = ! pGrid->GetRubyTextBelow();
if ( GetInfo().IsMulti() )
// we are inside the GetCharRect recursion for multi portions
@@ -315,7 +314,7 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
// nGridWidth;
nOfst += ( nLineNetto - nPorHeight ) / 2;
if ( bRubyTop )
- nOfst = nOfst + nRubyHeight;
+ nOfst += nRubyHeight;
}
}
}
@@ -368,10 +367,10 @@ const SwLineLayout *SwTxtIter::TwipsToLine( const SwTwips y)
//
// Local helper function to check, if pCurr needs a field rest portion:
//
-static sal_Bool lcl_NeedsFieldRest( const SwLineLayout* pCurr )
+static bool lcl_NeedsFieldRest( const SwLineLayout* pCurr )
{
const SwLinePortion *pPor = pCurr->GetPortion();
- sal_Bool bRet = sal_False;
+ bool bRet = false;
while( pPor && !bRet )
{
bRet = pPor->InFldGrp() && ((SwFldPortion*)pPor)->HasFollow();
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 6a194a0..5f3d27b 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -46,11 +46,11 @@ protected:
sal_Int32 nStart; // Start in the text string, end = pCurr->GetLen()
KSHORT nRegDiff; // Register's line distance
MSHORT nLineNr; // Line number
- sal_Bool bPrev : 1;
- sal_Bool bRegisterOn : 1; // Keep in register
- sal_Bool bOneBlock : 1; // Justified text: Dispose single words
- sal_Bool bLastBlock : 1; // Justified text: Also the last line
- sal_Bool bLastCenter : 1; // Justified text: Center last line
+ bool bPrev : 1;
+ bool bRegisterOn : 1; // Keep in register
+ bool bOneBlock : 1; // Justified text: Dispose single words
+ bool bLastBlock : 1; // Justified text: Also the last line
+ bool bLastCenter : 1; // Justified text: Center last line
SwLineLayout *_GetPrev();
@@ -69,18 +69,18 @@ protected:
, nStart(0)
, nRegDiff(0)
, nLineNr(0)
- , bPrev(sal_False)
- , bRegisterOn(sal_False)
- , bOneBlock(sal_False)
- , bLastBlock(sal_False)
- , bLastCenter(sal_False)
+ , bPrev(false)
+ , bRegisterOn(false)
+ , bOneBlock(false)
+ , bLastBlock(false)
+ , bLastCenter(false)
{}
public:
inline SwTxtIter( SwTxtFrm *pTxtFrm, SwTxtInfo *pTxtInf )
: SwAttrIter( pTxtFrm != NULL ? pTxtFrm->GetTxtNode() : NULL)
- , bOneBlock(sal_False)
- , bLastBlock(sal_False)
- , bLastCenter(sal_False)
+ , bOneBlock(false)
+ , bLastBlock(false)
+ , bLastCenter(false)
{
CtorInitTxtIter( pTxtFrm, pTxtInf );
}
@@ -95,7 +95,7 @@ public:
inline SwTwips RegStart() const { return nRegStart; }
inline KSHORT RegDiff() const { return nRegDiff; }
- inline sal_Bool IsRegisterOn() const { return bRegisterOn; }
+ inline bool IsRegisterOn() const { return bRegisterOn; }
inline SwTxtInfo &GetInfo() { return *pInf; }
inline const SwTxtInfo &GetInfo() const { return *pInf; }
@@ -131,9 +131,9 @@ public:
const SwLineInfo &GetLineInfo() const { return aLineInf; }
inline SwTwips GetFirstPos() const { return nFrameStart; }
- inline sal_Bool SeekAndChg( SwTxtSizeInfo &rInf );
- inline sal_Bool SeekAndChgBefore( SwTxtSizeInfo &rInf );
- inline sal_Bool SeekStartAndChg( SwTxtSizeInfo &rInf, const sal_Bool bPara=sal_False );
+ inline bool SeekAndChg( SwTxtSizeInfo &rInf );
+ inline bool SeekAndChgBefore( SwTxtSizeInfo &rInf );
+ inline bool SeekStartAndChg( SwTxtSizeInfo &rInf, const bool bPara=false );
inline SwTxtFrm *GetTxtFrm() { return pFrm; }
inline const SwTxtFrm *GetTxtFrm() const { return pFrm; }
@@ -193,9 +193,9 @@ public:
SwTwips GetLineStart() const;
inline SwTwips GetLineEnd() const { return GetLineStart() + CurrWidth(); }
inline Point GetTopLeft() const { return Point( GetLineStart(), Y() ); }
- inline sal_Bool IsOneBlock() const { return bOneBlock; }
- inline sal_Bool IsLastBlock() const { return bLastBlock; }
- inline sal_Bool IsLastCenter() const { return bLastCenter; }
+ inline bool IsOneBlock() const { return bOneBlock; }
+ inline bool IsLastBlock() const { return bLastBlock; }
+ inline bool IsLastCenter() const { return bLastCenter; }
inline MSHORT GetAdjust() const { return nAdjust; }
inline KSHORT GetLineWidth() const
{ return KSHORT( Right() - GetLeftMargin() + 1 ); }
@@ -285,7 +285,7 @@ class SwTxtCursor : public SwTxtAdjuster
friend class SwTxtCursorSave;
// Ambiguities
- static sal_Bool bRightMargin;
+ static bool bRightMargin;
void _GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* );
protected:
void CtorInitTxtCursor( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf );
@@ -293,9 +293,9 @@ protected:
public:
inline SwTxtCursor( SwTxtFrm *pTxtFrm, SwTxtSizeInfo *pTxtSizeInf ) : SwTxtAdjuster(pTxtFrm!=NULL?pTxtFrm->GetTxtNode():NULL)
{ CtorInitTxtCursor( pTxtFrm, pTxtSizeInf ); }
- sal_Bool GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
+ bool GetCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
const long nMax = 0 );
- sal_Bool GetEndCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
+ bool GetEndCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
const long nMax = 0 );
sal_Int32 GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
const MSHORT nChgNode, SwCrsrMoveState* = 0 ) const;
@@ -306,10 +306,10 @@ public:
// bAutoToCentered indicates, if AUTOMATIC mode means CENTERED or BASELINE
sal_uInt16 AdjustBaseLine( const SwLineLayout& rLine, const SwLinePortion* pPor,
sal_uInt16 nPorHeight = 0, sal_uInt16 nAscent = 0,
- const sal_Bool bAutoToCentered = sal_False ) const;
+ const bool bAutoToCentered = false ) const;
- static inline void SetRightMargin( const sal_Bool bNew ){ bRightMargin = bNew; }
- static inline sal_Bool IsRightMargin() { return bRightMargin; }
+ static inline void SetRightMargin( const bool bNew ){ bRightMargin = bNew; }
+ static inline bool IsRightMargin() { return bRightMargin; }
};
/*************************************************************************
@@ -333,12 +333,12 @@ public:
* Inline implementation
*************************************************************************/
-inline sal_Bool SwTxtIter::SeekAndChg( SwTxtSizeInfo &rInf )
+inline bool SwTxtIter::SeekAndChg( SwTxtSizeInfo &rInf )
{
return SeekAndChgAttrIter( rInf.GetIdx(), rInf.GetOut() );
}
-inline sal_Bool SwTxtIter::SeekAndChgBefore( SwTxtSizeInfo &rInf )
+inline bool SwTxtIter::SeekAndChgBefore( SwTxtSizeInfo &rInf )
{
if ( rInf.GetIdx() )
return SeekAndChgAttrIter( rInf.GetIdx()-1, rInf.GetOut() );
@@ -346,7 +346,7 @@ inline sal_Bool SwTxtIter::SeekAndChgBefore( SwTxtSizeInfo &rInf )
return SeekAndChgAttrIter( rInf.GetIdx(), rInf.GetOut() );
}
-inline sal_Bool SwTxtIter::SeekStartAndChg( SwTxtSizeInfo &rInf, const sal_Bool bPara )
+inline bool SwTxtIter::SeekStartAndChg( SwTxtSizeInfo &rInf, const bool bPara )
{
return SeekStartAndChgAttrIter( rInf.GetOut(), bPara );
}
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 23738a6..3686c29 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -490,8 +490,8 @@ void SwTxtFormatter::CalcDropHeight( const MSHORT nLines )
KSHORT nAscent = 0;
KSHORT nHeight = 0;
KSHORT nDropLns = 0;
- sal_Bool bRegisterOld = IsRegisterOn();
- bRegisterOn = sal_False;
+ const bool bRegisterOld = IsRegisterOn();
+ bRegisterOn = false;
Top();
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 47f3c13..6e66808 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1117,7 +1117,7 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset )
// Wir initialisieren uns also:
// ResetFont();
FeedInf( rInf );
- SeekStartAndChg( rInf, sal_True );
+ SeekStartAndChg( rInf, true );
if( GetRedln() && pCurr->HasRedline() )
GetRedln()->Seek( *pFnt, nOffset, 0 );
commit c25ebf75e0628c660b1e051a863429b9e5320acc
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 16:28:50 2014 +0100
MultiSelection::GetRangeCount() returns size_t
Change-Id: Ief072cef486556c9b43364e108a021510781f7c6
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 6facb70..ea8a201 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -511,8 +511,8 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3
_rColumns.realloc( nCount );
sal_Int32 nIndex = 0;
- sal_uInt32 nRangeCount = pColumnSel->GetRangeCount();
- for( sal_uInt32 nRange = 0; nRange < nRangeCount; ++nRange )
+ const size_t nRangeCount = pColumnSel->GetRangeCount();
+ for( size_t nRange = 0; nRange < nRangeCount; ++nRange )
{
const Range& rRange = pColumnSel->GetRange( nRange );
// loop has to include aRange.Max()
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 85c84e0..a962997 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -535,10 +535,10 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
const sal_Int32 nIndx = GetInfo().GetIdx();
long nUnderStart = 0;
long nUnderEnd = 0;
- const MSHORT nCnt = (MSHORT)aUnderMulti.GetRangeCount();
+ const size_t nCnt = aUnderMulti.GetRangeCount();
// find the underline range the current portion is contained in
- for( MSHORT i = 0; i < nCnt; ++i )
+ for( size_t i = 0; i < nCnt; ++i )
{
const Range& rRange = aUnderMulti.GetRange( i );
if( nUnderEnd == rRange.Min() )
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 29861eb..851aba8 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -687,8 +687,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
CalcHiddenRanges( rNode, aHiddenMulti );
aHiddenChg.clear();
- sal_uInt16 i = 0;
- for( i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
+ for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
{
const Range& rRange = aHiddenMulti.GetRange( i );
const sal_Int32 nStart = rRange.Min();
@@ -1159,7 +1158,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
// check kashida data
long nTmpKashidaPos = -1;
bool bWrongKash = false;
- for (i = 0; i < aKashida.size(); ++i )
+ for (size_t i = 0; i < aKashida.size(); ++i )
{
long nCurrKashidaPos = GetKashida( i );
if ( nCurrKashidaPos <= nTmpKashidaPos )
@@ -1478,7 +1477,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
: 0);
MultiSelection aHiddenMulti( aRange );
SwScriptInfo::CalcHiddenRanges( rNode, aHiddenMulti );
- for( sal_uInt16 i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
+ for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
{
const Range& rRange = aHiddenMulti.GetRange( i );
const sal_Int32 nHiddenStart = rRange.Min();
@@ -1497,7 +1496,7 @@ bool SwScriptInfo::GetBoundsOfHiddenRange( const SwTxtNode& rNode, sal_Int32 nPo
if ( pList )
{
- for( sal_uInt16 i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
+ for( size_t i = 0; i < aHiddenMulti.GetRangeCount(); ++i )
{
const Range& rRange = aHiddenMulti.GetRange( i );
pList->push_back( rRange.Min() );
commit 3228cb2094d3013822534d0ce894c5097e4869f9
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 13:55:07 2014 +0100
Remove redundant checks and unnecessary variables
Change-Id: I8552102550898e63468d64f8c2b93577b4f420b4
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 92a7ed2..85c84e0 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -512,33 +512,22 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
if( HasHints() )
{
- bool bUnder = false;
-
for ( MSHORT nTmp = 0; nTmp < pHints->GetStartCount(); ++nTmp )
{
SwTxtAttr* const pTxtAttr = pHints->GetStart( nTmp );
- bool bUnderSelect = false;
const SvxUnderlineItem* pItem =
static_cast<const SvxUnderlineItem*>(CharFmt::GetItem( *pTxtAttr, RES_CHRATR_UNDERLINE ));
if ( pItem )
{
- bUnder = true;
- bUnderSelect = pFnt->GetUnderline() == pItem->GetLineStyle();
- }
-
- if( bUnder )
- {
- sal_Int32 nSt = *pTxtAttr->GetStart();
- sal_Int32 nEnd = *pTxtAttr->GetEnd();
+ const sal_Int32 nSt = *pTxtAttr->GetStart();
+ const sal_Int32 nEnd = *pTxtAttr->GetEnd();
if( nEnd > nSt )
{
- Range aTmp( nSt, nEnd - 1 );
- if( bUnder )
- aUnderMulti.Select( aTmp, bUnderSelect );
+ const bool bUnderSelect = pFnt->GetUnderline() == pItem->GetLineStyle();
+ aUnderMulti.Select( Range( nSt, nEnd - 1 ), bUnderSelect );
}
- bUnder = false;
}
}
}
commit 49cda4d780bba717dae0e4c20181ef0d3974bf7b
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 12:46:45 2014 +0100
Reduce scope of some local variables
Change-Id: I0e9c8d65a6e46cf1035b6ca5de4b28fe2a0f120e
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 9fc2049..92a7ed2 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -497,34 +497,26 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
// If current underline matches the common underline font, we continue
// to use the common underline font.
//Bug 120769:Color of underline display wrongly
- Color aAutoCo(COL_AUTO);
if ( GetInfo().GetUnderFnt() &&
GetInfo().GetUnderFnt()->GetFont().GetUnderline() == GetFnt()->GetUnderline() &&
- GetInfo().GetFont() && GetInfo().GetFont()->GetUnderColor() != aAutoCo )
+ GetInfo().GetFont() && GetInfo().GetFont()->GetUnderColor() != Color(COL_AUTO) )
return;
//Bug 120769(End)
- // calculate the new common underline font
- SwFont* pUnderlineFnt = 0;
- Point aCommonBaseLine;
-
- Range aRange( 0, GetInfo().GetTxt().getLength() );
- MultiSelection aUnderMulti( aRange );
OSL_ENSURE( GetFnt() && UNDERLINE_NONE != GetFnt()->GetUnderline(),
"CheckSpecialUnderline without underlined font" );
+ MultiSelection aUnderMulti( Range( 0, GetInfo().GetTxt().getLength() ) );
const SwFont* pParaFnt = GetAttrHandler().GetFont();
if( pParaFnt && pParaFnt->GetUnderline() == GetFnt()->GetUnderline() )
aUnderMulti.SelectAll();
- SwTxtAttr* pTxtAttr;
if( HasHints() )
{
bool bUnder = false;
- MSHORT nTmp = 0;
- while( nTmp < pHints->GetStartCount() )
+ for ( MSHORT nTmp = 0; nTmp < pHints->GetStartCount(); ++nTmp )
{
- pTxtAttr = pHints->GetStart( nTmp++ );
+ SwTxtAttr* const pTxtAttr = pHints->GetStart( nTmp );
bool bUnderSelect = false;
const SvxUnderlineItem* pItem =
@@ -551,14 +543,13 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
}
}
- MSHORT i;
- sal_Int32 nIndx = GetInfo().GetIdx();
+ const sal_Int32 nIndx = GetInfo().GetIdx();
long nUnderStart = 0;
long nUnderEnd = 0;
- MSHORT nCnt = (MSHORT)aUnderMulti.GetRangeCount();
+ const MSHORT nCnt = (MSHORT)aUnderMulti.GetRangeCount();
// find the underline range the current portion is contained in
- for( i = 0; i < nCnt; ++i )
+ for( MSHORT i = 0; i < nCnt; ++i )
{
const Range& rRange = aUnderMulti.GetRange( i );
if( nUnderEnd == rRange.Min() )
@@ -579,6 +570,9 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
if ( GetEnd() && GetEnd() <= nUnderEnd )
nUnderEnd = GetEnd() - 1;
+ // calculate the new common underline font
+ SwFont* pUnderlineFnt = 0;
+ Point aCommonBaseLine;
// check, if underlining is not isolated
if ( nIndx + GetInfo().GetLen() < nUnderEnd + 1 )
@@ -637,7 +631,7 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
++nNumberOfPortions;
- nTmpIdx = nTmpIdx + pPor->GetLen();
+ nTmpIdx += pPor->GetLen();
pPor = pPor->GetPortion();
}
commit cf3b6d9a254c777a3b00703195f3b97c4136eb05
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 11:42:03 2014 +0100
sal_Bool to bool
Change-Id: Ie53b7f225b6845748d231ad0a03e9f5b080e9066
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 8a452db..9fc2049 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -92,7 +92,7 @@ void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewIn
pMyFnt->SetAlign( ALIGN_BASELINE );
}
#endif
- bPaintDrop = sal_False;
+ bPaintDrop = false;
}
@@ -153,7 +153,7 @@ SwLinePortion *SwTxtPainter::CalcPaintOfst( const SwRect &rPaint )
* als Default eingestellt.
*************************************************************************/
void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
- const sal_Bool bUnderSz )
+ const bool bUnderSz )
{
#if OSL_DEBUG_LEVEL > 1
// sal_uInt16 nFntHeight = GetInfo().GetFont()->GetHeight( GetInfo().GetVsh(), GetInfo().GetOut() );
@@ -173,7 +173,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
const bool bDrawInWindow = GetInfo().OnWin();
// 6882: Leerzeilen duerfen nicht wegoptimiert werden bei Paragraphzeichen.
- const sal_Bool bEndPor = GetInfo().GetOpt().IsParagraph() && GetInfo().GetTxt().isEmpty();
+ const bool bEndPor = GetInfo().GetOpt().IsParagraph() && GetInfo().GetTxt().isEmpty();
SwLinePortion *pPor = bEndPor ? pCurr->GetFirstPortion() : CalcPaintOfst( rPaint );
@@ -284,7 +284,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
if( bEndPor )
SeekStartAndChg( GetInfo() );
- sal_Bool bRest = pCurr->IsRest();
+ const bool bRest = pCurr->IsRest();
bool bFirst = true;
SwArrowPortion *pArrow = NULL;
@@ -293,7 +293,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
while( pPor )
{
- sal_Bool bSeeked = sal_True;
+ bool bSeeked = true;
GetInfo().SetLen( pPor->GetLen() );
const SwTwips nOldY = GetInfo().Y();
@@ -319,7 +319,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
else if ( pPor->IsQuoVadisPortion() )
{
sal_Int32 nOffset = GetInfo().GetIdx();
- SeekStartAndChg( GetInfo(), sal_True );
+ SeekStartAndChg( GetInfo(), true );
if( GetRedln() && pCurr->HasRedline() )
GetRedln()->Seek( *pFnt, nOffset, 0 );
}
@@ -335,9 +335,9 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
SeekAndChgBefore( GetInfo() );
}
else
- bSeeked = sal_False;
+ bSeeked = false;
-// bRest = sal_False;
+// bRest = false;
// Wenn das Ende der Portion hinausragt, wird geclippt.
// Es wird ein Sicherheitsabstand von Height-Halbe aufaddiert,
@@ -447,7 +447,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
}
if( GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreview() )
{
- const sal_Bool bNextUndersized =
+ const bool bNextUndersized =
( GetTxtFrm()->GetNext() &&
0 == GetTxtFrm()->GetNext()->Prt().Height() &&
GetTxtFrm()->GetNext()->IsTxtFrm() &&
@@ -519,20 +519,20 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
SwTxtAttr* pTxtAttr;
if( HasHints() )
{
- sal_Bool bUnder = sal_False;
+ bool bUnder = false;
MSHORT nTmp = 0;
while( nTmp < pHints->GetStartCount() )
{
pTxtAttr = pHints->GetStart( nTmp++ );
- sal_Bool bUnderSelect = sal_False;
+ bool bUnderSelect = false;
const SvxUnderlineItem* pItem =
static_cast<const SvxUnderlineItem*>(CharFmt::GetItem( *pTxtAttr, RES_CHRATR_UNDERLINE ));
if ( pItem )
{
- bUnder = sal_True;
+ bUnder = true;
bUnderSelect = pFnt->GetUnderline() == pItem->GetLineStyle();
}
@@ -546,7 +546,7 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
if( bUnder )
aUnderMulti.Select( aTmp, bUnderSelect );
}
- bUnder = sal_False;
+ bUnder = false;
}
}
}
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index ff7c58c..187d955 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.hxx
@@ -29,7 +29,7 @@ class SwMultiPortion;
class SwTxtPainter : public SwTxtCursor
{
- sal_Bool bPaintDrop;
+ bool bPaintDrop;
SwLinePortion *CalcPaintOfst( const SwRect &rPaint );
void CheckSpecialUnderline( const SwLinePortion* pPor,
@@ -38,7 +38,7 @@ protected:
void CtorInitTxtPainter( SwTxtFrm *pFrm, SwTxtPaintInfo *pInf );
inline SwTxtPainter(SwTxtNode* pTxtNode)
: SwTxtCursor(pTxtNode)
- , bPaintDrop(sal_False)
+ , bPaintDrop(false)
{ }
public:
@@ -48,14 +48,14 @@ public:
CtorInitTxtPainter( pTxtFrm, pTxtPaintInf );
}
void DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
- const sal_Bool bUnderSz );
+ const bool bUnderSz );
void PaintDropPortion();
// if PaintMultiPortion is called recursively, we have to pass the
// surrounding SwBidiPortion
void PaintMultiPortion( const SwRect &rPaint, SwMultiPortion& rMulti,
const SwMultiPortion* pEnvPor = 0 );
- inline void SetPaintDrop( const sal_Bool bNew ) { bPaintDrop = bNew; }
- inline sal_Bool IsPaintDrop() const { return bPaintDrop; }
+ inline void SetPaintDrop( const bool bNew ) { bPaintDrop = bNew; }
+ inline bool IsPaintDrop() const { return bPaintDrop; }
inline SwTxtPaintInfo &GetInfo()
{ return (SwTxtPaintInfo&)SwTxtIter::GetInfo(); }
inline const SwTxtPaintInfo &GetInfo() const
commit 21b745fd558f473c4a30ac02c52d4bb146662402
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Feb 2 11:04:06 2014 +0100
Bail out early
Change-Id: Ic1668f22cc6e29875e07bc164e500dfc005e5193
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index dd9d32e..cb1a4fb 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -133,13 +133,12 @@ void SetParaPortion( SwTxtInfo *pInf, SwParaPortion *pRoot )
bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
{
SwTxtFormatInfo &rInf = GetInfo();
- bool bRet = false;
// In der letzten Zeile gibt es nie etwas zu trennen.
// Es sei denn, es befindet sich eine FlyPortion darin,
// oder es ist die letzte Zeile des Masters
if( !GetNext() && !rInf.GetTxtFly()->IsOn() && !pFrm->GetFollow() )
- return bRet;
+ return false;
sal_Int32 nWrdStart = nStart;
@@ -215,52 +214,49 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
OSL_ENSURE( IsParaLine(), "SwTxtFormatter::Hyphenate: even not the first" );
}
- if( nWrdStart )
- {
- // nWrdStart bezeichnet nun die Position im String, der
- // fuer eine Trennung zur Debatte steht.
- // Start() hangelt sich zum End()
- rHyphInf.nWordStart = nWrdStart;
+ if( nWrdStart==0 )
+ return false;
- sal_Int32 nLen = 0;
- const sal_Int32 nEnd = nWrdStart;
+ // nWrdStart bezeichnet nun die Position im String, der
+ // fuer eine Trennung zur Debatte steht.
+ // Start() hangelt sich zum End()
+ rHyphInf.nWordStart = nWrdStart;
- // Wir suchen vorwaerts
- Reference< XHyphenatedWord > xHyphWord;
-
- Boundary aBound =
- g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nWrdStart,
- g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ), WordType::DICTIONARY_WORD, sal_True );
- nWrdStart = aBound.startPos;
- nLen = aBound.endPos - nWrdStart;
- bRet = 0 != nLen;
- if( bRet )
- {
- OUString aSelTxt( rInf.GetTxt().copy(nWrdStart, nLen) );
+ sal_Int32 nLen = 0;
+ const sal_Int32 nEnd = nWrdStart;
- {
- MSHORT nMinTrail = 0;
- if( nWrdStart + nLen > nEnd )
- nMinTrail = nWrdStart + nLen - nEnd - 1;
-
- //!! rHyphInf.SetHyphWord( ... ) mu??? hier geschehen
- xHyphWord = rInf.HyphWord( aSelTxt, nMinTrail );
- bRet = xHyphWord.is();
- if ( !rHyphInf.IsCheck() && sal_False == bRet )
- rHyphInf.SetNoLang( true );
- }
+ // Wir suchen vorwaerts
+ Reference< XHyphenatedWord > xHyphWord;
- if( bRet )
- {
- rHyphInf.SetHyphWord( xHyphWord );
- rHyphInf.nWordStart = nWrdStart;
- rHyphInf.nWordLen = nLen;
- rHyphInf.SetNoLang( false );
- rHyphInf.SetCheck( true );
- }
- }
+ Boundary aBound =
+ g_pBreakIt->GetBreakIter()->getWordBoundary( rInf.GetTxt(), nWrdStart,
+ g_pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ), WordType::DICTIONARY_WORD, sal_True );
+ nWrdStart = aBound.startPos;
+ nLen = aBound.endPos - nWrdStart;
+ if ( nLen == 0 )
+ return false;
+
+ OUString aSelTxt( rInf.GetTxt().copy(nWrdStart, nLen) );
+ MSHORT nMinTrail = 0;
+ if( nWrdStart + nLen > nEnd )
+ nMinTrail = nWrdStart + nLen - nEnd - 1;
+
+ //!! rHyphInf.SetHyphWord( ... ) mu??? hier geschehen
+ xHyphWord = rInf.HyphWord( aSelTxt, nMinTrail );
+ if ( xHyphWord.is() )
+ {
+ rHyphInf.SetHyphWord( xHyphWord );
+ rHyphInf.nWordStart = nWrdStart;
+ rHyphInf.nWordLen = nLen;
+ rHyphInf.SetNoLang( false );
+ rHyphInf.SetCheck( true );
+ return true;
}
- return bRet;
+
+ if ( !rHyphInf.IsCheck() )
+ rHyphInf.SetNoLang( true );
+
+ return false;
}
/*************************************************************************
commit 202d721e3cb35eb4402882dbe4b81ceccd9f4e0a
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list