summaryrefslogtreecommitdiff
path: root/sw/source/core/text/itradj.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-13 14:47:58 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-11-13 15:05:16 +0100
commitef7e9d5c8d64ec168927267067ffb4b2a539086d (patch)
tree9f781a8a78601a0999aa386d04c893f0e6c995d7 /sw/source/core/text/itradj.cxx
parent12dcf5e6e770b1933252a1f919663ba45ded4cdf (diff)
sw: prefix members of SwTextIter
Kendy says this helps his latest changes to the bin/rename-sw-abbreviations.sh script. Change-Id: I95d82c5e8d69360e82154fa0390a6b2d1b9bf5d4
Diffstat (limited to 'sw/source/core/text/itradj.cxx')
-rw-r--r--sw/source/core/text/itradj.cxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 2d9cc7a37e71..c0670bd09e28 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -45,16 +45,16 @@ void SwTextAdjuster::FormatBlock( )
const SwLinePortion *pFly = nullptr;
bool bSkip = !IsLastBlock() &&
- nStart + pCurr->GetLen() >= GetInfo().GetText().getLength();
+ m_nStart + m_pCurr->GetLen() >= GetInfo().GetText().getLength();
// Multi-line fields are tricky, because we need to check whether there are
// any other text portions in the paragraph.
if( bSkip )
{
- const SwLineLayout *pLay = pCurr->GetNext();
+ const SwLineLayout *pLay = m_pCurr->GetNext();
while( pLay && !pLay->GetLen() )
{
- const SwLinePortion *pPor = pCurr->GetFirstPortion();
+ const SwLinePortion *pPor = m_pCurr->GetFirstPortion();
while( pPor && bSkip )
{
if( pPor->InTextGrp() )
@@ -70,8 +70,8 @@ void SwTextAdjuster::FormatBlock( )
if( !GetInfo().GetParaPortion()->HasFly() )
{
if( IsLastCenter() )
- CalcFlyAdjust( pCurr );
- pCurr->FinishSpaceAdd();
+ CalcFlyAdjust( m_pCurr );
+ m_pCurr->FinishSpaceAdd();
return;
}
else
@@ -79,7 +79,7 @@ void SwTextAdjuster::FormatBlock( )
const SwLinePortion *pTmpFly = nullptr;
// End at the last Fly
- const SwLinePortion *pPos = pCurr->GetFirstPortion();
+ const SwLinePortion *pPos = m_pCurr->GetFirstPortion();
while( pPos )
{
// Look for the last Fly which has text coming after it:
@@ -96,16 +96,16 @@ void SwTextAdjuster::FormatBlock( )
if( !pFly )
{
if( IsLastCenter() )
- CalcFlyAdjust( pCurr );
- pCurr->FinishSpaceAdd();
+ CalcFlyAdjust( m_pCurr );
+ m_pCurr->FinishSpaceAdd();
return;
}
}
}
const sal_Int32 nOldIdx = GetInfo().GetIdx();
- GetInfo().SetIdx( nStart );
- CalcNewBlock( pCurr, pFly );
+ GetInfo().SetIdx( m_nStart );
+ CalcNewBlock( m_pCurr, pFly );
GetInfo().SetIdx( nOldIdx );
GetInfo().GetParaPortion()->GetRepaint().SetOfst(0);
}
@@ -340,7 +340,7 @@ void SwTextAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
// all kashida positions are invalid
// do regular blank justification
pCurrent->FinishSpaceAdd();
- GetInfo().SetIdx( nStart );
+ GetInfo().SetIdx( m_nStart );
CalcNewBlock( pCurrent, pStopAt, nReal, true );
return;
}
@@ -358,7 +358,7 @@ void SwTextAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
// no kashidas left
// do regular blank justification
pCurrent->FinishSpaceAdd();
- GetInfo().SetIdx( nStart );
+ GetInfo().SetIdx( m_nStart );
CalcNewBlock( pCurrent, pStopAt, nReal, true );
return;
}
@@ -589,7 +589,7 @@ void SwTextAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
sal_Int32 nLen = 0;
// If we only have one line, the text portion is consecutive and we center, then ...
- bool bComplete = 0 == nStart;
+ bool bComplete = 0 == m_nStart;
const bool bTabCompat = GetTextFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
bool bMultiTab = false;
@@ -685,7 +685,7 @@ SwFlyPortion *SwTextAdjuster::CalcFlyPortion( const long nRealWidth,
{
SwTextFly aTextFly( GetTextFrm() );
- const sal_uInt16 nCurrWidth = pCurr->PrtWidth();
+ const sal_uInt16 nCurrWidth = m_pCurr->PrtWidth();
SwFlyPortion *pFlyPortion = nullptr;
SwRect aLineVert( rCurrRect );
@@ -735,12 +735,12 @@ void SwTextAdjuster::CalcDropAdjust()
// 1) Skip dummies
Top();
- if( !pCurr->IsDummy() || NextLine() )
+ if( !m_pCurr->IsDummy() || NextLine() )
{
// Adjust first
GetAdjusted();
- SwLinePortion *pPor = pCurr->GetFirstPortion();
+ SwLinePortion *pPor = m_pCurr->GetFirstPortion();
// 2) Make sure we include the ropPortion
// 3) pLeft is the GluePor preceding the DropPor
@@ -770,7 +770,7 @@ void SwTextAdjuster::CalcDropAdjust()
// Adjust first
GetAdjusted();
- pPor = pCurr->GetFirstPortion();
+ pPor = m_pCurr->GetFirstPortion();
const SwMarginPortion *pMar = pPor->IsMarginPortion() ?
static_cast<SwMarginPortion*>(pPor) : nullptr;
if( !pMar )