sw: prefix members of SwAutoCorrDoc, SwDontExpandItem, SwHyphArgs and ...

... SwUndoDrawUnGroupConnectToLayout

See tdf#94879 for motivation.

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

5 files changed, 103 insertions, 103 deletions

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index b4f52ede746e..ad9da76b4d6b 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -701,33 +701,33 @@ namespace {
 
 class SwHyphArgs : public SwInterHyphInfo
 {
-    const SwNode *pStart;
-    const SwNode *pEnd;
-          SwNode *pNode;
-    sal_uInt16 *pPageCnt;
-    sal_uInt16 *pPageSt;
+    const SwNode *m_pStart;
+    const SwNode *m_pEnd;
+          SwNode *m_pNode;
+    sal_uInt16 *m_pPageCnt;
+    sal_uInt16 *m_pPageSt;
 
-    sal_uInt32 nNode;
-    sal_Int32 nPamStart;
-    sal_Int32 nPamLen;
+    sal_uInt32 m_nNode;
+    sal_Int32 m_nPamStart;
+    sal_Int32 m_nPamLen;
 
 public:
     SwHyphArgs( const SwPaM *pPam, const Point &rPoint,
                 sal_uInt16* pPageCount, sal_uInt16* pPageStart );
     void SetPam( SwPaM *pPam ) const;
-    void SetNode( SwNode *pNew ) { pNode = pNew; }
+    void SetNode( SwNode *pNew ) { m_pNode = pNew; }
     inline void SetRange( const SwNode *pNew );
-    void NextNode() { ++nNode; }
-    sal_uInt16 *GetPageCnt() { return pPageCnt; }
-    sal_uInt16 *GetPageSt() { return pPageSt; }
+    void NextNode() { ++m_nNode; }
+    sal_uInt16 *GetPageCnt() { return m_pPageCnt; }
+    sal_uInt16 *GetPageSt() { return m_pPageSt; }
 };
 
 }
 
 SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCursorPos,
                          sal_uInt16* pPageCount, sal_uInt16* pPageStart )
-     : SwInterHyphInfo( rCursorPos ), pNode(nullptr),
-     pPageCnt( pPageCount ), pPageSt( pPageStart )
+     : SwInterHyphInfo( rCursorPos ), m_pNode(nullptr),
+     m_pPageCnt( pPageCount ), m_pPageSt( pPageStart )
 {
     // The following constraints have to be met:
     // 1) there is at least one Selection
@@ -737,38 +737,38 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCursorPos,
             "SwDoc::Hyphenate: New York, New York");
 
     const SwPosition *pPoint = pPam->GetPoint();
-    nNode = pPoint->nNode.GetIndex();
+    m_nNode = pPoint->nNode.GetIndex();
 
     // Set start
-    pStart = pPoint->nNode.GetNode().GetTextNode();
-    nPamStart = pPoint->nContent.GetIndex();
+    m_pStart = pPoint->nNode.GetNode().GetTextNode();
+    m_nPamStart = pPoint->nContent.GetIndex();
 
     // Set End and Length
     const SwPosition *pMark = pPam->GetMark();
-    pEnd = pMark->nNode.GetNode().GetTextNode();
-    nPamLen = pMark->nContent.GetIndex();
+    m_pEnd = pMark->nNode.GetNode().GetTextNode();
+    m_nPamLen = pMark->nContent.GetIndex();
     if( pPoint->nNode == pMark->nNode )
