sw/source/core/inc/UndoNumbering.hxx | 18 ++++----
sw/source/core/undo/unnum.cxx | 72 +++++++++++++++++------------------
2 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit 58b7ad7aacfa40b9e4e5271496aeb4c1e3b75191
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jun 8 09:03:34 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jun 8 10:30:56 2020 +0200
sw: prefix members of SwUndoMoveNum, SwUndoNumOrNoNum, ...
... SwUndoNumRuleStart and SwUndoNumUpDown
See tdf#94879 for motivation.
Change-Id: Id7f9b05955505b5dafc7cf18be28d6aac4349fe4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95787
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/core/inc/UndoNumbering.hxx
b/sw/source/core/inc/UndoNumbering.hxx
index b83a78ec48e6..c363c3edca9a 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -82,8 +82,8 @@ public:
class SwUndoMoveNum : public SwUndo, private SwUndRng
{
- sal_uLong nNewStt;
- long nOffset;
+ sal_uLong m_nNewStart;
+ long m_nOffset;
public:
SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv );
@@ -92,12 +92,12 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
virtual void RepeatImpl( ::sw::RepeatContext & ) override;
- void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; }
+ void SetStartNode( sal_uLong nValue ) { m_nNewStart = nValue; }
};
class SwUndoNumUpDown : public SwUndo, private SwUndRng
{
- short nOffset;
+ short m_nOffset;
public:
SwUndoNumUpDown( const SwPaM& rPam, short nOffset );
@@ -109,7 +109,7 @@ public:
class SwUndoNumOrNoNum : public SwUndo
{
- sal_uLong nIdx;
+ sal_uLong m_nIndex;
bool mbNewNum, mbOldNum;
public:
@@ -123,10 +123,10 @@ public:
class SwUndoNumRuleStart : public SwUndo
{
- sal_uLong nIdx;
- sal_uInt16 nOldStt, nNewStt;
- bool bSetSttValue : 1;
- bool bFlag : 1;
+ sal_uLong m_nIndex;
+ sal_uInt16 m_nOldStart, m_nNewStart;
+ bool m_bSetStartValue : 1;
+ bool m_bFlag : 1;
public:
SwUndoNumRuleStart( const SwPosition& rPos, bool bDelete );
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index a4e4b39c04ff..b3cc01c56476 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -205,7 +205,7 @@ void SwUndoDelNum::AddNode( const SwTextNode& rNd )
SwUndoMoveNum::SwUndoMoveNum( const SwPaM& rPam, long nOff, bool bIsOutlMv )
: SwUndo( bIsOutlMv ? SwUndoId::OUTLINE_UD : SwUndoId::MOVENUM,
rPam.GetDoc() ),
SwUndRng( rPam ),
- nNewStt( 0 ), nOffset( nOff )
+ m_nNewStart( 0 ), m_nOffset( nOff )
{
// nOffset: Down => 1
// Up => -1
@@ -217,15 +217,15 @@ void SwUndoMoveNum::UndoImpl(::sw::UndoRedoContext &
rContext)
if (m_nEndNode || m_nEndContent != COMPLETE_STRING) // section?
{
- if( nNewStt < m_nSttNode ) // moved forwards
- m_nEndNode = m_nEndNode - ( m_nSttNode - nNewStt );
+ if( m_nNewStart < m_nSttNode ) // moved forwards
+ m_nEndNode = m_nEndNode - ( m_nSttNode - m_nNewStart );
else
- m_nEndNode = m_nEndNode + ( nNewStt - m_nSttNode );
+ m_nEndNode = m_nEndNode + ( m_nNewStart - m_nSttNode );
}
- m_nSttNode = nNewStt;
+ m_nSttNode = m_nNewStart;
SwPaM & rPam( AddUndoRedoPaM(rContext) );
- rContext.GetDoc().MoveParagraph( rPam, -nOffset,
+ rContext.GetDoc().MoveParagraph( rPam, -m_nOffset,
SwUndoId::OUTLINE_UD == GetId() );
m_nSttNode = nTmpStt;
m_nEndNode = nTmpEnd;
@@ -234,7 +234,7 @@ void SwUndoMoveNum::UndoImpl(::sw::UndoRedoContext &
rContext)
void SwUndoMoveNum::RedoImpl(::sw::UndoRedoContext & rContext)
{
SwPaM & rPam( AddUndoRedoPaM(rContext) );
- rContext.GetDoc().MoveParagraph(rPam, nOffset, SwUndoId::OUTLINE_UD ==
GetId());
+ rContext.GetDoc().MoveParagraph(rPam, m_nOffset, SwUndoId::OUTLINE_UD ==
GetId());
}
void SwUndoMoveNum::RepeatImpl(::sw::RepeatContext & rContext)
@@ -243,18 +243,18 @@ void SwUndoMoveNum::RepeatImpl(::sw::RepeatContext &
rContext)
if( SwUndoId::OUTLINE_UD == GetId() )
{
rDoc.MoveOutlinePara(rContext.GetRepeatPaM(),
- 0 < nOffset ? 1 : -1 );
+ 0 < m_nOffset ? 1 : -1 );
}
else
{
- rDoc.MoveParagraph(rContext.GetRepeatPaM(), nOffset);
+ rDoc.MoveParagraph(rContext.GetRepeatPaM(), m_nOffset);
}
}
SwUndoNumUpDown::SwUndoNumUpDown( const SwPaM& rPam, short nOff )
: SwUndo( nOff > 0 ? SwUndoId::NUMUP : SwUndoId::NUMDOWN, rPam.GetDoc() ),
SwUndRng( rPam ),
- nOffset( nOff )
+ m_nOffset( nOff )
{
// nOffset: Down => 1
// Up => -1
@@ -263,24 +263,24 @@ SwUndoNumUpDown::SwUndoNumUpDown( const SwPaM& rPam,
short nOff )
void SwUndoNumUpDown::UndoImpl(::sw::UndoRedoContext & rContext)
{
SwPaM & rPam( AddUndoRedoPaM(rContext) );
- rContext.GetDoc().NumUpDown(rPam, 1 != nOffset );
+ rContext.GetDoc().NumUpDown(rPam, 1 != m_nOffset );
}
void SwUndoNumUpDown::RedoImpl(::sw::UndoRedoContext & rContext)
{
SwPaM & rPam( AddUndoRedoPaM(rContext) );
- rContext.GetDoc().NumUpDown(rPam, 1 == nOffset);
+ rContext.GetDoc().NumUpDown(rPam, 1 == m_nOffset);
}
void SwUndoNumUpDown::RepeatImpl(::sw::RepeatContext & rContext)
{
- rContext.GetDoc().NumUpDown(rContext.GetRepeatPaM(), 1 == nOffset);
+ rContext.GetDoc().NumUpDown(rContext.GetRepeatPaM(), 1 == m_nOffset);
}
SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool bOldNum,
bool bNewNum)
: SwUndo( SwUndoId::NUMORNONUM, rIdx.GetNode().GetDoc() ),
- nIdx( rIdx.GetIndex() ), mbNewNum(bNewNum),
+ m_nIndex( rIdx.GetIndex() ), mbNewNum(bNewNum),
mbOldNum(bOldNum)
{
}
@@ -288,7 +288,7 @@ SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex&
rIdx, bool bOldNum,
// #115901#, #i40034#
void SwUndoNumOrNoNum::UndoImpl(::sw::UndoRedoContext & rContext)
{
- SwNodeIndex aIdx( rContext.GetDoc().GetNodes(), nIdx );
+ SwNodeIndex aIdx( rContext.GetDoc().GetNodes(), m_nIndex );
SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
if (nullptr != pTextNd)
@@ -300,7 +300,7 @@ void SwUndoNumOrNoNum::UndoImpl(::sw::UndoRedoContext &
rContext)
// #115901#, #i40034#
void SwUndoNumOrNoNum::RedoImpl(::sw::UndoRedoContext & rContext)
{
- SwNodeIndex aIdx( rContext.GetDoc().GetNodes(), nIdx );
+ SwNodeIndex aIdx( rContext.GetDoc().GetNodes(), m_nIndex );
SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
if (nullptr != pTextNd)
@@ -324,29 +324,29 @@ void SwUndoNumOrNoNum::RepeatImpl(::sw::RepeatContext &
rContext)
SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition& rPos, bool bFlg )
: SwUndo( SwUndoId::SETNUMRULESTART, rPos.GetDoc() ),
- nIdx( rPos.nNode.GetIndex() ), nOldStt( USHRT_MAX ),
- nNewStt( USHRT_MAX ), bSetSttValue( false ), bFlag( bFlg )
+ m_nIndex( rPos.nNode.GetIndex() ), m_nOldStart( USHRT_MAX ),
+ m_nNewStart( USHRT_MAX ), m_bSetStartValue( false ), m_bFlag( bFlg )
{
}
SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16
nStt )
: SwUndo(SwUndoId::SETNUMRULESTART, rPos.GetDoc())
- , nIdx(rPos.nNode.GetIndex())
- , nOldStt(USHRT_MAX)
- , nNewStt(nStt)
- , bSetSttValue(true)
- , bFlag(false)
+ , m_nIndex(rPos.nNode.GetIndex())
+ , m_nOldStart(USHRT_MAX)
+ , m_nNewStart(nStt)
+ , m_bSetStartValue(true)
+ , m_bFlag(false)
{
SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
if ( pTextNd )
{
if ( pTextNd->HasAttrListRestartValue() )
{
- nOldStt =
static_cast<sal_uInt16>(pTextNd->GetAttrListRestartValue());
+ m_nOldStart =
static_cast<sal_uInt16>(pTextNd->GetAttrListRestartValue());
}
else
{
- nOldStt = USHRT_MAX; // indicating, that the list restart value is
not set
+ m_nOldStart = USHRT_MAX; // indicating, that the list restart
value is not set
}
}
}
@@ -354,41 +354,41 @@ SwUndoNumRuleStart::SwUndoNumRuleStart( const SwPosition&
rPos, sal_uInt16 nStt
void SwUndoNumRuleStart::UndoImpl(::sw::UndoRedoContext & rContext)
{
SwDoc & rDoc = rContext.GetDoc();
- SwPosition const aPos( *rDoc.GetNodes()[ nIdx ] );
- if( bSetSttValue )
+ SwPosition const aPos( *rDoc.GetNodes()[ m_nIndex ] );
+ if( m_bSetStartValue )
{
- rDoc.SetNodeNumStart( aPos, nOldStt );
+ rDoc.SetNodeNumStart( aPos, m_nOldStart );
}
else
{
- rDoc.SetNumRuleStart( aPos, !bFlag );
+ rDoc.SetNumRuleStart( aPos, !m_bFlag );
}
}
void SwUndoNumRuleStart::RedoImpl(::sw::UndoRedoContext & rContext)
{
SwDoc & rDoc = rContext.GetDoc();
- SwPosition const aPos( *rDoc.GetNodes()[ nIdx ] );
- if( bSetSttValue )
+ SwPosition const aPos( *rDoc.GetNodes()[ m_nIndex ] );
+ if( m_bSetStartValue )
{
- rDoc.SetNodeNumStart( aPos, nNewStt );
+ rDoc.SetNodeNumStart( aPos, m_nNewStart );
}
else
{
- rDoc.SetNumRuleStart( aPos, bFlag );
+ rDoc.SetNumRuleStart( aPos, m_bFlag );
}
}
void SwUndoNumRuleStart::RepeatImpl(::sw::RepeatContext & rContext)
{
SwDoc & rDoc = rContext.GetDoc();
- if( bSetSttValue )
+ if( m_bSetStartValue )
{
- rDoc.SetNodeNumStart(*rContext.GetRepeatPaM().GetPoint(), nNewStt);
+ rDoc.SetNodeNumStart(*rContext.GetRepeatPaM().GetPoint(), m_nNewStart);
}
else
{
- rDoc.SetNumRuleStart(*rContext.GetRepeatPaM().GetPoint(), bFlag);
+ rDoc.SetNumRuleStart(*rContext.GetRepeatPaM().GetPoint(), m_bFlag);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
