sw: prefix members of SwRedlineSaveData, SwUndoAttrTable, SwUndoCpyTable ...

... and SwUndoFormatColl

See tdf#94879 for motivation.

Change-Id: I004a80401c48d9706537cce318d0dc44fb4204be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89807
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

5 files changed, 30 insertions, 30 deletions

diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index 0d09c20c34bb..c1825d30ab20 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -60,7 +60,7 @@ public:
     }
 
 #if OSL_DEBUG_LEVEL > 0
-    sal_uInt16 nRedlineCount;
+    sal_uInt16 m_nRedlineCount;
 #endif
 };
 
@@ -143,8 +143,8 @@ private:
 
 class SwUndoFormatColl : public SwUndo, private SwUndRng
 {
-    OUString aFormatName;
-    std::unique_ptr<SwHistory> pHistory;
+    OUString maFormatName;
+    std::unique_ptr<SwHistory> mpHistory;
     // for correct <ReDo(..)> and <Repeat(..)>
     // boolean, which indicates that the attributes are reset at the nodes
     // before the format has been applied.
@@ -180,7 +180,7 @@ public:
     */
     virtual SwRewriter GetRewriter() const override;
 
-    SwHistory* GetHistory() { return pHistory.get(); }
+    SwHistory* GetHistory() { return mpHistory.get(); }
 
 };
 
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index ecfa87745ef7..76dfe3ce7720 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -124,9 +124,9 @@ public:
 
 class SwUndoAttrTable : public SwUndo
 {
-    sal_uLong nSttNode;
-    std::unique_ptr<SaveTable> pSaveTable;
-    bool bClearTabCol : 1;
+    sal_uLong m_nStartNode;
+    std::unique_ptr<SaveTable> m_pSaveTable;
+    bool m_bClearTableCol : 1;
 
 public:
     SwUndoAttrTable( const SwTableNode& rTableNd, bool bClearTabCols = false );
@@ -292,8 +292,8 @@ public:
 
 class SwUndoCpyTable : public SwUndo
 {
-    std::unique_ptr<SwUndoDelete> pDel;
-    sal_uLong nTableNode;
+    std::unique_ptr<SwUndoDelete> m_pDelete;
+    sal_uLong m_nTableNode;
 
 public:
     SwUndoCpyTable(const SwDoc* pDoc);
@@ -303,7 +303,7 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
 
-    void SetTableSttIdx( sal_uLong nIdx )           { nTableNode = nIdx; }
+    void SetTableSttIdx( sal_uLong nIdx )           { m_nTableNode = nIdx; }
 };
 
 class SwUndoSplitTable : public SwUndo
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 9aabda3b26ca..5d79e7b84ecc 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1332,7 +1332,7 @@ SwRedlineSaveData::SwRedlineSaveData(
     }
 
 #if OSL_DEBUG_LEVEL > 0
-    nRedlineCount = rSttPos.nNode.GetNode().GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().size();
+    m_nRedlineCount = rSttPos.nNode.GetNode().GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().size();
 #endif
 }
 
@@ -1448,7 +1448,7 @@ void SwUndo::SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData )
 #if OSL_DEBUG_LEVEL > 0
     // check redline count against count saved in RedlineSaveData object
     assert(rSData.empty() ||
-           (rSData[0].nRedlineCount == rDoc.getIDocumentRedlineAccess().GetRedlineTable().size()));
+           (rSData[0].m_nRedlineCount == rDoc.getIDocumentRedlineAccess().GetRedlineTable().size()));
             // "redline count not restored properly"
 #endif
 
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index 2760be56812a..118cf98f399e 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -29,13 +29,13 @@ SwUndoFormatColl::SwUndoFormatColl( const SwPaM& rRange,
                               const bool bResetListAttrs )
     : SwUndo( SwUndoId::SETFMTCOLL, rRange.GetDoc() ),
       SwUndRng( rRange ),
-      pHistory( new SwHistory ),
+      mpHistory( new SwHistory ),
       mbReset( bReset ),
       mbResetListAttrs( bResetListAttrs )
 {
     // #i31191#
     if ( pColl )
-        aFormatName = pColl->GetName();
+        maFormatName = pColl->GetName();
 }
 
 SwUndoFormatColl::~SwUndoFormatColl()
@@ -45,8 +45,8 @@ SwUndoFormatColl::~SwUndoFormatColl()
 void SwUndoFormatColl::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     // restore old values
