[Libreoffice-commits] core.git: sw/source
Takeshi Abe
tabe at fixedpoint.jp
Sat Mar 2 17:32:24 PST 2013
sw/source/core/crsr/crstrvl.cxx | 2 +-
sw/source/core/crsr/findattr.cxx | 8 ++++----
sw/source/core/crsr/pam.cxx | 2 +-
sw/source/core/crsr/swcrsr.cxx | 2 +-
sw/source/core/doc/docedt.cxx | 2 +-
sw/source/core/doc/docfld.cxx | 4 ++--
sw/source/core/doc/docfmt.cxx | 4 ++--
sw/source/core/doc/docredln.cxx | 2 +-
sw/source/core/docnode/ndcopy.cxx | 4 ++--
sw/source/core/docnode/ndsect.cxx | 2 +-
sw/source/core/fields/cellfml.cxx | 6 +++---
sw/source/core/fields/chpfld.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 2 +-
sw/source/core/layout/trvlfrm.cxx | 4 ++--
sw/source/core/text/frmcrsr.cxx | 4 ++--
sw/source/core/text/itrcrsr.cxx | 2 +-
sw/source/filter/basflt/shellio.cxx | 2 +-
sw/source/filter/html/htmlnum.cxx | 2 +-
sw/source/ui/app/apphdl.cxx | 4 ++--
sw/source/ui/app/docsh2.cxx | 2 +-
sw/source/ui/app/docshini.cxx | 2 +-
sw/source/ui/app/docstyle.cxx | 2 +-
sw/source/ui/chrdlg/drpcps.cxx | 6 +++---
sw/source/ui/config/uinums.cxx | 2 +-
sw/source/ui/dbui/dbinsdlg.cxx | 2 +-
sw/source/ui/dochdl/swdtflvr.cxx | 2 +-
sw/source/ui/lingu/hhcwrp.cxx | 2 +-
sw/source/ui/utlui/attrdesc.cxx | 2 +-
28 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit ddf1b13a52548a62f6bebd5d97b7b822d2075529
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Mar 3 00:44:38 2013 +0900
sal_Bool to bool
Change-Id: I4040baa1a0202426df80a0ea94abde55e2b6ca65
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 8700c2f..9747423 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1463,7 +1463,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt,
String sAttrs;
SfxItemIter aIter( aSet );
const SfxPoolItem* pItem = aIter.FirstItem();
- while( sal_True )
+ while( true )
{
if( !IsInvalidItem( pItem ))
{
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index a14c928..3a9a791 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -260,7 +260,7 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
const SfxPoolItem* pFndItem;
sal_uInt16 nWhich;
- while( sal_True )
+ while( true )
{
if( IsInvalidItem( pItem ) )
{
@@ -830,7 +830,7 @@ static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, sal_B
const SfxPoolItem* pNdItem;
sal_uInt16 nWhich;
- while( sal_True )
+ while( true )
{
if( IsInvalidItem( pItem ))
{
@@ -1072,7 +1072,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
SwPaM* pTextRegion = &aRegion;
SwPaM aSrchPam( *pCrsr->GetPoint() );
- while( sal_True )
+ while( true )
{
if( pSet->Count() ) // any attributes?
{
@@ -1172,7 +1172,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
SfxItemIter aIter( *pSet );
const SfxPoolItem* pItem = aIter.GetCurItem();
- while( sal_True )
+ while( true )
{
// reset all that are not set with pool defaults
if( !IsInvalidItem( pItem ) && SFX_ITEM_SET !=
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index c4bf33c..182521d 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -792,7 +792,7 @@ SwCntntNode* GetNode( SwPaM & rPam, sal_Bool& rbFirst, SwMoveFn fnMove,
SwNodes& rNodes = aPos.nNode.GetNodes();
// go to next/previous CntntNode
- while( sal_True )
+ while( true )
{
pNd = bSrchForward
? rNodes.GoNextSection( &aPos.nNode, sal_True, !bInReadOnly )
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 8bb731a..0ee9974 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -472,7 +472,7 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
? ( !pMyNd->IsEndNode() || 0 == ( pPtNd = pMyNd->FindTableNode() ))
: 0 == ( pPtNd = pMyNd->GetTableNode() ))
break;
- } while( sal_True );
+ } while( true );
}
// stay on old position
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 04274fc..67252d9 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1766,7 +1766,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
*pEnd = *pStt;
rPam.DeleteMark();
- } while( sal_False );
+ } while( false );
if( !IsIgnoreRedline() && !GetRedlineTbl().empty() )
CompressRedlines();
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index fb8022b..8c01695 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -182,7 +182,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
break; // exit while loop
}
++nNum;
- } while( sal_True );
+ } while( true );
break;
}
@@ -2473,7 +2473,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
(void) bResult; // unused in non-debug
pNew = new _SetGetExpFld( rSectNd, &aPos );
- } while( sal_False );
+ } while( false );
}
if( !pNew )
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index c35b6fe..9fcc618 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -265,7 +265,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
"<lcl_RstAttr(..)> - certain attributes are kept, but not needed. -> please inform OD" );
SfxItemIter aIter( *pPara->pDelSet );
pItem = aIter.FirstItem();
- while( sal_True )
+ while( true )
{
if ( ( pItem->Which() != RES_PAGEDESC &&
pItem->Which() != RES_BREAK &&
@@ -1156,7 +1156,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
sal_uInt16 nWhich;
const SfxPoolItem* pItem = aIter.GetCurItem();
SfxItemPool* pSdrPool = GetAttrPool().GetSecondaryPool();
- while( sal_True )
+ while( true )
{
bool bCheckSdrDflt = false;
nWhich = pItem->Which();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 66c7cb2..4976fb1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2933,7 +2933,7 @@ SwRedlineExtraData_Format::SwRedlineExtraData_Format( const SfxItemSet& rSet )
{
SfxItemIter aIter( rSet );
const SfxPoolItem* pItem = aIter.FirstItem();
- while( sal_True )
+ while( true )
{
aWhichIds.push_back( pItem->Which() );
if( aIter.IsAtEnd() )
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 2eeea7a..bbff535 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -636,7 +636,7 @@ static void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
if( pDelPam->GetNext() == pDelPam )
break;
delete pDelPam->GetNext();
- } while( sal_True );
+ } while( true );
delete pDelPam;
pDestDoc->SetRedlineMode_intern( eOld );
@@ -1241,7 +1241,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
pDestTxtNd->SetAttr( aBrkSet );
}
}
- } while( sal_False );
+ } while( false );
// Adjust position (in case it was moved / in another node)
rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 7e40358..41a29a5 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -619,7 +619,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
{
SfxItemIter aIter( *pAttr );
sal_uInt16 nWhich = aIter.GetCurItem()->Which();
- while( sal_True )
+ while( true )
{
if( pFmt->GetFmtAttr( nWhich ) != *aIter.GetCurItem() )
{
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 62c03c6..44ca2e3 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -221,7 +221,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
}
// ?? sonst ist das ein Fehler
- } while( sal_False );
+ } while( false );
if( !rCalcPara.IsStackOverFlow() )
{
@@ -675,7 +675,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
}
nFml = nEnd+1;
- } while( sal_True );
+ } while( true );
return aStr;
}
@@ -955,7 +955,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
if( pTbl->IsHeadline( *pLine ) )
rBoxes.erase( rBoxes.begin() + n-- );
}
- } while( sal_False );
+ } while( false );
}
}
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 4de4439..1af94f7 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -143,7 +143,7 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
}
else
break;
- } while( sal_True );
+ } while( true );
}
// nur die Nummer besorgen, ohne Pre-/Post-fixstrings
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index a05a562..56ad6a5 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1276,7 +1276,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
//the SwActualSection class has a member, which points to an upper(section).
//When the "inner" section finishs, the upper will used instead.
- while( sal_True )
+ while( true )
{
SwNode *pNd = pDoc->GetNodes()[nIndex];
if ( pNd->IsCntntNode() )
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 443af12..484acfb 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1644,7 +1644,7 @@ Point SwRootFrm::GetPagePos( sal_uInt16 nPageNum ) const
OSL_ENSURE( Lower() && Lower()->IsPageFrm(), "Keine Seite vorhanden." );
const SwPageFrm *pPage = (const SwPageFrm*)Lower();
- while ( sal_True )
+ while ( true )
{
if ( pPage->GetPhyPageNum() >= nPageNum || !pPage->GetNext() )
break;
@@ -2192,7 +2192,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode )
}
break;
}
- } while( sal_False );
+ } while( false );
SwCrsrMoveState aTmpState( MV_NONE );
aTmpState.b2Lines = sal_True;
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 5cef43d..d6146ad 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -890,7 +890,7 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
aCharBox.SSize().Width() /= 2;
}
break;
- } while ( sal_True );
+ } while ( true );
}
/* If 'this' is a follow and a prev failed, we need to go to the
* last line of the master, which is us.
@@ -1292,7 +1292,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
}
}
break;
- } while( sal_True );
+ } while( true );
}
else
pTmpFollow = GetFollow();
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index ab249f3..54a9be5 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -94,7 +94,7 @@ static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig,
rOrig.Pos().X() += pPor->Width();
pPor = pPor->GetPortion();
- } while ( sal_True );
+ } while ( true );
OSL_ENSURE( nCharOfst >= nFldIdx, "Request of position inside field failed" );
sal_uInt16 nLen = nCharOfst - nFldIdx + 1;
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index e887a6a..023a373 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -811,7 +811,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
SwPaM *pEnd = pPam;
// Erste Runde: Nachsehen, ob eine Selektion besteht.
- while(sal_True)
+ while(true)
{
bHasMark = bHasMark || pPam->HasMark();
pPam = (SwPaM *) pPam->GetNext();
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 9c2db53..c027390 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -768,7 +768,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
break;
}
}
- while( sal_True );
+ while( true );
}
}
}
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 19cab01..0bbbd36 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -148,10 +148,10 @@ void SwModule::StateOther(SfxItemSet &rSet)
case FN_LABEL:
case FN_ENVELOP:
{
- sal_Bool bDisable = sal_False;
+ bool bDisable = false;
SfxViewShell* pCurrView = SfxViewShell::Current();
if( !pCurrView || (pCurrView && !pCurrView->ISA(SwView)) )
- bDisable = sal_True;
+ bDisable = true;
SwDocShell *pDocSh = (SwDocShell*) SfxObjectShell::Current();
if ( bDisable ||
(pDocSh && (pDocSh->IsReadOnly() ||
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index ea3c74b..e30f8f7 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -264,7 +264,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if( nAction )
{
- sal_Bool bUnlockView = sal_True; //initializing prevents warning
+ bool bUnlockView = true; //initializing prevents warning
if( pWrtShell )
{
bUnlockView = !pWrtShell->IsViewLocked();
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index e39bcc6..55ece73 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -663,7 +663,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
bRet = !IsError( nErr );
- } while( sal_False );
+ } while( false );
SfxObjectShell::LoadFrom( rMedium );
pDoc->ResetModified();
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 023faaa..4de30f3 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -1421,7 +1421,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
{
SfxItemIter aIter( rSet );
const SfxPoolItem* pItem = aIter.GetCurItem();
- while( sal_True )
+ while( true )
{
if( IsInvalidItem( pItem ) ) // Clear
{
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 1b2cc0c..f8838fd 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -389,7 +389,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
if ( !GetNextScriptSegment(nIdx, nStart, nEnd, nScript) )
break;
}
- while( sal_True );
+ while( true );
mpPrinter->SetFont( aOldFont );
}
@@ -425,7 +425,7 @@ void SwDropCapsPict::CheckScript( void )
nScript = xBreak->getScriptType( maText, nChg );
else
break;
- } while( sal_True );
+ } while( true );
}
Size SwDropCapsPict::CalcTextSize( void )
@@ -468,7 +468,7 @@ Size SwDropCapsPict::CalcTextSize( void )
if ( !GetNextScriptSegment(nIdx, nStart, nEnd, nScript) )
break;
}
- while( sal_True );
+ while( true );
nHeight -= nAscent;
nCJKHeight -= nCJKAscent;
nCTLHeight -= nCTLAscent;
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 388e0aa..8e416d7 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -291,7 +291,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const SwNumFmt& rFmt )
{
SfxItemIter aIter( pFmt->GetAttrSet() );
const SfxPoolItem *pCurr = aIter.GetCurItem();
- while( sal_True )
+ while( true )
{
aItems.push_back( pCurr->Clone() );
if( aIter.IsAtEnd() )
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 0a9b3d9..9c6cc3e 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1403,7 +1403,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
// write configuration
Commit();
- }while( sal_False ); // middle checked loop
+ }while( false ); // middle checked loop
if( bUndo )
{
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 0acfea7..f6670ea 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -2105,7 +2105,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
rWrtShell.Insert( aSwDDEField );
}
- } while( sal_False );
+ } while( false );
}
else
pDDETyp = 0; // remove FieldTypes again
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 454c6ba..9443985 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -260,7 +260,7 @@ void SwHHCWrapper::ChangeText( const String &rNewText,
"mismatch between string length and sequence length!" );
// find all substrings that need to be replaced (and only those)
- while (sal_True)
+ while (true)
{
// get index in original text that matches nPos in new text
xub_StrLen nIndex;
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index c9e5e5d..0ac4289 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -75,7 +75,7 @@ void SwAttrSet::GetPresentation(
SfxItemIter aIter( *this );
const IntlWrapper rInt( ::comphelper::getProcessComponentContext(),
GetAppLanguageTag() );
- while( sal_True )
+ while( true )
{
aIter.GetCurItem()->GetPresentation( ePres, eCoreMetric,
ePresMetric, aStr,
More information about the Libreoffice-commits
mailing list