-        nPamLen = nPamLen - pPoint->nContent.GetIndex();
+        m_nPamLen = m_nPamLen - pPoint->nContent.GetIndex();
 }
 
 inline void SwHyphArgs::SetRange( const SwNode *pNew )
 {
-    m_nStart = pStart == pNew ? nPamStart : 0;
-    m_nEnd   = pEnd   == pNew ? nPamStart + nPamLen : SAL_MAX_INT32;
+    m_nStart = m_pStart == pNew ? m_nPamStart : 0;
+    m_nEnd   = m_pEnd   == pNew ? m_nPamStart + m_nPamLen : SAL_MAX_INT32;
 }
 
 void SwHyphArgs::SetPam( SwPaM *pPam ) const
 {
-    if( !pNode )
+    if( !m_pNode )
         *pPam->GetPoint() = *pPam->GetMark();
     else
     {
-        pPam->GetPoint()->nNode = nNode;
-        pPam->GetPoint()->nContent.Assign( pNode->GetContentNode(), m_nWordStart );
-        pPam->GetMark()->nNode = nNode;
-        pPam->GetMark()->nContent.Assign( pNode->GetContentNode(),
+        pPam->GetPoint()->nNode = m_nNode;
+        pPam->GetPoint()->nContent.Assign( m_pNode->GetContentNode(), m_nWordStart );
+        pPam->GetMark()->nNode = m_nNode;
+        pPam->GetMark()->nContent.Assign( m_pNode->GetContentNode(),
                                           m_nWordStart + m_nWordLen );
-        OSL_ENSURE( nNode == pNode->GetIndex(),
+        OSL_ENSURE( m_nNode == m_pNode->GetIndex(),
                 "SwHyphArgs::SetPam: Pam disaster" );
     }
 }
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index b5f7716aeeee..6d48f24ae503 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -85,9 +85,9 @@ void PaMIntoCursorShellRing::RemoveFromRing( SwPaM& rPam, SwPaM const * pPrev )
 
 SwAutoCorrDoc::SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam,
                                 sal_Unicode cIns )
-    : rEditSh( rEditShell ), rCursor( rPam )
+    : m_rEditSh( rEditShell ), m_rCursor( rPam )
     , m_nEndUndoCounter(0)
-    , bUndoIdInitialized( cIns == 0 )
+    , m_bUndoIdInitialized( cIns == 0 )
 {
 }
 
@@ -95,7 +95,7 @@ SwAutoCorrDoc::~SwAutoCorrDoc()
 {
     for (int i = 0; i < m_nEndUndoCounter; ++i)
     {
-        rEditSh.EndUndo();
+        m_rEditSh.EndUndo();
     }
 }
 
@@ -104,7 +104,7 @@ void SwAutoCorrDoc::DeleteSel( SwPaM& rDelPam )
     // this should work with plain SwPaM as well because start and end
     // are always in same node, but since there is GetRanges already...
     std::vector<std::shared_ptr<SwUnoCursor>> ranges;
-    if (sw::GetRanges(ranges, *rEditSh.GetDoc(), rDelPam))
+    if (sw::GetRanges(ranges, *m_rEditSh.GetDoc(), rDelPam))
     {
         DeleteSelImpl(rDelPam);
     }
@@ -119,7 +119,7 @@ void SwAutoCorrDoc::DeleteSel( SwPaM& rDelPam )
 
 void SwAutoCorrDoc::DeleteSelImpl(SwPaM & rDelPam)
 {
-    SwDoc* pDoc = rEditSh.GetDoc();
+    SwDoc* pDoc = m_rEditSh.GetDoc();
     if( pDoc->IsAutoFormatRedline() )
     {
         // so that also the DelPam be moved,  include it in the
@@ -137,33 +137,33 @@ void SwAutoCorrDoc::DeleteSelImpl(SwPaM & rDelPam)
 
 bool SwAutoCorrDoc::Delete( sal_Int32 nStt, sal_Int32 nEnd )
 {
-    SwTextNode const*const pTextNd = rCursor.GetNode().GetTextNode();
+    SwTextNode const*const pTextNd = m_rCursor.GetNode().GetTextNode();
     SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(
-                pTextNd->getLayoutFrame(rEditSh.GetLayout())));
+                pTextNd->getLayoutFrame(m_rEditSh.GetLayout())));
     assert(pFrame);
     SwPaM aSel(pFrame->MapViewToModelPos(TextFrameIndex(nStt)),
                pFrame->MapViewToModelPos(TextFrameIndex(nEnd)));
     DeleteSel( aSel );
 
-    if( bUndoIdInitialized )
-        bUndoIdInitialized = true;
+    if( m_bUndoIdInitialized )
+        m_bUndoIdInitialized = true;
     return true;
 }
 
 bool SwAutoCorrDoc::Insert( sal_Int32 nPos, const OUString& rText )
 {
-    SwTextNode const*const pTextNd = rCursor.GetNode().GetTextNode();
+    SwTextNode const*const pTextNd = m_rCursor.GetNode().GetTextNode();
     SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(
-                pTextNd->getLayoutFrame(rEditSh.GetLayout())));
+                pTextNd->getLayoutFrame(m_rEditSh.GetLayout())));
     assert(pFrame);
     SwPaM aPam(pFrame->MapViewToModelPos(TextFrameIndex(nPos)));