-    pHistory->TmpRollback(& rContext.GetDoc(), 0);
-    pHistory->SetTmpEnd( pHistory->Count() );
+    mpHistory->TmpRollback(& rContext.GetDoc(), 0);
+    mpHistory->SetTmpEnd( mpHistory->Count() );
 
     // create cursor for undo range
     AddUndoRedoPaM(rContext);
@@ -68,7 +68,7 @@ void SwUndoFormatColl::DoSetFormatColl(SwDoc & rDoc, SwPaM const & rPaM)
 {
     // Only one TextFrameColl can be applied to a section, thus request only in
     // this array.
-    SwTextFormatColl * pFormatColl = rDoc.FindTextFormatCollByName(aFormatName);
+    SwTextFormatColl * pFormatColl = rDoc.FindTextFormatCollByName(maFormatName);
     if (pFormatColl)
     {
         rDoc.SetTextFormatColl(rPaM, pFormatColl, mbReset, mbResetListAttrs);
@@ -79,7 +79,7 @@ SwRewriter SwUndoFormatColl::GetRewriter() const
 {
     SwRewriter aResult;
 
-    aResult.AddRule(UndoArg1, aFormatName );
+    aResult.AddRule(UndoArg1, maFormatName );
 
     return aResult;
 }
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 8a53a7d9ed8f..06d6357c0cee 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -1358,10 +1358,10 @@ void SaveBox::CreateNew( SwTable& rTable, SwTableLine& rParent, SaveTable& rSTab
 // UndoObject for attribute changes on table
 SwUndoAttrTable::SwUndoAttrTable( const SwTableNode& rTableNd, bool bClearTabCols )
     : SwUndo( SwUndoId::TABLE_ATTR, rTableNd.GetDoc() ),
-    nSttNode( rTableNd.GetIndex() )
+    m_nStartNode( rTableNd.GetIndex() )
 {
-    bClearTabCol = bClearTabCols;
-    pSaveTable.reset( new SaveTable( rTableNd.GetTable() ) );
+    m_bClearTableCol = bClearTabCols;
+    m_pSaveTable.reset( new SaveTable( rTableNd.GetTable() ) );
 }
 
 SwUndoAttrTable::~SwUndoAttrTable()
@@ -1371,17 +1371,17 @@ SwUndoAttrTable::~SwUndoAttrTable()
 void SwUndoAttrTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwTableNode* pTableNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
+    SwTableNode* pTableNd = rDoc.GetNodes()[ m_nStartNode ]->GetTableNode();
     OSL_ENSURE( pTableNd, "no TableNode" );
 
     if (pTableNd)
     {
         SaveTable* pOrig = new SaveTable( pTableNd->GetTable() );
-        pSaveTable->RestoreAttr( pTableNd->GetTable() );
-        pSaveTable.reset( pOrig );
+        m_pSaveTable->RestoreAttr( pTableNd->GetTable() );
+        m_pSaveTable.reset( pOrig );
     }
 
-    if( bClearTabCol )
+    if( m_bClearTableCol )
     {
         ClearFEShellTabCols(rDoc, nullptr);
     }
@@ -2729,7 +2729,7 @@ bool SwUndoTableCpyTable::IsEmpty() const
 }
 
 SwUndoCpyTable::SwUndoCpyTable(const SwDoc* pDoc)
-    : SwUndo( SwUndoId::CPYTBL, pDoc ), nTableNode( 0 )
+    : SwUndo( SwUndoId::CPYTBL, pDoc ), m_nTableNode( 0 )
 {
 }
 
@@ -2740,7 +2740,7 @@ SwUndoCpyTable::~SwUndoCpyTable()
 void SwUndoCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    SwTableNode* pTNd = rDoc.GetNodes()[ nTableNode ]->GetTableNode();
+    SwTableNode* pTNd = rDoc.GetNodes()[ m_nTableNode ]->GetTableNode();
 
     // move hard page breaks into next node
     SwContentNode* pNextNd = rDoc.GetNodes()[ pTNd->EndOfSectionIndex()+1 ]->GetContentNode();
@@ -2759,13 +2759,13 @@ void SwUndoCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
     }
 
     SwPaM aPam( *pTNd, *pTNd->EndOfSectionNode(), 0 , 1 );
-    pDel.reset( new SwUndoDelete( aPam, true ) );
+    m_pDelete.reset( new SwUndoDelete( aPam, true ) );
 }
 
 void SwUndoCpyTable::RedoImpl(::sw::UndoRedoContext & rContext)
 {
-    pDel->UndoImpl(rContext);
-    pDel.reset();
+    m_pDelete->UndoImpl(rContext);
+    m_pDelete.reset();
 }
 
 SwUndoSplitTable::SwUndoSplitTable( const SwTableNode& rTableNd,