diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:53 +0100 |
commit | 01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch) | |
tree | b8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/core/text/itradj.cxx | |
parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/core/text/itradj.cxx')
-rw-r--r-- | sw/source/core/text/itradj.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 022d07ab5a01..d4f18ed048f3 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -41,7 +41,7 @@ void SwTextAdjuster::FormatBlock( ) // And for tabs it doesn't exist out of tradition // If we have Flys we continue. - const SwLinePortion *pFly = 0; + const SwLinePortion *pFly = nullptr; bool bSkip = !IsLastBlock() && nStart + pCurr->GetLen() >= GetInfo().GetText().getLength(); @@ -60,7 +60,7 @@ void SwTextAdjuster::FormatBlock( ) bSkip = false; pPor = pPor->GetPortion(); } - pLay = bSkip ? pLay->GetNext() : 0; + pLay = bSkip ? pLay->GetNext() : nullptr; } } @@ -75,7 +75,7 @@ void SwTextAdjuster::FormatBlock( ) } else { - const SwLinePortion *pTmpFly = NULL; + const SwLinePortion *pTmpFly = nullptr; // End at the last Fly const SwLinePortion *pPos = pCurr->GetFirstPortion(); @@ -87,7 +87,7 @@ void SwTextAdjuster::FormatBlock( ) else if ( pTmpFly && pPos->InTextGrp() ) { pFly = pTmpFly; // A Fly with follow-up text! - pTmpFly = NULL; + pTmpFly = nullptr; } pPos = pPos->GetPortion(); } @@ -121,7 +121,7 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& rInf, // total number of kashida positions, or the number of kashida positions after some positions // have been dropped. // Here we want the clean total, which is OK: We have called ClearKashidaInvalid() before. - rKashidas = rSI.KashidaJustify ( 0, 0, rItr.GetStart(), rItr.GetLength() ); + rKashidas = rSI.KashidaJustify ( nullptr, nullptr, rItr.GetStart(), rItr.GetLength() ); if (rKashidas <= 0) // nothing to do return true; @@ -145,7 +145,7 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& rInf, if ( nNext == COMPLETE_STRING || nNext > nEnd ) nNext = nEnd; - sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( 0, 0, nIdx, nNext - nIdx ); + sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, nIdx, nNext - nIdx ); if (nKashidasInAttr > 0) { // Kashida glyph looks suspicious, skip Kashida justification @@ -212,7 +212,7 @@ static bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTextSizeInfo& rInf, SwT if ( nNext == COMPLETE_STRING || nNext > nEnd ) nNext = nEnd; - sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( 0, 0, nIdx, nNext - nIdx ); + sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, nIdx, nNext - nIdx ); long nFontMinKashida = rInf.GetOut()->GetMinKashida(); if ( nFontMinKashida && nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) ) @@ -689,7 +689,7 @@ SwFlyPortion *SwTextAdjuster::CalcFlyPortion( const long nRealWidth, SwTextFly aTextFly( GetTextFrm() ); const sal_uInt16 nCurrWidth = pCurr->PrtWidth(); - SwFlyPortion *pFlyPortion = 0; + SwFlyPortion *pFlyPortion = nullptr; SwRect aLineVert( rCurrRect ); if ( GetTextFrm()->IsRightToLeft() ) @@ -759,7 +759,7 @@ void SwTextAdjuster::CalcDropAdjust() pPor = pPor->GetPortion(); SwGluePortion *pRight = ( pPor && pPor->InGlueGrp() ) ? - static_cast<SwGluePortion*>(pPor) : 0; + static_cast<SwGluePortion*>(pPor) : nullptr; if( pRight && pRight != pLeft ) { // 5) Calculate nMinLeft. Who is the most to left? @@ -775,7 +775,7 @@ void SwTextAdjuster::CalcDropAdjust() pPor = pCurr->GetFirstPortion(); const SwMarginPortion *pMar = pPor->IsMarginPortion() ? - static_cast<SwMarginPortion*>(pPor) : 0; + static_cast<SwMarginPortion*>(pPor) : nullptr; if( !pMar ) nMinLeft = 0; else |