-    rEditSh.GetDoc()->getIDocumentContentOperations().InsertString( aPam, rText );
-    if( !bUndoIdInitialized )
+    m_rEditSh.GetDoc()->getIDocumentContentOperations().InsertString( aPam, rText );
+    if( !m_bUndoIdInitialized )
     {
-        bUndoIdInitialized = true;
+        m_bUndoIdInitialized = true;
         if( 1 == rText.getLength() )
         {
-            rEditSh.StartUndo( SwUndoId::AUTOCORRECT );
+            m_rEditSh.StartUndo( SwUndoId::AUTOCORRECT );
             ++m_nEndUndoCounter;
         }
     }
@@ -187,18 +187,18 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
     //        for (ranges.begin() + 1; ranges.end(); )
     //            DeleteImpl(*it)
 
-    SwTextNode * const pNd = rCursor.GetNode().GetTextNode();
+    SwTextNode * const pNd = m_rCursor.GetNode().GetTextNode();
     if ( !pNd )
     {
         return false;
     }
 
     SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(
-                pNd->getLayoutFrame(rEditSh.GetLayout())));
+                pNd->getLayoutFrame(m_rEditSh.GetLayout())));
     assert(pFrame);
     std::pair<SwTextNode *, sal_Int32> const pos(pFrame->MapViewToModel(TextFrameIndex(nPos)));
 
