[Libreoffice-commits] core.git: 13 commits - sw/inc sw/source
Matteo Casalin
matteo.casalin at yahoo.com
Sat Feb 22 03:32:27 PST 2014
sw/inc/crsrsh.hxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 2
sw/source/core/crsr/crstrvl.cxx | 114 +++++++++---------------
sw/source/core/doc/notxtfrm.cxx | 10 +-
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/inc/blink.hxx | 8 -
sw/source/core/inc/cellfrm.hxx | 4
sw/source/core/inc/cntfrm.hxx | 14 +--
sw/source/core/inc/flyfrm.hxx | 4
sw/source/core/inc/frame.hxx | 8 -
sw/source/core/inc/frminf.hxx | 10 +-
sw/source/core/inc/layfrm.hxx | 2
sw/source/core/inc/notxtfrm.hxx | 4
sw/source/core/inc/pagefrm.hxx | 4
sw/source/core/inc/rootfrm.hxx | 2
sw/source/core/inc/sectfrm.hxx | 2
sw/source/core/inc/tabfrm.hxx | 4
sw/source/core/inc/txtfrm.hxx | 29 ++----
sw/source/core/layout/calcmove.cxx | 31 +++---
sw/source/core/layout/flowfrm.cxx | 4
sw/source/core/layout/frmtool.cxx | 4
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/layout/tabfrm.cxx | 2
sw/source/core/layout/trvlfrm.cxx | 171 ++++++++++++++++++-------------------
sw/source/core/layout/unusedf.cxx | 12 +-
sw/source/core/layout/wsfrm.cxx | 48 +++++-----
sw/source/core/text/blink.cxx | 4
sw/source/core/text/frmcrsr.cxx | 80 ++++++++---------
sw/source/core/text/frmform.cxx | 32 +++---
sw/source/core/text/frminf.cxx | 99 +++++++++------------
sw/source/core/text/frmpaint.cxx | 6 -
sw/source/core/text/itradj.cxx | 16 +--
sw/source/core/text/itrcrsr.cxx | 49 +++++-----
sw/source/core/text/itrform2.hxx | 2
sw/source/core/text/noteurl.cxx | 2
sw/source/core/text/porlin.cxx | 4
sw/source/core/text/porrst.cxx | 86 ++++++++----------
sw/source/core/text/txtfld.cxx | 10 +-
sw/source/core/text/txtfly.hxx | 10 +-
sw/source/core/text/txtfrm.cxx | 53 +++++------
41 files changed, 456 insertions(+), 498 deletions(-)
New commits:
commit 49b4a79590eb18f4a960ba2bba86991af6ac9e38
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 12:04:18 2014 +0100
Bail out early, avoid some temporaries
Change-Id: Ice36f2fa40b1ee47fa29bb1f8386f34def57633a
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index f1701ce..53fdb7e 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -28,17 +28,15 @@
sal_Int32 SwTxtMargin::GetTxtStart() const
{
const OUString &rTxt = GetInfo().GetTxt();
- const sal_Int32 nTmpPos = nStart;
- const sal_Int32 nEnd = nTmpPos + pCurr->GetLen();
- sal_Int32 i;
+ const sal_Int32 nEnd = nStart + pCurr->GetLen();
- for( i = nTmpPos; i < nEnd; ++i )
+ for( sal_Int32 i = nStart; i < nEnd; ++i )
{
const sal_Unicode aChar = rTxt[i];
if( CH_TAB != aChar && ' ' != aChar )
return i;
}
- return i;
+ return nEnd;
}
/*************************************************************************
@@ -48,16 +46,14 @@ sal_Int32 SwTxtMargin::GetTxtStart() const
sal_Int32 SwTxtMargin::GetTxtEnd() const
{
const OUString &rTxt = GetInfo().GetTxt();
- const sal_Int32 nTmpPos = nStart;
- const sal_Int32 nEnd = nTmpPos + pCurr->GetLen();
- sal_Int32 i;
- for( i = nEnd - 1; i >= nTmpPos; --i )
+ const sal_Int32 nEnd = nStart + pCurr->GetLen();
+ for( sal_Int32 i = nEnd - 1; i >= nStart; --i )
{
- sal_Unicode aChar = rTxt[i];
+ const sal_Unicode aChar = rTxt[i];
if( CH_TAB != aChar && CH_BREAK != aChar && ' ' != aChar )
- return static_cast<sal_Int32>(i + 1);
+ return i + 1;
}
- return static_cast<sal_Int32>(i + 1);
+ return nStart;
}
/*************************************************************************
@@ -70,20 +66,19 @@ bool SwTxtFrmInfo::IsOneLine() const
const SwLineLayout *pLay = pFrm->GetPara();
if( !pLay )
return false;
- else
+
+ // For follows false of course
+ if( pFrm->GetFollow() )
+ return false;
+
+ pLay = pLay->GetNext();
+ while( pLay )
{
- // For follows false of course
- if( pFrm->GetFollow() )
+ if( pLay->GetLen() )
return false;
pLay = pLay->GetNext();
- while( pLay )
- {
- if( pLay->GetLen() )
- return false;
- pLay = pLay->GetNext();
- }
- return true;
}
+ return true;
}
/*************************************************************************
@@ -96,13 +91,11 @@ bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
const SwLineLayout *pLay = pFrm->GetPara();
if( !pLay )
return false;
- else
- {
- long nWidth = pFrm->Prt().Width();
- nWidth *= nPercent;
- nWidth /= 100;
- return KSHORT(nWidth) <= pLay->Width();
- }
+
+ long nWidth = pFrm->Prt().Width();
+ nWidth *= nPercent;
+ nWidth /= 100;
+ return KSHORT(nWidth) <= pLay->Width();
}
/*************************************************************************
@@ -112,19 +105,15 @@ bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
// Where does the text start (without whitespace)? (document global)
SwTwips SwTxtFrmInfo::GetLineStart( const SwTxtCursor &rLine ) const
{
- sal_Int32 nTxtStart = rLine.GetTxtStart();
- SwTwips nStart;
+ const sal_Int32 nTxtStart = rLine.GetTxtStart();
if( rLine.GetStart() == nTxtStart )
- nStart = rLine.GetLineStart();
- else
- {
- SwRect aRect;
- if( ((SwTxtCursor&)rLine).GetCharRect( &aRect, nTxtStart ) )
- nStart = aRect.Left();
- else
- nStart = rLine.GetLineStart();
- }
- return nStart;
+ return rLine.GetLineStart();
+
+ SwRect aRect;
+ if( ((SwTxtCursor&)rLine).GetCharRect( &aRect, nTxtStart ) )
+ return aRect.Left();
+
+ return rLine.GetLineStart();
}
@@ -293,11 +282,11 @@ SwTwips SwTxtFrmInfo::GetFirstIndent() const
// At first we only return +1, -1 and 0
if( nLeft == nFirst )
return 0;
- else
- if( nLeft > nFirst )
- return -1;
- else
- return +1;
+
+ if( nLeft > nFirst )
+ return -1;
+
+ return 1;
}
/*************************************************************************
@@ -359,6 +348,4 @@ sal_Int32 SwTxtFrmInfo::GetBigIndent( sal_Int32& rFndPos,
: 0;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 130aa510a37387e56c13af85c74ec7c605ceead2
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 11:47:26 2014 +0100
sal_Bool to bool
Change-Id: I7142b4384179f1c2ffbe8645bb3025f9bbcbdfde
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 7fd30d3..d1576c1 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1029,7 +1029,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
if (rTxt[nChPos] == cCh)
{
aPosArr.push_back( static_cast<sal_uInt16>(
- aFInfo.GetCharPos( nChPos+1, sal_False )) );
+ aFInfo.GetCharPos( nChPos+1, false )) );
}
}
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 7388ae6..c62932b 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -37,22 +37,22 @@ public:
inline SwTxtFrmInfo( const SwTxtFrm *pTxtFrm ) : pFrm(pTxtFrm) { }
// Does the paragraph fit into a single line?
- sal_Bool IsOneLine() const;
+ bool IsOneLine() const;
// Is the line filled to X%?
- sal_Bool IsFilled( const sal_uInt8 nPercent ) const;
+ bool IsFilled( const sal_uInt8 nPercent ) const;
// Where does the text (w/o whitespaces) start (rel. in frame)?
SwTwips GetLineStart() const;
// return center position of the next character
- SwTwips GetCharPos( sal_Int32 nChar, sal_Bool bCenter = sal_True ) const;
+ SwTwips GetCharPos( sal_Int32 nChar, bool bCenter = true ) const;
// collect all whitespaces at the beginning and end of a line in Pam
- void GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const;
+ void GetSpaces( SwPaM &rPam, bool bWithLineBreak ) const;
// Is a bullet point/symbol/etc. at the first text position?
- sal_Bool IsBullet( sal_Int32 nTxtPos ) const;
+ bool IsBullet( sal_Int32 nTxtPos ) const;
// determine intentation for first line
SwTwips GetFirstIndent() const;
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 1a3031a..f1701ce 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -65,24 +65,24 @@ sal_Int32 SwTxtMargin::GetTxtEnd() const
*************************************************************************/
// Does the paragraph fit into one line?
-sal_Bool SwTxtFrmInfo::IsOneLine() const
+bool SwTxtFrmInfo::IsOneLine() const
{
const SwLineLayout *pLay = pFrm->GetPara();
if( !pLay )
- return sal_False;
+ return false;
else
{
// For follows false of course
if( pFrm->GetFollow() )
- return sal_False;
+ return false;
pLay = pLay->GetNext();
while( pLay )
{
if( pLay->GetLen() )
- return sal_False;
+ return false;
pLay = pLay->GetNext();
}
- return sal_True;
+ return true;
}
}
@@ -91,11 +91,11 @@ sal_Bool SwTxtFrmInfo::IsOneLine() const
*************************************************************************/
// Is the line filled for X percent?
-sal_Bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
+bool SwTxtFrmInfo::IsFilled( const sal_uInt8 nPercent ) const
{
const SwLineLayout *pLay = pFrm->GetPara();
if( !pLay )
- return sal_False;
+ return false;
else
{
long nWidth = pFrm->Prt().Width();
@@ -141,7 +141,7 @@ SwTwips SwTxtFrmInfo::GetLineStart() const
}
// Calculates the character's position and returns the middle position
-SwTwips SwTxtFrmInfo::GetCharPos( sal_Int32 nChar, sal_Bool bCenter ) const
+SwTwips SwTxtFrmInfo::GetCharPos( sal_Int32 nChar, bool bCenter ) const
{
SWRECTFN( pFrm )
SwFrmSwapper aSwapper( pFrm, true );
@@ -208,7 +208,7 @@ SwPaM *AddPam( SwPaM *pPam, const SwTxtFrm* pTxtFrm,
}
// Accumulates the whitespace at line start and end in the Pam
-void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
+void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, bool bWithLineBreak ) const
{
SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm );
SwTxtMargin aLine( (SwTxtFrm*)pFrm, &aInf );
@@ -251,7 +251,7 @@ void SwTxtFrmInfo::GetSpaces( SwPaM &rPam, sal_Bool bWithLineBreak ) const
// Is there a bullet/symbol etc. at the text position?
// Fonts: CharSet, SYMBOL und DONTKNOW
-sal_Bool SwTxtFrmInfo::IsBullet( sal_Int32 nTxtStart ) const
+bool SwTxtFrmInfo::IsBullet( sal_Int32 nTxtStart ) const
{
SwTxtSizeInfo aInf( (SwTxtFrm*)pFrm );
SwTxtMargin aLine( (SwTxtFrm*)pFrm, &aInf );
commit bb2637d0d016ba9f269a3ac63ead6c931632fa03
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 10:54:44 2014 +0100
sal_Bool to bool
Change-Id: If4b7f6a384a3f07f322022fc7cf31f07806e8776
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index a5a865e..4c30e00 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -46,9 +46,9 @@ public:
const SwRootFrm* GetRootFrm() const{ return pFrm; }
const SwLinePortion *GetPortion() const{ return pPor; }
sal_uInt16 GetDirection() const { return nDir; }
- sal_Bool operator<( const SwBlinkPortion& rBlinkPortion ) const
+ bool operator<( const SwBlinkPortion& rBlinkPortion ) const
{ return (sal_IntPtr)pPor < (sal_IntPtr)rBlinkPortion.pPor; }
- sal_Bool operator==( const SwBlinkPortion& rBlinkPortion ) const
+ bool operator==( const SwBlinkPortion& rBlinkPortion ) const
{ return (sal_IntPtr)pPor == (sal_IntPtr)rBlinkPortion.pPor; }
};
@@ -58,7 +58,7 @@ class SwBlink
{
SwBlinkList aList;
AutoTimer aTimer;
- sal_Bool bVisible;
+ bool bVisible;
public:
SwBlink();
@@ -71,7 +71,7 @@ public:
void Replace( const SwLinePortion* pOld, const SwLinePortion* pNew );
void Delete( const SwLinePortion* pPor );
void FrmDelete( const SwRootFrm* pRoot );
- inline sal_Bool IsVisible() const { return bVisible ; }
+ inline bool IsVisible() const { return bVisible ; }
};
// Blink-Manager, global variable, see Blink.Cxx
diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx
index 3b3e6ac..3e6cde4 100644
--- a/sw/source/core/text/blink.cxx
+++ b/sw/source/core/text/blink.cxx
@@ -41,7 +41,7 @@ SwBlink *pBlink = NULL;
SwBlink::SwBlink()
{
- bVisible = sal_True;
+ bVisible = true;
// Prepare the timer
aTimer.SetTimeout( BLINK_ON_TIME );
aTimer.SetTimeoutHdl( LINK(this, SwBlink, Blinker) );
@@ -116,7 +116,7 @@ IMPL_LINK_NOARG(SwBlink, Blinker)
}
else // If the list is empty, the timer can be stopped
aTimer.Stop();
- return sal_True;
+ return 1;
}
void SwBlink::Insert( const Point& rPoint, const SwLinePortion* pPor,
commit 0b9310f91cdea3feb4160512d2fb1ce774007de7
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 10:23:37 2014 +0100
sal_Bool to bool
Change-Id: I65c0332e53196ff9c059db2dcb4721968dacff1b
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 8626435..91ce85d 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -55,15 +55,15 @@ using namespace ::com::sun::star;
* - SurvivalKit: For how long do we get past the last char of the line.
* - RightMargin abstains from adjusting position with -1
* - GetCharRect returns a GetEndCharRect for MV_RIGHTMARGIN
- * - GetEndCharRect sets bRightMargin to sal_True
- * - SwTxtCursor::bRightMargin is set to sal_False by CharCrsrToLine
+ * - GetEndCharRect sets bRightMargin to true
+ * - SwTxtCursor::bRightMargin is set to false by CharCrsrToLine
*/
namespace
{
SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
- const sal_Bool bRightMargin, const sal_Bool bNoScroll = sal_True )
+ const bool bRightMargin, const bool bNoScroll = true )
{
// RightMargin in the last master line
const sal_Int32 nOffset = rPos.nContent.GetIndex();
@@ -187,7 +187,7 @@ bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::GetCharRect with swapped frame" );
if( IsLocked() || IsHiddenNow() )
- return sal_False;
+ return false;
// Find the right frame first. We need to keep in mind that:
// - the cached information could be invalid (GetPara() == 0)
@@ -426,7 +426,7 @@ bool SwTxtFrm::GetAutoPos( SwRect& rOrig, const SwPosition &rPos ) const
SwTxtSizeInfo aInf( pFrm );
SwTxtCursor aLine( pFrm, &aInf );
SwCrsrMoveState aTmpState( MV_SETONLYTEXT );
- aTmpState.bRealHeight = sal_True;
+ aTmpState.bRealHeight = true;
if( aLine.GetCharRect( &rOrig, nOffset, &aTmpState, nMaxY ) )
{
if( aTmpState.aRealHeight.X() >= 0 )
@@ -781,11 +781,11 @@ bool SwTxtFrm::RightMargin(SwPaM *pPam, bool bAPI) const
class SwSetToRightMargin
{
- sal_Bool bRight;
+ bool bRight;
public:
- inline SwSetToRightMargin() : bRight( sal_False ) { }
+ inline SwSetToRightMargin() : bRight( false ) { }
inline ~SwSetToRightMargin() { SwTxtCursor::SetRightMargin( bRight ); }
- inline void SetRight( const sal_Bool bNew ) { bRight = bNew; }
+ inline void SetRight( const bool bNew ) { bRight = bNew; }
};
bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
@@ -1324,7 +1324,7 @@ bool SwTxtFrm::UnitUp(SwPaM *pPam, const SwTwips nOffset,
*/
const SwTxtFrm *pFrm = GetAdjFrmAtPos( (SwTxtFrm*)this, *(pPam->GetPoint()),
SwTxtCursor::IsRightMargin() );
- const sal_Bool bRet = pFrm->_UnitUp( pPam, nOffset, bSetInReadOnly );
+ const bool bRet = pFrm->_UnitUp( pPam, nOffset, bSetInReadOnly );
// No SwTxtCursor::SetRightMargin( false );
// Instead we have a SwSetToRightMargin in _UnitUp
@@ -1405,7 +1405,6 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
return;
}
}
- sal_Bool bFill = sal_True;
SwFont *pFnt;
SwTxtFmtColl* pColl = GetTxtNode()->GetTxtColl();
MSHORT nFirst = GetTxtNode()->GetSwAttrSet().GetULSpace().GetLower();
@@ -1434,13 +1433,15 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
if( !pSh->GetViewOptions()->getBrowseMode() || pSh->GetViewOptions()->IsPrtFormat() )
pOut = GetTxtNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
- pFnt->SetFntChg( sal_True );
+ pFnt->SetFntChg( true );
pFnt->ChgPhysFnt( pSh, *pOut );
SwTwips nLineHeight = pFnt->GetHeight( pSh, *pOut );
+ bool bFill = false;
if( nLineHeight )
{
+ bFill = true;
const SvxULSpaceItem &rUL = pSet->GetULSpace();
SwTwips nDist = std::max( rUL.GetLower(), rUL.GetUpper() );
if( rFill.Fill().nColumnCnt )
@@ -1469,7 +1470,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
else
nDiff = -1;
if( rFill.bInner )
- bFill = sal_False;
+ bFill = false;
else
{
const SvxTabStopItem &rRuler = pSet->GetTabStops();
@@ -1510,7 +1511,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
}
}
else
- bFill = sal_False;
+ bFill = false;
}
else
{
@@ -1530,13 +1531,13 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
rRect.Left( nRight );
}
else
- bFill = sal_False;
+ bFill = false;
}
else if( FILL_INDENT == rFill.Mode() )
{
SwTwips nIndent = rFill.X();
if( !rFill.bEmpty || nIndent > nRight )
- bFill = sal_False;
+ bFill = false;
else
{
nIndent -= rFill.Left();
@@ -1548,7 +1549,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
rRect.Left( nIndent + rFill.Left() );
}
else
- bFill = sal_False;
+ bFill = false;
}
}
else if( rFill.X() > nLeft )
@@ -1688,7 +1689,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
if( !rFill.bEmpty )
rFill.nLineWidth += FILL_MIN_DIST;
if( rRect.Left() < rFill.nLineWidth )
- bFill = sal_False;
+ bFill = false;
}
}
}
@@ -1709,13 +1710,11 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
nRectBottom = SwitchHorizontalToVertical( nRectBottom );
if( (*fnRect->fnYDiff)( nLimit, nRectBottom ) < 0 )
- bFill = sal_False;
+ bFill = false;
else
rRect.Width( 1 );
}
}
- else
- bFill = sal_False;
((SwCrsrMoveState*)rFill.pCMS)->bFillRet = bFill;
delete pFnt;
}
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 5f215ed..5129efa 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -73,7 +73,7 @@ void ValidateTxt( SwFrm *pFrm ) // Friend of frame
pFrm->Frm().Width() == pFrm->GetUpper()->Prt().Width() ) ||
( pFrm->IsVertical() &&
pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() ) )
- pFrm->mbValidSize = sal_True;
+ pFrm->mbValidSize = true;
}
void SwTxtFrm::ValidateFrm()
@@ -127,7 +127,7 @@ void _ValidateBodyFrm( SwFrm *pFrm )
pFrm->Calc();
else
{
- sal_Bool bOld = ((SwSectionFrm*)pFrm)->IsCntntLocked();
+ const bool bOld = ((SwSectionFrm*)pFrm)->IsCntntLocked();
((SwSectionFrm*)pFrm)->SetCntntLock( true );
pFrm->Calc();
if( !bOld )
@@ -375,7 +375,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
{
if( IsInFtn() && !IsInSct() )
{
- SwTwips nReal = Grow( nChgHght, sal_True );
+ SwTwips nReal = Grow( nChgHght, true );
if( nReal < nChgHght )
{
SwTwips nBot = (*fnRect->fnYInc)( (Frm().*fnRect->fnGetBottom)(),
@@ -485,11 +485,11 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit )
if( bHasToFit || !IsMoveable() ||
( IsInSct() && !FindSctFrm()->MoveAllowed(this) ) )
{
- SetUndersized( sal_True );
+ SetUndersized( true );
Shrink( std::min( ( nFrmHeight - nRstHeight), nPrtHeight ) );
}
else
- SetUndersized( sal_False );
+ SetUndersized( false );
}
}
else if( nChgHeight )
@@ -642,7 +642,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
else
{
if( !pFtnBoss )
- pFtnBoss = pFoll->FindFtnBossFrm( sal_True );
+ pFtnBoss = pFoll->FindFtnBossFrm( true );
pFtnBoss->ChangeFtnRef( pFoll, (SwTxtFtn*)pHt, this );
}
SetFtn( true );
@@ -735,7 +735,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const sal_Int32 nTxtPos )
else
{
if( !pFtnBoss )
- pFtnBoss = FindFtnBossFrm( sal_True );
+ pFtnBoss = FindFtnBossFrm( true );
pFtnBoss->ChangeFtnRef( this, (SwTxtFtn*)pHt, pNew );
}
pNew->SetFtn( true );
@@ -942,14 +942,14 @@ bool SwTxtFrm::CalcPreps()
Shrink( nMust - nIs );
if( Prt().Width() < 0 )
Prt().Width( 0 );
- SetUndersized( sal_True );
+ SetUndersized( true );
}
else if ( ! bVert && nIs > nMust )
{
Shrink( nIs - nMust );
if( Prt().Height() < 0 )
Prt().Height( 0 );
- SetUndersized( sal_True );
+ SetUndersized( true );
}
}
}
@@ -1609,9 +1609,9 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
// If necessary the pPara
KSHORT nOld = ((const SwTxtMargin&)rLine).GetDropHeight();
- sal_Bool bShrink = sal_False,
- bGrow = sal_False,
- bGoOn = rLine.IsOnceMore();
+ bool bShrink = false;
+ bool bGrow = false;
+ bool bGoOn = rLine.IsOnceMore();
sal_uInt8 nGo = 0;
while( bGoOn )
{
@@ -1629,16 +1629,16 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
{
const KSHORT nNew = ((const SwTxtMargin&)rLine).GetDropHeight();
if( nOld == nNew )
- bGoOn = sal_False;
+ bGoOn = false;
else
{
if( nOld > nNew )
- bShrink = sal_True;
+ bShrink = true;
else
- bGrow = sal_True;
+ bGrow = true;
if( bShrink == bGrow || 5 < nGo )
- bGoOn = sal_False;
+ bGoOn = false;
nOld = nNew;
}
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index fd16509..1a3031a 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -72,7 +72,7 @@ sal_Bool SwTxtFrmInfo::IsOneLine() const
return sal_False;
else
{
- // For follows sal_False of course
+ // For follows false of course
if( pFrm->GetFollow() )
return sal_False;
pLay = pLay->GetNext();
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index bf4dc37..8123951 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -124,7 +124,7 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh,
nX, line number's x position
pFnt, line number's font
nLineNr, the first line number
- bLineNum is set back to sal_False if the numbering is completely
+ bLineNum is set back to false if the numbering is completely
outside of the paint rect
*/
nDivider = !rLineInf.GetDivider().isEmpty() ? rLineInf.GetDividerCountBy() : 0;
@@ -204,8 +204,8 @@ void SwExtraPainter::PaintExtra( SwTwips nY, long nAsc, long nMax, bool bRed )
aDrawInf.SetRight( LONG_MAX );
aDrawInf.SetFrm( pTxtFrm );
aDrawInf.SetFont( pFnt );
- aDrawInf.SetSnapToGrid( sal_False );
- aDrawInf.SetIgnoreFrmRTL( sal_True );
+ aDrawInf.SetSnapToGrid( false );
+ aDrawInf.SetIgnoreFrmRTL( true );
bool bTooBig = pFnt->GetSize( pFnt->GetActual() ).Height() > nMax &&
pFnt->GetHeight( pSh, *pSh->GetOut() ) > nMax;
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 276ad5b..54fd60a 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -301,7 +301,7 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
CalcRightMargin( pCurrent, nReal );
// #i49277#
- const sal_Bool bDoNotJustifyLinesWithManualBreak =
+ const bool bDoNotJustifyLinesWithManualBreak =
GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK);
SwLinePortion *pPos = pCurrent->GetPortion();
@@ -427,7 +427,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
long nKanaDiffSum = 0;
SwTwips nRepaintOfst = 0;
SwTwips nX = 0;
- sal_Bool bNoCompression = sal_False;
+ bool bNoCompression = false;
// Do not forget: CalcRightMargin() sets pCurrent->Width() to the line width!
CalcRightMargin( pCurrent, 0 );
@@ -479,7 +479,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
((SwGluePortion*)pPos)->GetPrtGlue() :
0;
- bNoCompression = sal_False;
+ bNoCompression = false;
}
if( nKanaDiffSum )
@@ -630,14 +630,14 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
sal_Int32 nLen = 0;
// If we only have one line, the text portion is consecutive and we center, then ...
- sal_Bool bComplete = 0 == nStart;
- const sal_Bool bTabCompat = GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT);
- sal_Bool bMultiTab = sal_False;
+ bool bComplete = 0 == nStart;
+ const bool bTabCompat = GetTxtFrm()->GetNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT);
+ bool bMultiTab = false;
while( pPos )
{
if ( pPos->IsMultiPortion() && ((SwMultiPortion*)pPos)->HasTabulator() )
- bMultiTab = sal_True;
+ bMultiTab = true;
else if( pPos->InFixMargGrp() &&
( bTabCompat ? ! pPos->InTabGrp() : ! bMultiTab ) )
{
@@ -680,7 +680,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
}
pGlue = (SwFlyPortion*)pPos;
- bComplete = sal_False;
+ bComplete = false;
}
nLen = nLen + pPos->GetLen();
pPos = pPos->GetPortion();
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index e4a469d..a418f98 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -351,9 +351,9 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
mnTabLeft = pNode->GetLeftMarginForTabCalculation();
#if OSL_DEBUG_LEVEL > 1
- static sal_Bool bOne = sal_False;
- static sal_Bool bLast = sal_False;
- static sal_Bool bCenter = sal_False;
+ static bool bOne = false;
+ static bool bLast = false;
+ static bool bCenter = false;
bOneBlock |= bOne;
bLastBlock |= bLast;
bLastCenter |= bCenter;
@@ -513,12 +513,12 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
// If we are looking for a position inside a field which covers
// more than one line we may not skip any "empty portions" at the
// beginning of a line
- const sal_Bool bInsideFirstField = pCMS && pCMS->pSpecialPos &&
+ const bool bInsideFirstField = pCMS && pCMS->pSpecialPos &&
( pCMS->pSpecialPos->nLineOfst ||
SP_EXTEND_RANGE_BEFORE ==
pCMS->pSpecialPos->nExtendRange );
- sal_Bool bWidth = pCMS && pCMS->bRealWidth;
+ bool bWidth = pCMS && pCMS->bRealWidth;
if( !pCurr->GetLen() && !pCurr->Width() )
{
if ( pCMS && pCMS->bRealHeight )
@@ -541,7 +541,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
size_t nKanaIdx = 0;
long nSpaceAdd = pCurr->IsSpaceAdd() ? pCurr->GetLLSpaceAdd( 0 ) : 0;
- sal_Bool bNoTxt = sal_True;
+ bool bNoTxt = true;
// First all portions without Len at beginning of line are skipped.
// Exceptions are the mean special portions from WhichFirstPortion:
@@ -559,7 +559,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
// if( pPor->InTxtGrp() || pPor->IsBreakPortion() )
if( pPor->InTxtGrp() || pPor->IsBreakPortion() || pPor->InTabGrp() )
{
- bNoTxt = sal_False;
+ bNoTxt = false;
nTmpFirst = nX;
}
if( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->HasTabulator() )
@@ -578,7 +578,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
if( pPor->InFixMargGrp() )
{
if( pPor->IsMarginPortion() )
- bNoTxt = sal_False;
+ bNoTxt = false;
else
{
// fix margin portion => next SpaceAdd, KanaComp value
@@ -697,12 +697,11 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
if( pCMS && pCMS->b2Lines )
{
- sal_Bool bRecursion = sal_True;
- if ( ! pCMS->p2Lines )
+ const bool bRecursion = pCMS->p2Lines;
+ if ( !bRecursion )
{
pCMS->p2Lines = new Sw2LinesPos;
pCMS->p2Lines->aLine = SwRect(aCharPos, aCharSize);
- bRecursion = sal_False;
}
if( ((SwMultiPortion*)pPor)->HasRotation() )
@@ -745,7 +744,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
SetPropFont( 50 );
GETGRID( GetTxtFrm()->FindPageFrm() )
- const sal_Bool bHasGrid = pGrid && GetInfo().SnapToGrid();
+ const bool bHasGrid = pGrid && GetInfo().SnapToGrid();
const sal_uInt16 nRubyHeight = bHasGrid ?
pGrid->GetRubyHeight() : 0;
@@ -767,7 +766,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
Next();
}
- sal_Bool bSpaceChg = ((SwMultiPortion*)pPor)->
+ const bool bSpaceChg = ((SwMultiPortion*)pPor)->
ChgSpaceAdd( pCurr, nSpaceAdd );
Point aOldPos = pOrig->Pos();
@@ -777,7 +776,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
// for the adjustment inside the recursion
const sal_uInt16 nOldRubyHeight = pCurr->Height();
const sal_uInt16 nOldRubyRealHeight = pCurr->GetRealHeight();
- const sal_Bool bChgHeight =
+ const bool bChgHeight =
((SwMultiPortion*)pPor)->IsRuby() && bHasGrid;
if ( bChgHeight )
@@ -960,7 +959,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
}
}
}
- bWidth = sal_False;
+ bWidth = false;
break;
}
}
@@ -969,7 +968,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
if( pPor )
{
OSL_ENSURE( !pPor->InNumberGrp() || bInsideFirstField, "Number surprise" );
- sal_Bool bEmptyFld = sal_False;
+ bool bEmptyFld = false;
if( pPor->InFldGrp() && pPor->GetLen() )
{
SwFldPortion *pTmp = (SwFldPortion*)pPor;
@@ -989,7 +988,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
nPorHeight = pTmp->Height();
nPorAscent = pTmp->GetAscent();
nX += nAddX;
- bEmptyFld = sal_True;
+ bEmptyFld = true;
}
}
// 8513: Fields in justified text, skipped
@@ -1205,7 +1204,7 @@ bool SwTxtCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
// Indicates that a position inside a special portion (field, number portion)
// is requested.
- const sal_Bool bSpecialPos = pCMS && pCMS->pSpecialPos;
+ const bool bSpecialPos = pCMS && pCMS->pSpecialPos;
sal_Int32 nFindOfst = nOfst;
if ( bSpecialPos )
@@ -1307,14 +1306,14 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
if( nRightMargin == nLeftMargin )
nRightMargin += 30;
- const sal_Bool bLeftOver = x < nLeftMargin;
+ const bool bLeftOver = x < nLeftMargin;
if( bLeftOver )
x = nLeftMargin;
- const sal_Bool bRightOver = x > nRightMargin;
+ const bool bRightOver = x > nRightMargin;
if( bRightOver )
x = nRightMargin;
- sal_Bool bRightAllowed = pCMS && ( pCMS->eState == MV_NONE );
+ const bool bRightAllowed = pCMS && ( pCMS->eState == MV_NONE );
// Until here everything in document coordinates.
x -= nLeftMargin;
@@ -1325,8 +1324,8 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
// in which nX is situated.
SwLinePortion *pPor = pCurr->GetFirstPortion();
sal_Int32 nCurrStart = nStart;
- sal_Bool bHolePortion = sal_False;
- sal_Bool bLastHyph = sal_False;
+ bool bHolePortion = false;
+ bool bLastHyph = false;
std::deque<sal_uInt16> *pKanaComp = pCurr->GetpKanaComp();
sal_Int32 nOldIdx = GetInfo().GetIdx();
@@ -1423,7 +1422,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
bLastHyph = pPor->InHyphGrp();
}
- const sal_Bool bLastPortion = (0 == pPor->GetPortion());
+ const bool bLastPortion = (0 == pPor->GetPortion());
if( nX==nWidth )
{
@@ -1442,7 +1441,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
sal_Int32 nLength = pPor->GetLen();
- sal_Bool bFieldInfo = pCMS && pCMS->bFieldInfo;
+ const bool bFieldInfo = pCMS && pCMS->bFieldInfo;
if( bFieldInfo && ( nWidth30 < nX || bRightOver || bLeftOver ||
( pPor->InNumberGrp() && !pPor->IsFtnNumPortion() ) ||
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 3d20a39..f51d1ff 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -61,7 +61,7 @@ void SwNoteURL::FillImageMap( ImageMap *pMap, const Point &rPos,
Rectangle aRect( OutputDevice::LogicToLogic( aSwRect.SVRect(),
rMap, aMap ) );
IMapRectangleObject aObj( aRect, rNote.GetURL(), OUString(), OUString(),
- rNote.GetTarget(), OUString(), sal_True, sal_False );
+ rNote.GetTarget(), OUString(), true, false );
pMap->InsertIMapObject( aObj );
}
}
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index a9d9dc7..12c5312 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -300,8 +300,8 @@ bool SwLinePortion::Format( SwTxtFormatInfo &rInf )
Height( pLast->Height() );
SetAscent( pLast->GetAscent() );
const KSHORT nNewWidth = static_cast<sal_uInt16>(rInf.X() + PrtWidth());
- // Nur Portions mit echter Breite koennen ein sal_True zurueckliefern
- // Notizen beispielsweise setzen niemals bFull==sal_True
+ // Nur Portions mit echter Breite koennen ein true zurueckliefern
+ // Notizen beispielsweise setzen niemals bFull==true
if( rInf.Width() <= nNewWidth && PrtWidth() && ! IsKernPortion() )
{
Truncate();
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 263d0fb..4595dd5 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -279,7 +279,7 @@ SwTwips SwTxtFrm::EmptyHeight() const
Prt().SSize().Height() + 1;
else
{
- pFnt->SetFntChg( sal_True );
+ pFnt->SetFntChg( true );
pFnt->ChgPhysFnt( pSh, *pOut );
nRet = pFnt->GetHeight( pSh, *pOut );
}
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 2c25bd4..0711974 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -77,7 +77,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
SwExpandPortion *pRet = 0;
SwFrm *pFrame = (SwFrm*)pFrm;
SwField *pFld = (SwField*)pHint->GetFmtFld().GetField();
- const sal_Bool bName = rInf.GetOpt().IsFldName();
+ const bool bName = rInf.GetOpt().IsFldName();
SwCharFmt* pChFmt = 0;
bool bNewFlyPor = false;
@@ -96,7 +96,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
SwViewShell *pSh = rInf.GetVsh();
SwDoc *const pDoc( (pSh) ? pSh->GetDoc() : 0 );
bool const bInClipboard( (pDoc) ? pDoc->IsClipBoard() : true );
- sal_Bool bPlaceHolder = false;
+ bool bPlaceHolder = false;
switch( pFld->GetTyp()->Which() )
{
@@ -159,7 +159,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
SwPageNumberFieldType *pPageNr = (SwPageNumberFieldType *)pFld->GetTyp();
const SwRootFrm* pTmpRootFrm = pSh->GetLayout();
- const sal_Bool bVirt = pTmpRootFrm->IsVirtPageNum();
+ const bool bVirt = pTmpRootFrm->IsVirtPageNum();
MSHORT nVirtNum = pFrame->GetVirtPageNum();
MSHORT nNumPages = pTmpRootFrm->GetPageNum();
@@ -442,8 +442,8 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
nLevel = MAXLEVEL - 1;
const SwNumFmt &rNumFmt = pNumRule->Get( nLevel );
- const sal_Bool bLeft = SVX_ADJUST_LEFT == rNumFmt.GetNumAdjust();
- const sal_Bool bCenter = SVX_ADJUST_CENTER == rNumFmt.GetNumAdjust();
+ const bool bLeft = SVX_ADJUST_LEFT == rNumFmt.GetNumAdjust();
+ const bool bCenter = SVX_ADJUST_CENTER == rNumFmt.GetNumAdjust();
const bool bLabelAlignmentPosAndSpaceModeActive(
rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT );
const KSHORT nMinDist = bLabelAlignmentPosAndSpaceModeActive
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index cab59b1..b59056b 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -339,7 +339,7 @@ void SwTxtFrm::Init()
// set flags directly to save a ResetPreps call,
// and thereby an unnecessary GetPara call
// don't set bOrphan, bLocked or bWait to false!
- // bOrphan = bFlag7 = bFlag8 = sal_False;
+ // bOrphan = bFlag7 = bFlag8 = false;
}
}
@@ -874,7 +874,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
Prepare( PREP_CLEAR );
_InvalidatePrt();
lcl_SetWrong( *this, 0, COMPLETE_STRING, false );
- SetDerivedR2L( sal_False );
+ SetDerivedR2L( false );
CheckDirChange();
// OD 09.12.2002 #105576# - Force complete paint due to existing
// indents.
@@ -1181,7 +1181,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
else if ( SFX_ITEM_SET ==
rNewSet.GetItemState( RES_FRAMEDIR, false ) )
{
- SetDerivedR2L( sal_False );
+ SetDerivedR2L( false );
CheckDirChange();
// OD 09.12.2002 #105576# - Force complete paint due to existing
// indents.
@@ -1270,7 +1270,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
bSetFldsDirty = true;
break;
case RES_FRAMEDIR :
- SetDerivedR2L( sal_False );
+ SetDerivedR2L( false );
CheckDirChange();
break;
default:
@@ -1849,7 +1849,7 @@ bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, bool &bSplit
}
/* SwTxtFrm::WouldFit()
- * sal_True: wenn ich aufspalten kann.
+ * true: wenn ich aufspalten kann.
* Es soll und braucht nicht neu formatiert werden.
* Wir gehen davon aus, dass bereits formatiert wurde und dass
* die Formatierungsdaten noch aktuell sind.
@@ -2005,7 +2005,7 @@ SwTxtFrm* SwTxtFrm::GetFormatted( bool bForceQuickFormat )
if( !HasPara() && !(IsValid() && IsEmpty()) )
{
// Calc() must be called, because frame position can be wrong
- const sal_Bool bFormat = GetValidSizeFlag();
+ const bool bFormat = GetValidSizeFlag();
Calc();
// Es kann durchaus sein, dass Calc() das Format()
// nicht anstiess (weil wir einst vom Idle-Zerstoerer
@@ -2204,7 +2204,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
{
SwFntObj *pOldFont = pLastFont;
pLastFont = NULL;
- aFont.SetFntChg( sal_True );
+ aFont.SetFntChg( true );
aFont.ChgPhysFnt( pVsh, *pOut );
mnHeightOfLastLine = aFont.GetHeight( pVsh, *pOut );
pLastFont->Unlock();
@@ -2214,7 +2214,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
else
{
Font aOldFont = pOut->GetFont();
- aFont.SetFntChg( sal_True );
+ aFont.SetFntChg( true );
aFont.ChgPhysFnt( pVsh, *pOut );
mnHeightOfLastLine = aFont.GetHeight( pVsh, *pOut );
pLastFont->Unlock();
commit 6262c7073190d983e14727ea635f35a5b03dc7e2
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 09:20:17 2014 +0100
This function is local
Change-Id: Icd8f792c01ee5de73f2b8893d9b098f55040507e
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 9efb339..8626435 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -59,9 +59,8 @@ using namespace ::com::sun::star;
* - SwTxtCursor::bRightMargin is set to sal_False by CharCrsrToLine
*/
-/*************************************************************************
- * GetAdjFrmAtPos()
- *************************************************************************/
+namespace
+{
SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
const sal_Bool bRightMargin, const sal_Bool bNoScroll = sal_True )
@@ -103,6 +102,8 @@ SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
return pFrmAtPos ? pFrmAtPos : pFrm;
}
+}
+
bool sw_ChangeOffset( SwTxtFrm* pFrm, sal_Int32 nNew )
{
// Do not scroll in areas and outside of flies
commit 1b4399dc9064589ff5ec6f09e3e65480d7cfd2fb
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 08:43:50 2014 +0100
Adapt comment to reality (sal_Bool to bool)
Change-Id: Ib9197ac8a402f4bf4019550f908f09a657dd6f60
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index 240bcc4..e2e6e8f 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -79,7 +79,7 @@ class SwTxtFormatter : public SwTxtPainter
Determines the next object, that reaches into the rest of the line and
constructs the appropriate FlyPortion.
- SwTxtFly::GetFrm(const SwRect&, sal_Bool) will be needed for this.
+ SwTxtFly::GetFrm(const SwRect&, bool) will be needed for this.
The right edge can be shortened by flys
*/
commit 5e5b86c425be4d67b7a5966c28a034e9616e19f4
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 08:40:37 2014 +0100
sal_Bool to bool
Change-Id: Ic17400b4cde699387b6fccbc0744aeb8ef5734c5
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 8f326fe..b1b4ca9 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -97,7 +97,7 @@ public:
// nMaxHeight is the required height
// bSplit indicates that the paragraph has to be split
// bTst indicates that we are currently doing a test formatting
- virtual sal_Bool WouldFit( SwTwips &nMaxHeight, sal_Bool &bSplit, sal_Bool bTst );
+ virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst );
sal_Bool MoveFtnCntFwd( sal_Bool, SwFtnBossFrm* ); // called by MoveFwd if content
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 2e8fc9c..9a6c8c2 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -331,14 +331,14 @@ public:
// nMaxHeight is the required height
// bSplit indicates, that the paragraph has to be split
// bTst indicates, that we are currently doing a test formatting
- virtual sal_Bool WouldFit( SwTwips &nMaxHeight, sal_Bool &bSplit, sal_Bool bTst );
+ virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst );
// Hier das WouldFit-Aequivalent fuer mal kurz probeweise
// umgehaengte TextFrames, auch hier liefert
// nMaxHeight die benoetigte Hoehe,
// und bSplit sagt, obj der Absatz gesplittet werden muss.
// Uebergeben wird der potentielle Vorgaenger fuer die Abstandsberechnung
- sal_Bool TestFormat( const SwFrm* pPrv, SwTwips &nMaxHeight, sal_Bool &bSplit );
+ bool TestFormat( const SwFrm* pPrv, SwTwips &nMaxHeight, bool &bSplit );
// Wir formatieren eine Zeile fuer die interaktive Trennung
// Return: found
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 90dfb72..ae1fbc8 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1563,8 +1563,8 @@ void SwCntntFrm::MakeAll()
{
SwTwips nTmp = (GetUpper()->Prt().*fnRect->fnGetHeight)() -
(Prt().*fnRect->fnGetTop)();
- sal_Bool bSplit = !IsFwdMoveAllowed();
- if ( nTmp > 0 && WouldFit( nTmp, bSplit, sal_False ) )
+ bool bSplit = !IsFwdMoveAllowed();
+ if ( nTmp > 0 && WouldFit( nTmp, bSplit, false ) )
{
Prepare( PREP_WIDOWS_ORPHANS, 0, false );
mbValidSize = sal_False;
@@ -1771,7 +1771,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
}
sal_Bool bRet;
- sal_Bool bSplit = !pNewUpper->Lower();
+ bool bSplit = !pNewUpper->Lower();
SwCntntFrm *pFrm = this;
const SwFrm *pTmpPrev = pNewUpper->Lower();
if( pTmpPrev && pTmpPrev->IsFtnFrm() )
@@ -1783,7 +1783,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
// #i46181#
SwTwips nSecondCheck = 0;
SwTwips nOldSpace = nSpace;
- sal_Bool bOldSplit = bSplit;
+ bool bOldSplit = bSplit;
if ( bTstMove || IsInFly() || ( IsInSct() &&
( pFrm->GetUpper()->IsColBodyFrm() || ( pFtnFrm &&
@@ -1818,14 +1818,14 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
bRet = ((SwTxtFrm*)pFrm)->TestFormat( pTmpPrev, nSpace, bSplit );
}
else
- bRet = pFrm->WouldFit( nSpace, bSplit, sal_False );
+ bRet = pFrm->WouldFit( nSpace, bSplit, false );
pTmpFrm->Remove();
pTmpFrm->InsertBefore( pUp, pOldNext );
}
else
{
- bRet = pFrm->WouldFit( nSpace, bSplit, sal_False );
+ bRet = pFrm->WouldFit( nSpace, bSplit, false );
nSecondCheck = !bSplit ? 1 : 0;
}
@@ -1894,7 +1894,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
// We do a second check with the original remaining space
// reduced by the required upper space:
nOldSpace -= nSecondCheck;
- const bool bSecondRet = nOldSpace >= 0 && pFrm->WouldFit( nOldSpace, bOldSplit, sal_False );
+ const bool bSecondRet = nOldSpace >= 0 && pFrm->WouldFit( nOldSpace, bOldSplit, false );
if ( bSecondRet && bOldSplit && nOldSpace >= 0 )
{
bRet = sal_True;
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index ae710bc..5603fe0 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -31,10 +31,10 @@ void SwFrm::Paint(SwRect const&, SwPrintData const*const) const
OSL_FAIL( "Paint() of the base class called." );
}
-sal_Bool SwCntntFrm::WouldFit( SwTwips &, sal_Bool&, sal_Bool )
+bool SwCntntFrm::WouldFit( SwTwips &, bool&, bool )
{
OSL_FAIL( "WouldFit of CntntFrm called." );
- return sal_False;
+ return false;
}
bool SwFrm::FillSelection( SwSelectionList& , const SwRect& ) const
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 0e92844..cab59b1 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1836,16 +1836,16 @@ SwTestFormat::~SwTestFormat()
pFrm->SetPara( pOldPara );
}
-sal_Bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, sal_Bool &bSplit )
+bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, bool &bSplit )
{
PROTOCOL_ENTER( this, PROT_TESTFORMAT, 0, 0 )
if( IsLocked() && GetUpper()->Prt().Width() <= 0 )
- return sal_False;
+ return false;
SwTestFormat aSave( this, pPrv, rMaxHeight );
- return SwTxtFrm::WouldFit( rMaxHeight, bSplit, sal_True );
+ return SwTxtFrm::WouldFit( rMaxHeight, bSplit, true );
}
/* SwTxtFrm::WouldFit()
@@ -1859,14 +1859,14 @@ sal_Bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, sal_Bool
* Die benoetigte Hoehe wird von nMaxHeight abgezogen!
*/
-sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTst )
+bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, bool &bSplit, bool bTst )
{
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
"SwTxtFrm::WouldFit with swapped frame" );
SWRECTFN( this );
if( IsLocked() )
- return sal_False;
+ return false;
// it can happen that the IdleCollector removed the cached information
if( !IsEmpty() )
@@ -1878,23 +1878,23 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTs
// which is called in <SwTxtFrm::TestFormat(..)>
if ( IsEmpty() && !bTst )
{
- bSplit = sal_False;
+ bSplit = false;
SwTwips nHeight = bVert ? Prt().SSize().Width() : Prt().SSize().Height();
if( rMaxHeight < nHeight )
- return sal_False;
+ return false;
else
{
rMaxHeight -= nHeight;
- return sal_True;
+ return true;
}
}
// In sehr unguenstigen Faellen kann GetPara immer noch 0 sein.
- // Dann returnen wir sal_True, um auf der neuen Seite noch einmal
+ // Dann returnen wir true, um auf der neuen Seite noch einmal
// anformatiert zu werden.
OSL_ENSURE( HasPara() || IsHiddenNow(), "WouldFit: GetFormatted() and then !HasPara()" );
if( !HasPara() || ( !(Frm().*fnRect->fnGetHeight)() && IsHiddenNow() ) )
- return sal_True;
+ return true;
// Da das Orphan-Flag nur sehr fluechtig existiert, wird als zweite
// Bedingung ueberprueft, ob die Rahmengroesse durch CalcPreps
@@ -1924,10 +1924,10 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTs
!pFoll->Frm().Height() ) )
pFoll = pFoll->GetFollow();
if( pFoll )
- return sal_False;
+ return false;
}
else
- return sal_False;
+ return false;
}
}
@@ -1938,7 +1938,7 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTs
WidowsAndOrphans aFrmBreak( this, rMaxHeight, bSplit );
- sal_Bool bRet = sal_True;
+ bool bRet = true;
aLine.Bottom();
// is breaking necessary?
commit 69cae997f95234d1f933e0c446c3946978269d31
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 08:11:43 2014 +0100
SwTxtFrm::bFormatted is never used
Change-Id: I25584aec4b3a855b7b3908c1ec478d7cce40909e
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 3cc71b1..2e8fc9c 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -109,7 +109,6 @@ class SwTxtFrm: public SwCntntFrm
const sal_Int32 nStrLen, const bool bDummy );
bool bLocked : 1; // im Format?
- bool bFormatted : 1; // nach Format auf true
bool bWidow : 1; // sind wir ein Widow
bool bJustWidow : 1; // haben wir soeben Widow angefordert
bool bEmpty : 1; // sind wir ein leerer Absatz
@@ -130,7 +129,6 @@ class SwTxtFrm: public SwCntntFrm
void ResetPreps();
inline void Lock() { bLocked = true; }
inline void Unlock() { bLocked = false; }
- inline void SetFormatted( const bool bNew ) { bFormatted = bNew; }
inline void SetWidow( const bool bNew ) { bWidow = bNew; }
inline void SetJustWidow( const bool bNew ) { bJustWidow = bNew; }
inline void SetEmpty( const bool bNew ) { bEmpty = bNew; }
@@ -363,7 +361,6 @@ public:
// Locking
inline bool IsLocked() const { return bLocked; }
- inline bool IsFormatted() const { return bFormatted; }
inline bool IsWidow() const { return bWidow; }
inline bool IsJustWidow() const { return bJustWidow; }
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 18b9e7c..0e92844 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -355,7 +355,6 @@ SwTxtFrm::SwTxtFrm(SwTxtNode * const pNode, SwFrm* pSib )
, nOfst( 0 )
, nCacheIdx( MSHRT_MAX )
, bLocked( false )
- , bFormatted( false )
, bWidow( false )
, bJustWidow( false )
, bEmpty( false )
commit 7c87db6ac33cd5b8514f319b10404f556916acec
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 01:10:07 2014 +0100
Fix memory leak a simplify code
Change-Id: I84ae9025d53d1544aa8ba0a56a2316cbf77561ea
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index add82da1..6cc0f67 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -516,16 +516,14 @@ bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
}
if ( !bRet )
{
- Point *pPoint = pCMS && pCMS->pFill ? new Point( rPoint ) : NULL;
+ const bool bFill = pCMS && pCMS->pFill;
+ Point aPoint( rPoint );
const SwCntntFrm *pCnt = GetCntntPos( rPoint, true );
- if( pPoint && pCnt->IsTxtFrm() )
+ if( bFill && pCnt->IsTxtFrm() )
{
- pCnt->GetCrsrOfst( pPos, *pPoint, pCMS );
- rPoint = *pPoint;
+ rPoint = aPoint;
}
- else
- pCnt->GetCrsrOfst( pPos, rPoint, pCMS );
- delete pPoint;
+ pCnt->GetCrsrOfst( pPos, rPoint, pCMS );
}
return true;
}
@@ -599,18 +597,16 @@ bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
}
if ( !bRet )
{
- Point *pPoint = pCMS && pCMS->pFill ? new Point( rPoint ) : NULL;
+ const bool bFill = pCMS && pCMS->pFill;
+ Point aPoint( rPoint );
const SwCntntFrm *pCnt = GetCntntPos( rPoint, true, false, false, pCMS );
if ( pCMS && pCMS->bStop )
return false;
- if( pPoint && pCnt->IsTxtFrm() )
+ if( bFill && pCnt->IsTxtFrm() )
{
- pCnt->GetCrsrOfst( pPos, *pPoint, pCMS );
- rPoint = *pPoint;
+ rPoint = aPoint;
}
- else
- pCnt->GetCrsrOfst( pPos, rPoint, pCMS );
- delete pPoint;
+ pCnt->GetCrsrOfst( pPos, rPoint, pCMS );
bRet = true;
}
}
commit 81da8a36978e0d650e146c54f51740656130f23a
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Feb 22 00:26:27 2014 +0100
Fix regression: execute IsAnyFrm only if bOn is true
Change-Id: I2d2ce5913e8737caba2391a4e40f4c72c1911f90
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index e1d345a..47b4f07 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -319,13 +319,19 @@ inline bool SwTxtFly::IsOn() const
inline bool SwTxtFly::Relax( const SwRect &rRect )
{
- bOn &= IsAnyFrm( rRect );
+ if (bOn)
+ {
+ bOn = IsAnyFrm( rRect );
+ }
return bOn;
}
inline bool SwTxtFly::Relax()
{
- bOn &= IsAnyFrm();
+ if (bOn)
+ {
+ bOn = IsAnyFrm();
+ }
return bOn;
}
commit 80a280d7a47f3c6f65d687789c2079460a30442b
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Feb 21 00:19:09 2014 +0100
Group common code of SwCrsrShell::Goto(Prev|Next)Num
Change-Id: Iae3b6bc395530ac1d179fdd129239c32bf74d1e6
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index adf3319..fd2fc16 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -236,6 +236,8 @@ private:
sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
sal_Bool bIdleEnd = sal_False );
+ SAL_DLLPRIVATE void MoveCrsrToNum();
+
SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
/** Mark a certain list level of a certain list
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ed9556c..211e39b 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -67,83 +67,55 @@
using namespace ::com::sun::star;
-/// go to next/previous point on the same level
-bool SwCrsrShell::GotoNextNum()
+void SwCrsrShell::MoveCrsrToNum()
{
- bool bRet = GetDoc()->GotoNextNum( *m_pCurCrsr->GetPoint() );
- if( bRet )
+ SwCallLink aLk( *this ); // watch Crsr-Moves
+ SwCrsrSaveState aSaveState( *m_pCurCrsr );
+ if( ActionPend() )
+ return;
+ SET_CURR_SHELL( this );
+ // try to set cursor onto this position, at half of the char-
+ // SRectangle's height
+ Point aPt( m_pCurCrsr->GetPtPos() );
+ SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
+ m_pCurCrsr->GetPoint() );
+ pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
+ pFrm->Calc();
+ if( pFrm->IsVertical() )
{
- SwCallLink aLk( *this ); // watch Crsr-Moves
- SwCrsrSaveState aSaveState( *m_pCurCrsr );
- if( !ActionPend() )
- {
- SET_CURR_SHELL( this );
- // try to set cursor onto this position, at half of the char-
- // SRectangle's height
- Point aPt( m_pCurCrsr->GetPtPos() );
- SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
- m_pCurCrsr->GetPoint() );
- pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
- pFrm->Calc();
- if( pFrm->IsVertical() )
- {
- aPt.setX(m_aCharRect.Center().getX());
- aPt.setY(pFrm->Frm().Top() + m_nUpDownX);
- }
- else
- {
- aPt.setY(m_aCharRect.Center().getY());
- aPt.setX(pFrm->Frm().Left() + m_nUpDownX);
- }
- pFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
- bRet = !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
- if( bRet )
- UpdateCrsr(SwCrsrShell::UPDOWN |
- SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
- SwCrsrShell::READONLY );
- }
+ aPt.setX(m_aCharRect.Center().getX());
+ aPt.setY(pFrm->Frm().Top() + m_nUpDownX);
}
- return bRet;
+ else
+ {
+ aPt.setY(m_aCharRect.Center().getY());
+ aPt.setX(pFrm->Frm().Left() + m_nUpDownX);
+ }
+ pFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
+ if ( !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+ nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ))
+ {
+ UpdateCrsr(SwCrsrShell::UPDOWN |
+ SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
+ SwCrsrShell::READONLY );
+ }
+}
+
+/// go to next/previous point on the same level
+bool SwCrsrShell::GotoNextNum()
+{
+ if (!GetDoc()->GotoNextNum( *m_pCurCrsr->GetPoint() ))
+ return false;
+ MoveCrsrToNum();
+ return true;
}
bool SwCrsrShell::GotoPrevNum()
{
- bool bRet = GetDoc()->GotoPrevNum( *m_pCurCrsr->GetPoint() );
- if( bRet )
- {
- SwCallLink aLk( *this ); // watch Crsr-Moves
- SwCrsrSaveState aSaveState( *m_pCurCrsr );
- if( !ActionPend() )
- {
- SET_CURR_SHELL( this );
- // try to set cursor onto this position, at half of the char-
- // SRectangle's height
- Point aPt( m_pCurCrsr->GetPtPos() );
- SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
- m_pCurCrsr->GetPoint() );
- pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
- pFrm->Calc();
- if( pFrm->IsVertical() )
- {
- aPt.setX(m_aCharRect.Center().getX());
- aPt.setY(pFrm->Frm().Top() + m_nUpDownX);
- }
- else
- {
- aPt.setY(m_aCharRect.Center().getY());
- aPt.setX(pFrm->Frm().Left() + m_nUpDownX);
- }
- pFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
- bRet = !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
- if( bRet )
- UpdateCrsr(SwCrsrShell::UPDOWN |
- SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
- SwCrsrShell::READONLY );
- }
- }
- return bRet;
+ if (!GetDoc()->GotoPrevNum( *m_pCurCrsr->GetPoint() ))
+ return false;
+ MoveCrsrToNum();
+ return true;
}
/// jump from content to header
commit c28f492d83a45509670513003ef3773b07a8412b
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Thu Feb 20 23:34:04 2014 +0100
sal_Bool to bool and some simplifications
Change-Id: Ia30f93df3ee5d0cfef826d9b6d7d5506fca7333a
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 701766f..95477d8 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2602,7 +2602,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
SwCrsrMoveState aMoveState;
aMoveState.bPosMatchesBounds = true;
- sal_Bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState );
+ const bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState );
SwIndex aCntntIdx = aPos.nContent;
const sal_Int32 nIndex = aCntntIdx.GetIndex();
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index d5a09b1..e24ea01 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2333,7 +2333,7 @@ sal_Bool SwCrsrShell::SetVisCrsr( const Point &rPt )
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
aTmpState.bRealHeight = sal_True;
- sal_Bool bRet = GetLayout()->GetCrsrOfst( &aPos, aPt /*, &aTmpState*/ );
+ const bool bRet = GetLayout()->GetCrsrOfst( &aPos, aPt /*, &aTmpState*/ );
SetInFrontOfLabel( false ); // #i27615#
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3b44ea2..ed9556c 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1145,7 +1145,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rCntntAtPos.eCntntAtPos ) ?
&aSpecialPos : 0;
- const sal_Bool bCrsrFoundExact = GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
+ const bool bCrsrFoundExact = GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
pTxtNd = aPos.nNode.GetNode().GetTxtNode();
const SwNodes& rNds = GetDoc()->GetNodes();
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index d221bcb..fc282cc 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -480,11 +480,11 @@ void SwNoTxtFrm::Format( const SwBorderAttrs * )
Shrink( std::min(Prt().Height(), -nChgHght) );
}
-sal_Bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
+bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
SwCrsrMoveState *pCMS ) const
{
if ( &rPos.nNode.GetNode() != (SwNode*)GetNode() )
- return sal_False;
+ return false;
Calc();
SwRect aFrameRect( Frm() );
@@ -513,16 +513,16 @@ sal_Bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos,
}
}
- return sal_True;
+ return true;
}
-sal_Bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
+bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& ,
SwCrsrMoveState*, bool ) const
{
SwCntntNode* pCNd = (SwCntntNode*)GetNode();
pPos->nNode = *pCNd;
pPos->nContent.Assign( pCNd, 0 );
- return sal_True;
+ return true;
}
#define CLEARCACHE( pNd ) {\
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 7168b56..fa2bc1a 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -39,10 +39,10 @@ public:
SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true );
~SwCellFrm();
- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
+ virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
virtual void Paint( SwRect const&,
SwPrintData const*const pPrintData = NULL ) const;
- virtual void CheckDirection( sal_Bool bVert );
+ virtual void CheckDirection( bool bVert );
// #i103961#
virtual void Cut();
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 3eba858..8f326fe 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -81,12 +81,12 @@ public:
SwTxtFrm* FindMaster() const;
// layout dependent cursor travelling
- virtual sal_Bool LeftMargin( SwPaM * ) const;
- virtual sal_Bool RightMargin( SwPaM *, sal_Bool bAPI = sal_False ) const;
- virtual sal_Bool UnitUp( SwPaM *, const SwTwips nOffset = 0,
- sal_Bool bSetInReadOnly = sal_False ) const;
- virtual sal_Bool UnitDown( SwPaM *, const SwTwips nOffset = 0,
- sal_Bool bSetInReadOnly = sal_False ) const;
+ virtual bool LeftMargin( SwPaM * ) const;
+ virtual bool RightMargin( SwPaM *, bool bAPI = false ) const;
+ virtual bool UnitUp( SwPaM *, const SwTwips nOffset = 0,
+ bool bSetInReadOnly = false ) const;
+ virtual bool UnitDown( SwPaM *, const SwTwips nOffset = 0,
+ bool bSetInReadOnly = false ) const;
inline sal_Bool StartNextPage( SwPaM * ) const;
inline sal_Bool StartPrevPage( SwPaM * ) const;
inline sal_Bool StartCurrPage( SwPaM * ) const;
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 6157846..060bd89 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -157,10 +157,10 @@ public:
virtual void Paint( SwRect const&,
SwPrintData const*const pPrintData = NULL ) const;
virtual Size ChgSize( const Size& aNewSize );
- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&,
+ virtual bool GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
- virtual void CheckDirection( sal_Bool bVert );
+ virtual void CheckDirection( bool bVert );
virtual void Cut();
#ifdef DBG_UTIL
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 2848948..ae8684b 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -587,7 +587,7 @@ public:
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void CheckDirection( sal_Bool bVert );
+ virtual void CheckDirection( bool bVert );
void ReinitializeFrmSizeAttrFlags();
@@ -790,9 +790,9 @@ public:
virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&,
+ virtual bool GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
- virtual sal_Bool GetCharRect( SwRect &, const SwPosition&,
+ virtual bool GetCharRect( SwRect &, const SwPosition&,
SwCrsrMoveState* = 0 ) const;
virtual void Paint( SwRect const&,
SwPrintData const*const pPrintData = NULL ) const;
@@ -801,7 +801,7 @@ public:
// It's your own fault if you cast void* incorrectly! In any case check
// the void* for 0.
virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR,
- const void *pVoid = 0, sal_Bool bNotify = sal_True );
+ const void *pVoid = 0, bool bNotify = true );
// sal_True if it is the correct class, sal_False otherwise
inline bool IsLayoutFrm() const;
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 5f2ed69..7bc2974 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -84,7 +84,7 @@ public:
virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const;
- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&,
+ virtual bool GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
virtual void Cut();
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index d514d8a..b0a2ed1 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -48,9 +48,9 @@ public:
virtual void Paint( SwRect const&,
SwPrintData const*const pPrintData = NULL ) const;
- virtual sal_Bool GetCharRect( SwRect &, const SwPosition&,
+ virtual bool GetCharRect( SwRect &, const SwPosition&,
SwCrsrMoveState* = 0) const;
- sal_Bool GetCrsrOfst(SwPosition* pPos, Point& aPoint,
+ virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint,
SwCrsrMoveState* = 0, bool bTestBackground = false) const;
const Size &GetGrfSize() const { return GetSize(); }
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 3108717..35e1646 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -160,14 +160,14 @@ public:
// this assertion. Thus, delete it.
void PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt );
- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&,
+ virtual bool GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
// erfrage vom Client Informationen
virtual bool GetInfo( SfxPoolItem& ) const;
virtual void Cut();
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
- virtual void CheckDirection( sal_Bool bVert );
+ virtual void CheckDirection( bool bVert );
void CheckGrid( sal_Bool bInvalidate );
void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const;
sal_Bool HasGrid() const { return bHasGrid; }
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 34ded96..43dcf28 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -185,7 +185,7 @@ public:
SdrPage* GetDrawPage() { return pDrawPage; }
void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; }
- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&,
+ virtual bool GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
virtual void Paint( SwRect const&,
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index c25ef63..f8a7939 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -66,7 +66,7 @@ public:
virtual ~SwSectionFrm();
void Init();
- virtual void CheckDirection( sal_Bool bVert );
+ virtual void CheckDirection( bool bVert );
virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const;
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 8c600c1..9398427 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -123,13 +123,13 @@ public:
virtual bool GetInfo( SfxPoolItem &rHnt ) const;
virtual void Paint( SwRect const&,
SwPrintData const*const pPrintData = NULL ) const;
- virtual void CheckDirection( sal_Bool bVert );
+ virtual void CheckDirection( bool bVert );
virtual void Cut();
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR,
- const void *pVoid = 0, sal_Bool bNotify = sal_True );
+ const void *pVoid = 0, bool bNotify = true );
SwCntntFrm *FindLastCntnt();
inline const SwCntntFrm *FindLastCntnt() const;
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 3052fb1..3cc71b1 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -230,8 +230,8 @@ public:
// Returns the screen position of rPos. The values are relative to the upper
// left position of the page frame.
// Additional information can be obtained by passing an SwCrsrMoveState object.
- // Returns sal_False if rPos > number of character is string
- virtual sal_Bool GetCharRect( SwRect& rRect, const SwPosition& rPos,
+ // Returns false if rPos > number of character is string
+ virtual bool GetCharRect( SwRect& rRect, const SwPosition& rPos,
SwCrsrMoveState* pCMS = 0 ) const;
// Eine etwas abgespeckte GetCharRect-Version fuer autopositionierte Rahmen
bool GetAutoPos( SwRect &, const SwPosition& ) const;
@@ -266,7 +266,7 @@ public:
//gegebenen Position innerhalb der SSize des Layout am
//naechsten ist. Wenn der SPoint ausserhalb der SSize liegt,
//liefert die Funktion false, true sonst.
- virtual sal_Bool GetCrsrOfst( SwPosition *, Point&,
+ virtual bool GetCrsrOfst( SwPosition *, Point&,
SwCrsrMoveState* = 0, bool bTestBackground = false ) const;
// GetKeyCrsrOfst sorgt dafuer, dass der Frame nicht gewechselt wird
@@ -282,13 +282,13 @@ public:
//Layoutorientiertes Cursortravelling: Linker, rechter Rand,
//vorhergehende/naechste Zeile, gleiche horizontale Position.
- virtual sal_Bool LeftMargin(SwPaM *) const;
- virtual sal_Bool RightMargin(SwPaM *, sal_Bool bAPI = sal_False) const;
+ virtual bool LeftMargin(SwPaM *) const;
+ virtual bool RightMargin(SwPaM *, bool bAPI = false) const;
- virtual sal_Bool UnitUp(SwPaM *, const SwTwips nOffset = 0,
- sal_Bool bSetInReadOnly = sal_False ) const;
- virtual sal_Bool UnitDown(SwPaM *, const SwTwips nOffset = 0,
- sal_Bool bSetInReadOnly = sal_False ) const;
+ virtual bool UnitUp(SwPaM *, const SwTwips nOffset = 0,
+ bool bSetInReadOnly = false ) const;
+ virtual bool UnitDown(SwPaM *, const SwTwips nOffset = 0,
+ bool bSetInReadOnly = false ) const;
bool _UnitUp(SwPaM *, const SwTwips nOffset = 0,
bool bSetInReadOnly = false ) const;
bool _UnitDown(SwPaM *, const SwTwips nOffset = 0,
@@ -328,7 +328,7 @@ public:
// Wer den void* falsch casted ist selbst Schuld!
// Auf jedenfall muss der void* auf 0 geprueft werden.
virtual void Prepare( const PrepareHint ePrep = PREP_CLEAR,
- const void *pVoid = 0, sal_Bool bNotify = sal_True );
+ const void *pVoid = 0, bool bNotify = true );
// nMaxHeight is the required height
// bSplit indicates, that the paragraph has to be split
@@ -424,7 +424,7 @@ public:
inline SwTwips GetRightMargin() const;
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
- virtual void CheckDirection( sal_Bool bVert );
+ virtual void CheckDirection( bool bVert );
// Liefert die Summe der Zeilenhoehen in pLine zurueck.
sal_uInt16 GetParHeight() const;
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b428fe1..90dfb72 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1308,7 +1308,7 @@ void SwCntntFrm::MakeAll()
if ( bMoveable && !bFormatted && ( GetFollow() ||
( (Frm().*fnRect->fnOverStep)( nDeadLine ) ) ) )
{
- Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False );
+ Prepare( PREP_WIDOWS_ORPHANS, 0, false );
mbValidSize = bWidow = sal_False;
}
if( (Frm().*fnRect->fnGetPos)() != aOldFrmPos ||
@@ -1316,9 +1316,10 @@ void SwCntntFrm::MakeAll()
{
// In this Prepare, an _InvalidateSize() might happen.
// mbValidSize becomes sal_False and Format() gets called.
- Prepare( PREP_POS_CHGD, (const void*)&bFormatted, sal_False );
+ Prepare( PREP_POS_CHGD, (const void*)&bFormatted, false );
if ( bWidow && GetFollow() )
- { Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False );
+ {
+ Prepare( PREP_WIDOWS_ORPHANS, 0, false );
mbValidSize = sal_False;
}
}
@@ -1370,7 +1371,7 @@ void SwCntntFrm::MakeAll()
MakePos();
if( aOldPos != (Frm().*fnRect->fnGetPos)() )
{
- Prepare( PREP_POS_CHGD, (const void*)&bFormatted, sal_False );
+ Prepare( PREP_POS_CHGD, (const void*)&bFormatted, false );
if ( !mbValidSize )
{
(Frm().*fnRect->fnSetWidth)( (GetUpper()->
@@ -1380,10 +1381,10 @@ void SwCntntFrm::MakeAll()
const long nOldW = (Prt().*fnRect->fnGetWidth)();
MakePrtArea( rAttrs );
if( nOldW != (Prt().*fnRect->fnGetWidth)() )
- Prepare( PREP_FIXSIZE_CHG, 0, sal_False );
+ Prepare( PREP_FIXSIZE_CHG, 0, false );
}
if( GetFollow() )
- Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False );
+ Prepare( PREP_WIDOWS_ORPHANS, 0, false );
mbValidSize = bFormatted = sal_True;
Format();
}
@@ -1565,7 +1566,7 @@ void SwCntntFrm::MakeAll()
sal_Bool bSplit = !IsFwdMoveAllowed();
if ( nTmp > 0 && WouldFit( nTmp, bSplit, sal_False ) )
{
- Prepare( PREP_WIDOWS_ORPHANS, 0, sal_False );
+ Prepare( PREP_WIDOWS_ORPHANS, 0, false );
mbValidSize = sal_False;
bFitPromise = true;
continue;
@@ -1639,7 +1640,7 @@ void SwCntntFrm::MakeAll()
// FME 2007-08-30 #i81146# new loop control
if ( nConsequetiveFormatsWithoutChange <= cnStopFormat )
{
- Prepare( PREP_MUST_FIT, 0, sal_False );
+ Prepare( PREP_MUST_FIT, 0, false );
mbValidSize = sal_False;
bMustFit = true;
continue;
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index ae3320d..16cb133 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1928,7 +1928,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
if( bBossChg )
{
- m_rThis.Prepare( PREP_BOSS_CHGD, 0, sal_False );
+ m_rThis.Prepare( PREP_BOSS_CHGD, 0, false );
if( !bSamePage )
{
SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
@@ -2462,7 +2462,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
SwPageFrm *pNewPage = m_rThis.FindPageFrm();
if( pNewPage != pOldPage )
{
- m_rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, sal_False );
+ m_rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, false );
SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell();
if ( pSh && !pSh->Imp()->IsUpdateExpFlds() )
pSh->GetDoc()->SetNewFldLst(true); // Will be done by CalcLayout() later on
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 8925e0d..776d3c0 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1372,7 +1372,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
if( pPrv->IsSctFrm() )
pPrv = ((SwSectionFrm*)pPrv)->ContainsCntnt();
if( pPrv && pPrv->IsTxtFrm() )
- ((SwTxtFrm*)pPrv)->Prepare( PREP_QUOVADIS, 0, sal_False );
+ ((SwTxtFrm*)pPrv)->Prepare( PREP_QUOVADIS, 0, false );
}
}
// #i27138#
@@ -2520,7 +2520,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
pSibling->_InvalidatePrt();
((SwCntntFrm*)pSibling)->InvalidatePage( pPage );
if ( ((SwCntntFrm*)pSibling)->GetFollow() )
- pSibling->Prepare( PREP_CLEAR, 0, sal_False );
+ pSibling->Prepare( PREP_CLEAR, 0, false );
}
else
{ pNxt = pParent->pLower;
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 412def1..e6519e2 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -300,7 +300,7 @@ void SwPageFrm::CheckGrid( sal_Bool bInvalidate )
}
}
-void SwPageFrm::CheckDirection( sal_Bool bVert )
+void SwPageFrm::CheckDirection( bool bVert )
{
sal_uInt16 nDir =
((SvxFrameDirectionItem&)GetFmt()->GetFmtAttr( RES_FRAMEDIR )).GetValue();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 0c20c7b..3624da6 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3496,7 +3496,7 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
}
}
-void SwTabFrm::Prepare( const PrepareHint eHint, const void *, sal_Bool )
+void SwTabFrm::Prepare( const PrepareHint eHint, const void *, bool )
{
if( PREP_BOSS_CHGD == eHint )
CheckDirChange();
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 15766d3..add82da1 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -150,10 +150,10 @@ public:
static SwCrsrOszControl aOszCtrl = { 0, 0, 0 };
/** Searches the CntntFrm owning the PrtArea containing the point. */
-sal_Bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
+bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
SwCrsrMoveState* pCMS, bool ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwFrm *pFrm = Lower();
while ( !bRet && pFrm )
{
@@ -167,21 +167,21 @@ sal_Bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
if ( aPaintRect.IsInside( rPoint ) &&
( bCntntCheck || pFrm->GetCrsrOfst( pPos, rPoint, pCMS ) ) )
- bRet = sal_True;
+ bRet = true;
else
pFrm = pFrm->GetNext();
if ( pCMS && pCMS->bStop )
- return sal_False;
+ return false;
}
return bRet;
}
/** Searches the page containing the searched point. */
-sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
+bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
SwCrsrMoveState* pCMS, bool bTestBackground ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
Point aPoint( rPoint );
// check, if we have to adjust the point
@@ -193,7 +193,8 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
aPoint.Y() = std::min( aPoint.Y(), Frm().Bottom() );
}
- sal_Bool bTextRet, bBackRet = sal_False;
+ bool bTextRet = false;
+ bool bBackRet = false;
//Could it be a free flying one?
//If his content should be protected, we can't set the Crsr in it, thus
@@ -213,18 +214,18 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
//However we cant use Flys in such a case.
if ( SwLayoutFrm::GetCrsrOfst( &aTextPos, aPoint, pCMS ) )
{
- bTextRet = sal_True;
+ bTextRet = true;
}
else
{
if ( pCMS && (pCMS->bStop || pCMS->bExactOnly) )
{
- ((SwCrsrMoveState*)pCMS)->bStop = sal_True;
- return sal_False;
+ ((SwCrsrMoveState*)pCMS)->bStop = true;
+ return false;
}
- const SwCntntFrm *pCnt = GetCntntPos( aPoint, sal_False, sal_False, sal_False, pCMS, sal_False );
+ const SwCntntFrm *pCnt = GetCntntPos( aPoint, false, false, false, pCMS, false );
if ( pCMS && pCMS->bStop )
- return sal_False;
+ return false;
OSL_ENSURE( pCnt, "Crsr is gone to a Black hole" );
if( pCMS && pCMS->pFill && pCnt->IsTxtFrm() )
@@ -237,7 +238,7 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
// Set point to pCnt, delete mark
// this may happen, if pCnt is hidden
aTextPos = SwPosition( *pCnt->GetNode(), SwIndex( (SwTxtNode*)pCnt->GetNode(), 0 ) );
- bTextRet = sal_True;
+ bTextRet = true;
}
}
@@ -424,14 +425,14 @@ bool SwRootFrm::FillSelection( SwSelectionList& aSelList, const SwRect& rRect) c
*
* @return sal_False, if the passed Point gets changed
*/
-sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
+bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
SwCrsrMoveState* pCMS, bool bTestBackground ) const
{
- sal_Bool bOldAction = IsCallbackActionEnabled();
+ const bool bOldAction = IsCallbackActionEnabled();
((SwRootFrm*)this)->SetCallbackActionEnabled( sal_False );
OSL_ENSURE( (Lower() && Lower()->IsPageFrm()), "No PageFrm found." );
if( pCMS && pCMS->pFill )
- ((SwCrsrMoveState*)pCMS)->bFillRet = sal_False;
+ ((SwCrsrMoveState*)pCMS)->bFillRet = false;
Point aOldPoint = rPoint;
// search for page containing rPoint. The borders around the pages are considerd
@@ -458,7 +459,7 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
if( pCMS )
{
if( pCMS->bStop )
- return sal_False;
+ return false;
if( pCMS->pFill )
return pCMS->bFillRet;
}
@@ -471,24 +472,24 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
*
* There is no entry for protected cells.
*/
-sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
+bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
SwCrsrMoveState* pCMS, bool ) const
{
// cell frame does not necessarily have a lower (split table cell)
if ( !Lower() )
- return sal_False;
+ return false;
- if ( !(pCMS?pCMS->bSetInReadOnly:sal_False) &&
+ if ( !(pCMS && pCMS->bSetInReadOnly) &&
GetFmt()->GetProtect().IsCntntProtected() )
- return sal_False;
+ return false;
if ( pCMS && pCMS->eState == MV_TBLSEL )
{
const SwTabFrm *pTab = FindTabFrm();
if ( pTab->IsFollow() && pTab->IsInHeadline( *this ) )
{
- ((SwCrsrMoveState*)pCMS)->bStop = sal_True;
- return sal_False;
+ ((SwCrsrMoveState*)pCMS)->bStop = true;
+ return false;
}
}
@@ -499,7 +500,7 @@ sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
else
{
Calc();
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwFrm *pFrm = Lower();
while ( pFrm && !bRet )
@@ -509,14 +510,14 @@ sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
{
bRet = pFrm->GetCrsrOfst( pPos, rPoint, pCMS );
if ( pCMS && pCMS->bStop )
- return sal_False;
+ return false;
}
pFrm = pFrm->GetNext();
}
if ( !bRet )
{
Point *pPoint = pCMS && pCMS->pFill ? new Point( rPoint ) : NULL;
- const SwCntntFrm *pCnt = GetCntntPos( rPoint, sal_True );
+ const SwCntntFrm *pCnt = GetCntntPos( rPoint, true );
if( pPoint && pCnt->IsTxtFrm() )
{
pCnt->GetCrsrOfst( pPos, *pPoint, pCMS );
@@ -526,11 +527,11 @@ sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
pCnt->GetCrsrOfst( pPos, rPoint, pCMS );
delete pPoint;
}
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
//Problem: If two Flys have the same size and share the same position then
@@ -540,7 +541,7 @@ sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
//loop with the mentioned situation above.
//Using the helper class SwCrsrOszControl we prevent the recursion. During
//a recursion GetCrsrOfst picks the one which lies on top.
-sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
+bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
SwCrsrMoveState* pCMS, bool ) const
{
aOszCtrl.Entry( this );
@@ -549,14 +550,14 @@ sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
//However if the Point sits inside a Fly which is completely located inside
//the current one, we call GetCrsrOfst for it.
Calc();
- sal_Bool bInside = Frm().IsInside( rPoint ) && Lower(),
- bRet = sal_False;
+ bool bInside = Frm().IsInside( rPoint ) && Lower();
+ bool bRet = false;
//If an Frm contains a graphic, but only text was requested, it basically
//won't accept the Crsr.
if ( bInside && pCMS && pCMS->eState == MV_SETONLYTEXT &&
(!Lower() || Lower()->IsNoTxtFrm()) )
- bInside = sal_False;
+ bInside = false;
const SwPageFrm *pPage = FindPageFrm();
if ( bInside && pPage && pPage->GetSortedObjs() )
@@ -570,11 +571,13 @@ sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
if ( pFly && pFly->Frm().IsInside( rPoint ) &&
Frm().IsInside( pFly->Frm() ) )
{
- if ( aOszCtrl.ChkOsz( pFly ) ||
- sal_True == (bRet = pFly->GetCrsrOfst( pPos, rPoint, pCMS )))
+ if ( aOszCtrl.ChkOsz( pFly ) )
+ break;
+ bRet = pFly->GetCrsrOfst( pPos, rPoint, pCMS );
+ if ( bRet )
break;
if ( pCMS && pCMS->bStop )
- return sal_False;
+ return false;
}
aIter.Next();
}
@@ -590,17 +593,16 @@ sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
{
bRet = pFrm->GetCrsrOfst( pPos, rPoint, pCMS );
if ( pCMS && pCMS->bStop )
- return sal_False;
+ return false;
}
pFrm = pFrm->GetNext();
}
if ( !bRet )
{
Point *pPoint = pCMS && pCMS->pFill ? new Point( rPoint ) : NULL;
- const SwCntntFrm *pCnt = GetCntntPos(
- rPoint, sal_True, sal_False, sal_False, pCMS );
+ const SwCntntFrm *pCnt = GetCntntPos( rPoint, true, false, false, pCMS );
if ( pCMS && pCMS->bStop )
- return sal_False;
+ return false;
if( pPoint && pCnt->IsTxtFrm() )
{
pCnt->GetCrsrOfst( pPos, *pPoint, pCMS );
@@ -609,7 +611,7 @@ sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
else
pCnt->GetCrsrOfst( pPos, rPoint, pCMS );
delete pPoint;
- bRet = sal_True;
+ bRet = true;
}
}
aOszCtrl.Exit( this );
@@ -617,22 +619,22 @@ sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
}
/** Layout dependent cursor travelling */
-sal_Bool SwCntntFrm::LeftMargin(SwPaM *pPam) const
+bool SwCntntFrm::LeftMargin(SwPaM *pPam) const
{
if( pPam->GetNode() != (SwCntntNode*)GetNode() )
- return sal_False;
+ return false;
((SwCntntNode*)GetNode())->
MakeStartIndex((SwIndex *) &pPam->GetPoint()->nContent);
- return sal_True;
+ return true;
}
-sal_Bool SwCntntFrm::RightMargin(SwPaM *pPam, sal_Bool) const
+bool SwCntntFrm::RightMargin(SwPaM *pPam, bool) const
{
if( pPam->GetNode() != (SwCntntNode*)GetNode() )
- return sal_False;
+ return false;
((SwCntntNode*)GetNode())->
MakeEndIndex((SwIndex *) &pPam->GetPoint()->nContent);
- return sal_True;
+ return true;
}
static const SwCntntFrm *lcl_GetNxtCnt( const SwCntntFrm* pCnt )
@@ -692,19 +694,18 @@ static const SwCntntFrm * lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
return pCnt;
}
-static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
- GetNxtPrvCnt fnNxtPrv, sal_Bool bInReadOnly )
+static bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
+ GetNxtPrvCnt fnNxtPrv, bool bInReadOnly )
{
OSL_ENSURE( pPam->GetNode() == (SwCntntNode*)pStart->GetNode(),
"lcl_UpDown doesn't work for others." );
const SwCntntFrm *pCnt = 0;
-
//We have to cheat a little bit during a table selection: Go to the
//beginning of the cell while going up and go to the end of the cell while
//going down.
- sal_Bool bTblSel = false;
+ bool bTblSel = false;
if ( pStart->IsInTab() &&
pPam->GetNode( true )->StartOfSectionNode() !=
pPam->GetNode( false )->StartOfSectionNode() )
@@ -738,13 +739,13 @@ static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
}
pCnt = (*fnNxtPrv)( pCnt ? pCnt : pStart );
- pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel );
+ pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
const SwTabFrm *pStTab = pStart->FindTabFrm();
const SwTabFrm *pTable = 0;
- const sal_Bool bTab = pStTab || (pCnt && pCnt->IsInTab()) ? sal_True : sal_False;
- sal_Bool bEnd = bTab ? sal_False : sal_True;
+ const bool bTab = pStTab || (pCnt && pCnt->IsInTab());
+ bool bEnd = !bTab;
const SwFrm* pVertRefFrm = pStart;
if ( bTblSel && pStTab )
@@ -815,7 +816,7 @@ static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
(pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow())))
{
pCnt = (*fnNxtPrv)( pCnt );
- pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel );
+ pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
}
}
@@ -827,7 +828,7 @@ static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
(pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow())))
{
pCnt = (*fnNxtPrv)( pCnt );
- pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel );
+ pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
}
}
@@ -837,7 +838,7 @@ static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
if ( pCnt && pCnt->IsTxtFrm() && ((SwTxtFrm*)pCnt)->IsHiddenNow() )
{
pCnt = (*fnNxtPrv)( pCnt );
- pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, sal_True, bInReadOnly, bTblSel );
+ pCnt = ::lcl_MissProtectedFrames( pCnt, fnNxtPrv, true, bInReadOnly, bTblSel );
}
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list