include/svtools/simptabl.hxx | 1 -
svtools/source/contnr/simptabl.cxx | 1 -
sw/source/core/text/frmcrsr.cxx | 4 ++--
sw/source/core/text/frmform.cxx | 20 ++++++++++----------
sw/source/core/text/redlnitr.cxx | 2 +-
sw/source/core/text/txtdrop.cxx | 4 ++--
6 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit 849cc7893ddf39f869b2efa93bd10fcf45c09d24
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Feb 4 11:22:31 2014 +0100
-Werror,-Wunused-private-field
Change-Id: Ib7d8fd7ff8a4f44dc699bc0b72a8c438acebc0ec
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 765d0bf..098d3f6 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -56,7 +56,6 @@ private:
HeaderBar aHeaderBar;
long nOldPos;
sal_uInt16 nHeaderItemId;
- sal_Bool bResizeFlag;
sal_Bool bPaintFlag;
sal_Bool bSortDirection;
sal_uInt16 nSortCol;
diff --git a/svtools/source/contnr/simptabl.cxx
b/svtools/source/contnr/simptabl.cxx
index 4253831..80e0d08 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -92,7 +92,6 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent,
WinBits nBits):
m_rParentTableContainer(rParent),
aHeaderBar(&rParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
nHeaderItemId(1),
- bResizeFlag(sal_False),
bPaintFlag(sal_True)
{
m_rParentTableContainer.SetTable(this);
commit 2db45ef2b58058fd850e69432a6b4634fa3e278f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Feb 4 11:19:31 2014 +0100
bool improvements
Change-Id: I294d197028d5ddf0642fadef05600accd91d0725
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index e832de4..df40690 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -722,7 +722,7 @@ sal_Bool SwTxtFrm::LeftMargin(SwPaM *pPam) const
}
}
pPam->GetPoint()->nContent = SwIndex( pFrm->GetTxtNode(), nIndx );
- SwTxtCursor::SetRightMargin( sal_False );
+ SwTxtCursor::SetRightMargin( false );
return sal_True;
}
@@ -1342,7 +1342,7 @@ sal_Bool SwTxtFrm::UnitDown(SwPaM *pPam, const SwTwips
nOffset,
const SwTxtFrm *pFrm = GetAdjFrmAtPos((SwTxtFrm*)this, *(pPam->GetPoint()),
SwTxtCursor::IsRightMargin() );
const sal_Bool bRet = pFrm->_UnitDown( pPam, nOffset, bSetInReadOnly );
- SwTxtCursor::SetRightMargin( sal_False );
+ SwTxtCursor::SetRightMargin( false );
return bRet;
}
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 51a2796..d6e8c8c 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -608,7 +608,7 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
GetFollow()->ManipOfst( 0 );
if ( CalcFollow( nNewOfst ) ) // CalcFollow only at the end, we do a
SetOfst there
- rLine.SetOnceMore( sal_True );
+ rLine.SetOnceMore( true );
}
}
@@ -1202,7 +1202,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine,
const sal_Bool bPrev )
if( !rLine.IsUnclipped() || nOldBottom > rRepaint.Bottom() )
{
rRepaint.Bottom( nOldBottom - 1 );
- rLine.SetUnclipped( sal_True );
+ rLine.SetUnclipped( true );
}
}
if( rLine.GetCurr()->IsClipping() && rLine.IsFlyInCntBase() )
@@ -1214,7 +1214,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine,
const sal_Bool bPrev )
if( !rLine.IsUnclipped() || nTmpBottom > rRepaint.Bottom() )
{
rRepaint.Bottom( nTmpBottom - 1 );
- rLine.SetUnclipped( sal_True );
+ rLine.SetUnclipped( true );
}
}
else
@@ -1222,7 +1222,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine,
const sal_Bool bPrev )
if( !rLine.IsUnclipped() || nBottom > rRepaint.Bottom() )
{
rRepaint.Bottom( nBottom - 1 );
- rLine.SetUnclipped( sal_False );
+ rLine.SetUnclipped( false );
}
}
SwTwips nRght = std::max( nOldWidth, pNew->Width() +
@@ -1283,7 +1283,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf,
OSL_ENSURE( ! IsVertical() || IsSwapped(),"SwTxtFrm::_Format with
unswapped frame" );
SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
- rLine.SetUnclipped( sal_False );
+ rLine.SetUnclipped( false );
// That was too complicated for the C30: aString( GetTxt() );
const OUString &rString = GetTxtNode()->GetTxt();
@@ -1574,7 +1574,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf,
rLine.GetCurr()->GetNext() )
{
rLine.TruncLines();
- rLine.SetTruncLines( sal_True );
+ rLine.SetTruncLines( true );
}
}
@@ -1587,7 +1587,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf,
}
if( rRepaint.HasArea() )
SetRepaint();
- rLine.SetTruncLines( sal_False );
+ rLine.SetTruncLines( false );
if( nOldBottom ) // We check whether paragraphs that need scrolling can
// be shrunk, so that they don't need scrolling
anymore
{
@@ -1620,7 +1620,7 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf )
rInf.Init();
rLine.Top();
if( !rLine.GetDropFmt() )
- rLine.SetOnceMore( sal_False );
+ rLine.SetOnceMore( false );
SwCharRange aRange( 0, rInf.GetTxt().getLength() );
*(pPara->GetReformat()) = aRange;
_Format( rLine, rInf );
@@ -1709,13 +1709,13 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
SVX_ADJUST_BLOCK != aLine.GetAdjust() )
{
aLine.CalcDropAdjust();
- aLine.SetPaintDrop( sal_True );
+ aLine.SetPaintDrop( true );
}
if( aLine.IsPaintDrop() )
{
aLine.CalcDropRepaint();
- aLine.SetPaintDrop( sal_False );
+ aLine.SetPaintDrop( false );
}
}
}
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index eb7c45f..13b3bf9 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -65,7 +65,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode,
SwScriptInfo& rScrInf, S
// set font to vertical if frame layout is vertical
bool bVertLayout = false;
- bool bRTL = sal_False;
+ bool bRTL = false;
if ( pFrm )
{
if ( pFrm->IsVertical() )
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 19207b2..1b33110 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -604,7 +604,7 @@ SwDropPortion *SwTxtFormatter::NewDropPortion(
SwTxtFormatInfo &rInf )
// font is used.
if ( GetDropLines() < 2 )
{
- ((SwTxtFormatter*)this)->SetPaintDrop( sal_True );
+ ((SwTxtFormatter*)this)->SetPaintDrop( true );
return pDropPor;
}
@@ -650,7 +650,7 @@ SwDropPortion *SwTxtFormatter::NewDropPortion(
SwTxtFormatInfo &rInf )
pCurrPart = pPart;
}
- ((SwTxtFormatter*)this)->SetPaintDrop( sal_True );
+ ((SwTxtFormatter*)this)->SetPaintDrop( true );
return pDropPor;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