-    SwPaM* pPam = &rCursor;
+    SwPaM* pPam = &m_rCursor;
     if (pPam->GetPoint()->nNode != *pos.first
         || pPam->GetPoint()->nContent != pos.second)
     {
@@ -221,7 +221,7 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
 
     if ( bDoReplace )
     {
-        SwDoc* pDoc = rEditSh.GetDoc();
+        SwDoc* pDoc = m_rEditSh.GetDoc();
 
         if( pDoc->IsAutoFormatRedline() )
         {
@@ -232,7 +232,7 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
             else
             {
                 assert(pos.second != pos.first->Len()); // must be _before_ char
-                PaMIntoCursorShellRing aTmp( rEditSh, rCursor, *pPam );
+                PaMIntoCursorShellRing aTmp( m_rEditSh, m_rCursor, *pPam );
 
                 pPam->SetMark();
                 pPam->GetPoint()->nContent = std::min<sal_Int32>(
@@ -257,18 +257,18 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
                 pDoc->getIDocumentContentOperations().Overwrite( *pPam, rText );
         }
 
-        if( bUndoIdInitialized )
+        if( m_bUndoIdInitialized )
         {
-            bUndoIdInitialized = true;
+            m_bUndoIdInitialized = true;
             if( 1 == rText.getLength() )
             {
-                rEditSh.StartUndo( SwUndoId::AUTOCORRECT );
+                m_rEditSh.StartUndo( SwUndoId::AUTOCORRECT );
                 ++m_nEndUndoCounter;
             }
         }
     }
 
-    if( pPam != &rCursor )
+    if( pPam != &m_rCursor )
         delete pPam;
 
     return true;
@@ -277,14 +277,14 @@ bool SwAutoCorrDoc::ReplaceRange( sal_Int32 nPos, sal_Int32 nSourceLength, const
 void SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId,
                                         SfxPoolItem& rItem )
 {
-    SwTextNode const*const pTextNd = rCursor.GetNode().GetTextNode();
+    SwTextNode const*const pTextNd = m_rCursor.GetNode().GetTextNode();
     SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(
-                pTextNd->getLayoutFrame(rEditSh.GetLayout())));
+                pTextNd->getLayoutFrame(m_rEditSh.GetLayout())));
     assert(pFrame);
     SwPaM aPam(pFrame->MapViewToModelPos(TextFrameIndex(nStt)),
                pFrame->MapViewToModelPos(TextFrameIndex(nEnd)));
 
-    SfxItemPool& rPool = rEditSh.GetDoc()->GetAttrPool();
+    SfxItemPool& rPool = m_rEditSh.GetDoc()->GetAttrPool();
     sal_uInt16 nWhich = rPool.GetWhich( nSlotId, false );
     if( nWhich )
     {
@@ -293,28 +293,28 @@ void SwAutoCorrDoc::SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId,
         SfxItemSet aSet( rPool, aCharFormatSetRange );
         SetAllScriptItem( aSet, rItem );
 
-        rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
+        m_rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
 
-        if( bUndoIdInitialized )
-            bUndoIdInitialized = true;
+        if( m_bUndoIdInitialized )
+            m_bUndoIdInitialized = true;
     }
 }
 
 bool SwAutoCorrDoc::SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL )
 {
-    SwTextNode const*const pTextNd = rCursor.GetNode().GetTextNode();
+    SwTextNode const*const pTextNd = m_rCursor.GetNode().GetTextNode();
     SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(
-                pTextNd->getLayoutFrame(rEditSh.GetLayout())));
+                pTextNd->getLayoutFrame(m_rEditSh.GetLayout())));
     assert(pFrame);
     SwPaM aPam(pFrame->MapViewToModelPos(TextFrameIndex(nStt)),
                pFrame->MapViewToModelPos(TextFrameIndex(nEnd)));
 
-    SfxItemSet aSet( rEditSh.GetDoc()->GetAttrPool(),
+    SfxItemSet aSet( m_rEditSh.GetDoc()->GetAttrPool(),
                         svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{} );
     aSet.Put( SwFormatINetFormat( rURL, OUString() ));
-    rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
-    if( bUndoIdInitialized )
-        bUndoIdInitialized = true;
+    m_rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet );
+    if( m_bUndoIdInitialized )
+        m_bUndoIdInitialized = true;
     return true;
 }
 
@@ -328,29 +328,29 @@ OUString const* SwAutoCorrDoc::GetPrevPara(bool const bAtNormalPos)
 {
     OUString const* pStr(nullptr);
 
-    if( bAtNormalPos || !pIdx )
+    if( bAtNormalPos || !m_pIndex )
     {
-        pIdx.reset(new SwNodeIndex(rCursor.GetPoint()->nNode));
+        m_pIndex.reset(new SwNodeIndex(m_rCursor.GetPoint()->nNode));
     }
-    sw::GotoPrevLayoutTextFrame(*pIdx, rEditSh.GetLayout());
+    sw::GotoPrevLayoutTextFrame(*m_pIndex, m_rEditSh.GetLayout());
 
     SwTextFrame const* pFrame(nullptr);
-    for (SwTextNode * pTextNd = pIdx->GetNode().GetTextNode();
-             pTextNd; pTextNd = pIdx->GetNode().GetTextNode())
+    for (SwTextNode * pTextNd = m_pIndex->GetNode().GetTextNode();
+             pTextNd; pTextNd = m_pIndex->GetNode().GetTextNode())
     {
         pFrame = static_cast<SwTextFrame const*>(
-                pTextNd->getLayoutFrame(rEditSh.GetLayout()));
+                pTextNd->getLayoutFrame(m_rEditSh.GetLayout()));
         if (pFrame && !pFrame->GetText().isEmpty())
         {
             break;
         }
-        sw::GotoPrevLayoutTextFrame(*pIdx, rEditSh.GetLayout());
+        sw::GotoPrevLayoutTextFrame(*m_pIndex, m_rEditSh.GetLayout());
     }
     if (pFrame && 0 == pFrame->GetTextNodeForParaProps()->GetAttrOutlineLevel())
         pStr = & pFrame->GetText();
 
