diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:08:07 +0200 |
| commit | 85825e0fd54551735ef05b8484f71974734b9135 (patch) | |
| tree | 8bece458e55c1b5eab7559076579bf76cca8df68 /sw/source/core/doc/docruby.cxx | |
| parent | fc233b52ce2acc1bcd7cecc3d51bcab870c81932 (diff) | |
Avoid reserved identifiers
Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4
Diffstat (limited to 'sw/source/core/doc/docruby.cxx')
| -rw-r--r-- | sw/source/core/doc/docruby.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 1fc9a2a80309..d92ee5c36149 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -49,7 +49,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, sal_uInt16 nMode ) { const SwPaM *_pStartCursor = rPam.GetNext(), - *__pStartCursor = _pStartCursor; + *_pStartCursor2 = _pStartCursor; bool bCheckEmpty = &rPam != _pStartCursor; do { const SwPosition* pStt = _pStartCursor->Start(), @@ -66,7 +66,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, aPam.SetMark(); *aPam.GetMark() = *pEnd; } - if( _SelectNextRubyChars( aPam, *pNew, nMode )) + if( SelectNextRubyChars( aPam, *pNew, nMode )) { rList.push_back(std::move(pNew)); aPam.DeleteMark(); @@ -85,7 +85,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, } while( 30 > rList.size() && *aPam.GetPoint() < *pEnd ); } } while( 30 > rList.size() && - (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor ); + (_pStartCursor = _pStartCursor->GetNext()) != _pStartCursor2 ); return rList.size(); } @@ -100,7 +100,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, sal_uInt16 nListEntry = 0; const SwPaM *_pStartCursor = rPam.GetNext(), - *__pStartCursor = _pStartCursor; + *_pStartCursor2 = _pStartCursor; bool bCheckEmpty = &rPam != _pStartCursor; do { const SwPosition* pStt = _pStartCursor->Start(), @@ -118,7 +118,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, aPam.SetMark(); *aPam.GetMark() = *pEnd; } - if( _SelectNextRubyChars( aPam, aCheckEntry, nMode )) + if( SelectNextRubyChars( aPam, aCheckEntry, nMode )) { const SwRubyListEntry* pEntry = rList[ nListEntry++ ].get(); if( aCheckEntry.GetRubyAttr() != pEntry->GetRubyAttr() ) @@ -172,12 +172,12 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, } while( nListEntry < rList.size() && *aPam.GetPoint() < *pEnd ); } } while( 30 > rList.size() && - (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor ); + (_pStartCursor = _pStartCursor->GetNext()) != _pStartCursor2 ); GetIDocumentUndoRedo().EndUndo( UNDO_SETRUBYATTR, nullptr ); } -bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 ) +bool SwDoc::SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 ) { // Point must be the startposition, Mark is optional the end position SwPosition* pPos = rPam.GetPoint(); |