4 files changed, 24 insertions, 24 deletions

diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 7eb1a0ce15f3..714468c9808a 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -430,15 +430,15 @@ SwNode2Layout::SwNode2Layout( const SwNode& rNd, sal_uLong nIdx )
 }
 
 SwNode2LayoutSaveUpperFrames::SwNode2LayoutSaveUpperFrames(const SwNode& rNd)
-    : pImpl( new SwNode2LayImpl( rNd, rNd.GetIndex(), true ) )
+    : m_pImpl( new SwNode2LayImpl( rNd, rNd.GetIndex(), true ) )
 {
-    pImpl->SaveUpperFrames();
+    m_pImpl->SaveUpperFrames();
 }
 
 void SwNode2LayoutSaveUpperFrames::RestoreUpperFrames(
         SwNodes& rNds, sal_uLong const nStt, sal_uLong const nEnd)
 {
-    pImpl->RestoreUpperFrames( rNds, nStt, nEnd );
+    m_pImpl->RestoreUpperFrames( rNds, nStt, nEnd );
 }
 
 SwFrame* SwNode2Layout::NextFrame()
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index 27f97ceaf995..798a5ea1894f 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -59,10 +59,10 @@ struct SwSortUndoElement
 
 class SwUndoSort : public SwUndo, private SwUndRng
 {
-    std::unique_ptr<SwSortOptions>    pSortOpt;
+    std::unique_ptr<SwSortOptions>    m_pSortOptions;
     std::vector<std::unique_ptr<SwSortUndoElement>> m_SortList;
-    std::unique_ptr<SwUndoAttrTable>  pUndoTableAttr;
-    sal_uLong         nTableNd;
+    std::unique_ptr<SwUndoAttrTable>  m_pUndoAttrTable;
+    sal_uLong         m_nTableNode;
 
 public:
     SwUndoSort( const SwPaM&, const SwSortOptions& );
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index c61e2e9e80a7..56073cd89bde 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -67,7 +67,7 @@ public:
 
 class SwNode2LayoutSaveUpperFrames
 {
-    std::unique_ptr<SwNode2LayImpl> pImpl;
+    std::unique_ptr<SwNode2LayImpl> m_pImpl;
 public:
     /// Use this ctor for collecting the UpperFrames
     SwNode2LayoutSaveUpperFrames( const SwNode& rNd );
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index 8f0820fb6b13..682ede12c95f 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -44,9 +44,9 @@ SwSortUndoElement::~SwSortUndoElement()
 SwUndoSort::SwUndoSort(const SwPaM& rRg, const SwSortOptions& rOpt)
     : SwUndo(SwUndoId::SORT_TXT, rRg.GetDoc())
     , SwUndRng(rRg)
-    , nTableNd(0)
+    , m_nTableNode(0)
 {
-    pSortOpt.reset( new SwSortOptions(rOpt) );
+    m_pSortOptions.reset( new SwSortOptions(rOpt) );
 }
 
 SwUndoSort::SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode& rTableNd,
@@ -55,33 +55,33 @@ SwUndoSort::SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode& rTabl
 {
     m_nSttNode = nStt;
     m_nEndNode = nEnd;
-    nTableNd   = rTableNd.GetIndex();
+    m_nTableNode   = rTableNd.GetIndex();
 
-    pSortOpt.reset( new SwSortOptions(rOpt) );
+    m_pSortOptions.reset( new SwSortOptions(rOpt) );
     if( bSaveTable )
-        pUndoTableAttr.reset( new SwUndoAttrTable( rTableNd ) );
+        m_pUndoAttrTable.reset( new SwUndoAttrTable( rTableNd ) );
 }
 
 SwUndoSort::~SwUndoSort()
 {
-    pSortOpt.reset();
-    pUndoTableAttr.reset();
+    m_pSortOptions.reset();
+    m_pUndoAttrTable.reset();
 }
 
 void SwUndoSort::UndoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
-    if(pSortOpt->bTable)
+    if(m_pSortOptions->bTable)
     {
         // Undo for Table
         RemoveIdxFromSection( rDoc, m_nSttNode, &m_nEndNode );
 
-        if( pUndoTableAttr )
+        if( m_pUndoAttrTable )
         {
-            pUndoTableAttr->UndoImpl(rContext);
+            m_pUndoAttrTable->UndoImpl(rContext);
         }
 
-        SwTableNode* pTableNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
+        SwTableNode* pTableNd = rDoc.GetNodes()[ m_nTableNode ]->GetTableNode();
 
         // #i37739# A simple 'MakeFrames' after the node sorting
         // does not work if the table is inside a frame and has no prev/next.
@@ -153,12 +153,12 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
 {
     SwDoc & rDoc = rContext.GetDoc();
 
-    if(pSortOpt->bTable)
+    if(m_pSortOptions->bTable)
     {
         // Redo for Table
         RemoveIdxFromSection( rDoc, m_nSttNode, &m_nEndNode );
 
-        SwTableNode* pTableNd = rDoc.GetNodes()[ nTableNd ]->GetTableNode();
+        SwTableNode* pTableNd = rDoc.GetNodes()[ m_nTableNode ]->GetTableNode();
 
         // #i37739# A simple 'MakeFrames' after the node sorting
         // does not work if the table is inside a frame and has no prev/next.
@@ -182,9 +182,9 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
             aMovedList.push_back( pSource );
         }
 
-        if( pUndoTableAttr )
+        if( m_pUndoAttrTable )
         {
-            pUndoTableAttr->RedoImpl(rContext);
+            m_pUndoAttrTable->RedoImpl(rContext);
         }
 
         // Restore table frames:
@@ -230,13 +230,13 @@ void SwUndoSort::RedoImpl(::sw::UndoRedoContext & rContext)
 void SwUndoSort::RepeatImpl(::sw::RepeatContext & rContext)
 {
     // table not repeat capable
-    if(!pSortOpt->bTable)
+    if(!m_pSortOptions->bTable)
     {
         SwPaM *const pPam = & rContext.GetRepeatPaM();
         SwDoc& rDoc = *pPam->GetDoc();
 
         if( !rDoc.IsIdxInTable( pPam->Start()->nNode ) )
-            rDoc.SortText(*pPam, *pSortOpt);
+            rDoc.SortText(*pPam, *m_pSortOptions);
     }
 }