-    if( bUndoIdInitialized )
-        bUndoIdInitialized = true;
+    if( m_bUndoIdInitialized )
+        m_bUndoIdInitialized = true;
 
     return pStr;
 }
@@ -359,12 +359,12 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
                                          SvxAutoCorrect& rACorrect,
                                          OUString* pPara )
 {
-    if( bUndoIdInitialized )
-        bUndoIdInitialized = true;
+    if( m_bUndoIdInitialized )
+        m_bUndoIdInitialized = true;
 
     // Found a beginning of a paragraph or a Blank,
     // search for the word Kuerzel (Shortcut) in the Auto
-    SwTextNode* pTextNd = rCursor.GetNode().GetTextNode();
+    SwTextNode* pTextNd = m_rCursor.GetNode().GetTextNode();
     OSL_ENSURE( pTextNd, "where is the TextNode?" );
 
     bool bRet = false;
@@ -377,13 +377,13 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
     LanguageTag aLanguageTag( eLang);
 
     SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(
-                pTextNd->getLayoutFrame(rEditSh.GetLayout())));
+                pTextNd->getLayoutFrame(m_rEditSh.GetLayout())));
     assert(pFrame);
 
     const OUString sFrameText = pFrame->GetText();
     const SvxAutocorrWord* pFnd = rACorrect.SearchWordsInList(
                 sFrameText, rSttPos, nEndPos, *this, aLanguageTag);
-    SwDoc* pDoc = rEditSh.GetDoc();
+    SwDoc* pDoc = m_rEditSh.GetDoc();
     if( pFnd )
     {
         // replace also last colon of keywords surrounded by colons (for example, ":name:")
@@ -403,7 +403,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
             {
                 // replace the selection
                 std::vector<std::shared_ptr<SwUnoCursor>> ranges;
-                if (sw::GetRanges(ranges, *rEditSh.GetDoc(), aPam))
+                if (sw::GetRanges(ranges, *m_rEditSh.GetDoc(), aPam))
                 {
                     pDoc->getIDocumentContentOperations().ReplaceRange(aPam, pFnd->GetLong(), false);
                     bRet = true;
@@ -424,7 +424,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
                 // pTextNd may become invalid when change tracking is on and Edit -> Track Changes -> Show == OFF.
                 // ReplaceRange shows changes, this moves deleted nodes from special section to document.
                 // Then Show mode is disabled again. As a result pTextNd may be invalidated.
-                pTextNd = rCursor.GetNode().GetTextNode();
+                pTextNd = m_rCursor.GetNode().GetTextNode();
             }
         }
         else
@@ -438,9 +438,9 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
 
                 if( pPara )
                 {
-                    OSL_ENSURE( !pIdx, "who has not deleted his Index?" );
-                    pIdx.reset(new SwNodeIndex( rCursor.GetPoint()->nNode ));
-                    sw::GotoPrevLayoutTextFrame(*pIdx, rEditSh.GetLayout());
+                    OSL_ENSURE( !m_pIndex, "who has not deleted his Index?" );
+                    m_pIndex.reset(new SwNodeIndex( m_rCursor.GetPoint()->nNode ));
+                    sw::GotoPrevLayoutTextFrame(*m_pIndex, m_rEditSh.GetLayout());
                 }
 
                 SwDoc* pAutoDoc = aTBlks.GetDoc();
@@ -471,8 +471,8 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
 
                 if( pPara )
                 {
-                    sw::GotoNextLayoutTextFrame(*pIdx, rEditSh.GetLayout());
-                    pTextNd = pIdx->GetNode().GetTextNode();
+                    sw::GotoNextLayoutTextFrame(*m_pIndex, m_rEditSh.GetLayout());
+                    pTextNd = m_pIndex->GetNode().GetTextNode();
                 }
                 bRet = true;
             }
