diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-13 14:47:58 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-13 15:05:16 +0100 |
commit | ef7e9d5c8d64ec168927267067ffb4b2a539086d (patch) | |
tree | 9f781a8a78601a0999aa386d04c893f0e6c995d7 /sw/source/core/text/txthyph.cxx | |
parent | 12dcf5e6e770b1933252a1f919663ba45ded4cdf (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/txthyph.cxx')
-rw-r--r-- | sw/source/core/text/txthyph.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index 9e603137ecc9..741cdca0bdc2 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -131,16 +131,16 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) // We never need to hyphenate anything in the last row // Except for, if it contains a FlyPortion or if it's the // last row of the Master - if( !GetNext() && !rInf.GetTextFly().IsOn() && !pFrm->GetFollow() ) + if( !GetNext() && !rInf.GetTextFly().IsOn() && !m_pFrm->GetFollow() ) return false; - sal_Int32 nWrdStart = nStart; + sal_Int32 nWrdStart = m_nStart; // We need to retain the old row // E.g.: The attribute for hyphenation was not set, but // it's always set in SwTextFrm::Hyphenate, because we want // to set breakpoints. - SwLineLayout *pOldCurr = pCurr; + SwLineLayout *pOldCurr = m_pCurr; InitCntHyph(); @@ -151,26 +151,26 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) { SwParaPortion *pPara = new SwParaPortion(); SetParaPortion( &rInf, pPara ); - pCurr = pPara; + m_pCurr = pPara; OSL_ENSURE( IsParaLine(), "SwTextFormatter::Hyphenate: not the first" ); } else - pCurr = new SwLineLayout(); + m_pCurr = new SwLineLayout(); nWrdStart = FormatLine( nWrdStart ); // Man muss immer im Hinterkopf behalten, dass es z.B. // Felder gibt, die aufgetrennt werden koennen ... - if( pCurr->PrtWidth() && pCurr->GetLen() ) + if( m_pCurr->PrtWidth() && m_pCurr->GetLen() ) { // Wir muessen uns darauf einstellen, dass in der Zeile // FlyFrms haengen, an denen auch umgebrochen werden darf. // Wir suchen also die erste HyphPortion in dem angegebenen // Bereich. - SwLinePortion *pPos = pCurr->GetPortion(); + SwLinePortion *pPos = m_pCurr->GetPortion(); const sal_Int32 nPamStart = rHyphInf.nStart; - nWrdStart = nStart; + nWrdStart = m_nStart; const sal_Int32 nEnd = rHyphInf.GetEnd(); while( pPos ) { @@ -199,8 +199,8 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) } // Das alte LineLayout wird wieder eingestellt ... - delete pCurr; - pCurr = pOldCurr; + delete m_pCurr; + m_pCurr = pOldCurr; if( pOldCurr->IsParaPortion() ) { |