@@ -483,7 +483,7 @@ bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
     if( bRet && pPara && pTextNd )
     {
         SwTextFrame const*const pNewFrame(static_cast<SwTextFrame const*>(
-                    pTextNd->getLayoutFrame(rEditSh.GetLayout())));
+                    pTextNd->getLayoutFrame(m_rEditSh.GetLayout())));
         *pPara = pNewFrame->GetText();
     }
 
@@ -499,9 +499,9 @@ void SwAutoCorrDoc::SaveCpltSttWord( ACFlags nFlag, sal_Int32 nPos,
                                             const OUString& rExceptWord,
                                             sal_Unicode cChar )
 {
-    sal_uLong nNode = pIdx ? pIdx->GetIndex() : rCursor.GetPoint()->nNode.GetIndex();
+    sal_uLong nNode = m_pIndex ? m_pIndex->GetIndex() : m_rCursor.GetPoint()->nNode.GetIndex();
     LanguageType eLang = GetLanguage(nPos);
-    rEditSh.GetDoc()->SetAutoCorrExceptWord( std::make_unique<SwAutoCorrExceptWord>( nFlag,
+    m_rEditSh.GetDoc()->SetAutoCorrExceptWord( std::make_unique<SwAutoCorrExceptWord>( nFlag,
                                         nNode, nPos, rExceptWord, cChar, eLang ));
 }
 
@@ -509,12 +509,12 @@ LanguageType SwAutoCorrDoc::GetLanguage( sal_Int32 nPos ) const
 {
     LanguageType eRet = LANGUAGE_SYSTEM;
 
-    SwTextNode* pNd = rCursor.GetPoint()->nNode.GetNode().GetTextNode();
+    SwTextNode* pNd = m_rCursor.GetPoint()->nNode.GetNode().GetTextNode();
 
     if( pNd )
     {
         SwTextFrame const*const pFrame(static_cast<SwTextFrame const*>(
-                    pNd->getLayoutFrame(rEditSh.GetLayout())));
+                    pNd->getLayoutFrame(m_rEditSh.GetLayout())));
         assert(pFrame);
         eRet = pFrame->GetLangOfChar(TextFrameIndex(nPos), 0, true);
     }
@@ -557,13 +557,13 @@ void SwDontExpandItem::SaveDontExpandItems( const SwPosition& rPos )
     const SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
     if( pTextNd )
     {
-        pDontExpItems.reset( new SfxItemSet( const_cast<SwDoc*>(pTextNd->GetDoc())->GetAttrPool(),
+        m_pDontExpandItems.reset( new SfxItemSet( const_cast<SwDoc*>(pTextNd->GetDoc())->GetAttrPool(),
                                             aCharFormatSetRange ) );
         const sal_Int32 n = rPos.nContent.GetIndex();
-        if (!pTextNd->GetParaAttr( *pDontExpItems, n, n,
+        if (!pTextNd->GetParaAttr( *m_pDontExpandItems, n, n,
                                 n != pTextNd->GetText().getLength() ))
         {
-            pDontExpItems.reset();
+            m_pDontExpandItems.reset();
         }
     }
 }
@@ -598,7 +598,7 @@ void SwDontExpandItem::RestoreDontExpandItems( const SwPosition& rPos )
                         ( nAttrStart == *pAttrEnd || !nStart ))) )
                 {
                     const SfxPoolItem* pItem;
-                    if( !pDontExpItems || SfxItemState::SET != pDontExpItems->
+                    if( !m_pDontExpandItems || SfxItemState::SET != m_pDontExpandItems->
                         GetItemState( pHt->Which(), false, &pItem ) ||
                         *pItem != pHt->GetAttr() )
                     {
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index e5a1672258bf..ee8f37ef2db6 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -98,7 +98,7 @@ public:
 class SwUndoDrawUnGroupConnectToLayout : public SwUndo
 {
 private:
-    std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > > aDrawFormatsAndObjs;
+    std::vector< std::pair< SwDrawFrameFormat*, SdrObject* > > m_aDrawFormatsAndObjs;
 
 public:
     SwUndoDrawUnGroupConnectToLayout(const SwDoc* pDoc);
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index 2f270f1884d1..f1d8c045bd3d 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -34,7 +34,7 @@ class SfxItemSet;
 
 class SwDontExpandItem
 {
-    std::unique_ptr<SfxItemSet> pDontExpItems;
+    std::unique_ptr<SfxItemSet> m_pDontExpandItems;
 
 public:
     SwDontExpandItem() {}
@@ -47,11 +47,11 @@ public:
 
 class SwAutoCorrDoc : public SvxAutoCorrDoc
 {
-    SwEditShell& rEditSh;
-    SwPaM& rCursor;
-    std::unique_ptr<SwNodeIndex> pIdx;
+    SwEditShell& m_rEditSh;
+    SwPaM& m_rCursor;
+    std::unique_ptr<SwNodeIndex> m_pIndex;
     int m_nEndUndoCounter;
-    bool    bUndoIdInitialized;
+    bool    m_bUndoIdInitialized;
 
     void DeleteSel( SwPaM& rDelPam );
     void DeleteSelImpl(SwPaM & rDelPam);
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 61b11121dc69..b6c8bd521ba4 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -436,7 +436,7 @@ SwUndoDrawUnGroupConnectToLayout::~SwUndoDrawUnGroupConnectToLayout()
 void
 SwUndoDrawUnGroupConnectToLayout::UndoImpl(::sw::UndoRedoContext &)
 {
-    for (const std::pair< SwDrawFrameFormat*, SdrObject* > & rPair : aDrawFormatsAndObjs)
+    for (const std::pair< SwDrawFrameFormat*, SdrObject* > & rPair : m_aDrawFormatsAndObjs)
     {
         SdrObject* pObj( rPair.second );
         SwDrawContact* pDrawContact( dynamic_cast<SwDrawContact*>(pObj->GetUserCall()) );
@@ -455,7 +455,7 @@ SwUndoDrawUnGroupConnectToLayout::UndoImpl(::sw::UndoRedoContext &)
 void
 SwUndoDrawUnGroupConnectToLayout::RedoImpl(::sw::UndoRedoContext &)
 {
-    for (const std::pair< SwDrawFrameFormat*, SdrObject* > & rPair : aDrawFormatsAndObjs)
+    for (const std::pair< SwDrawFrameFormat*, SdrObject* > & rPair : m_aDrawFormatsAndObjs)
     {
         SwDrawFrameFormat* pFormat( rPair.first );
         SdrObject* pObj( rPair.second );
@@ -468,7 +468,7 @@ SwUndoDrawUnGroupConnectToLayout::RedoImpl(::sw::UndoRedoContext &)
 void SwUndoDrawUnGroupConnectToLayout::AddFormatAndObj( SwDrawFrameFormat* pDrawFrameFormat,
                                                      SdrObject* pDrawObject )
 {
-    aDrawFormatsAndObjs.emplace_back( pDrawFrameFormat, pDrawObject );
+    m_aDrawFormatsAndObjs.emplace_back( pDrawFrameFormat, pDrawObject );
 }
 
 SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt, const SwDoc* pDoc )