sw: prefix members of WW8_WrPlcPn, WW8_WrPlcSepx, WW8_WrPlcSubDoc and ...

... WW8_WrPlcTextBoxes

See tdf#94879 for motivation.

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

4 files changed, 108 insertions, 108 deletions

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index f9746b13fa00..e9a00f95ec89 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -904,15 +904,15 @@ void DrawObj::SetShapeDetails(sal_uInt32 nId, sal_Int32 nThick)
 bool WW8_WrPlcTextBoxes::WriteText( WW8Export& rWrt )
 {
     rWrt.m_bInWriteEscher = true;
-    WW8_CP& rccp=TXT_TXTBOX == nTyp ? rWrt.m_pFib->m_ccpTxbx : rWrt.m_pFib->m_ccpHdrTxbx;
+    WW8_CP& rccp=TXT_TXTBOX == m_nTyp ? rWrt.m_pFib->m_ccpTxbx : rWrt.m_pFib->m_ccpHdrTxbx;
 
-    bool bRet = WriteGenericText( rWrt, nTyp, rccp );
+    bool bRet = WriteGenericText( rWrt, m_nTyp, rccp );
 
     WW8_CP nCP = rWrt.Fc2Cp( rWrt.Strm().Tell() );
     WW8Fib& rFib = *rWrt.m_pFib;
     WW8_CP nMyOffset = rFib.m_ccpText + rFib.m_ccpFootnote + rFib.m_ccpHdr + rFib.m_ccpAtn
                             + rFib.m_ccpEdn;
-    if( TXT_TXTBOX == nTyp )
+    if( TXT_TXTBOX == m_nTyp )
         rWrt.m_pFieldTextBxs->Finish( nCP, nMyOffset );
     else
         rWrt.m_pFieldHFTextBxs->Finish( nCP, nMyOffset + rFib.m_ccpTxbx );
@@ -922,23 +922,23 @@ bool WW8_WrPlcTextBoxes::WriteText( WW8Export& rWrt )
 
 void WW8_WrPlcTextBoxes::Append( const SdrObject& rObj, sal_uInt32 nShapeId )
 {
-    aContent.push_back( &rObj );
-    aShapeIds.push_back( nShapeId );
+    m_aContent.push_back( &rObj );
+    m_aShapeIds.push_back( nShapeId );
     //save NULL, if we have an actual SdrObject
-    aSpareFormats.push_back(nullptr);
+    m_aSpareFormats.push_back(nullptr);
 }
 
 void WW8_WrPlcTextBoxes::Append( const SwFrameFormat* pFormat, sal_uInt32 nShapeId )
 {
     //no sdr object, we insert a NULL in the aContent and save the real fmt in aSpareFormats.
-    aContent.push_back( nullptr );
-    aShapeIds.push_back( nShapeId );
-    aSpareFormats.push_back(pFormat);
+    m_aContent.push_back( nullptr );
+    m_aShapeIds.push_back( nShapeId );
+    m_aSpareFormats.push_back(pFormat);
 }
 
 const std::vector<sal_uInt32>* WW8_WrPlcTextBoxes::GetShapeIdArr() const
 {
-    return &aShapeIds;
+    return &m_aShapeIds;
 }
 
 sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrameFormat& rFormat ) const
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 6f16b9ac1d64..dec8d2445678 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1051,7 +1051,7 @@ WW8_WrPlcSepx::WW8_WrPlcSepx( MSWordExportBase& rExport )
 {
     // to be in sync with the AppendSection() call in the MSWordSections
     // constructor
-    aCps.push_back( 0 );
+    m_aCps.push_back( 0 );
 }
 
 MSWordSections::~MSWordSections()
@@ -1124,7 +1124,7 @@ void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwPageDesc* pPd,
     if (HeaderFooterWritten()) {
         return; // #i117955# prevent new sections in endnotes
     }
-    aCps.push_back( nStartCp );
+    m_aCps.push_back( nStartCp );
     AppendSection( pPd, pSectionFormat, nLnNumRestartNo );
 }
 
@@ -1147,7 +1147,7 @@ void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwFormatPageDesc& rPD,
     if (HeaderFooterWritten()) {
         return; // #i117955# prevent new sections in endnotes
     }
-    aCps.push_back( nStartCp );
+    m_aCps.push_back( nStartCp );
     AppendSection( rPD, rNd, pSectionFormat, nLnNumRestartNo );
 }
 
@@ -1161,33 +1161,33 @@ void WW8_WrPlcSepx::WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt )
     sal_uInt8 nEmptyStt = 0;
     if( nInfoFlags )
     {
-        pTextPos->Append( nCpStt );  // empty footnote separator
+        m_pTextPos->Append( nCpStt );  // empty footnote separator
 
         if( 0x02 & nInfoFlags )         // Footnote continuation separator
         {
-            pTextPos->Append( nCpStt );
+            m_pTextPos->Append( nCpStt );
             rWrt.WriteStringAsPara( rInfo.m_aErgoSum );
             rWrt.WriteStringAsPara( OUString() );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
         else
-            pTextPos->Append( nCpStt );
+            m_pTextPos->Append( nCpStt );
 
         if( 0x04 & nInfoFlags )         // Footnote continuation notice
         {
-            pTextPos->Append( nCpStt );
+            m_pTextPos->Append( nCpStt );
             rWrt.WriteStringAsPara( rInfo.m_aQuoVadis );
             rWrt.WriteStringAsPara( OUString() );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
         else
-            pTextPos->Append( nCpStt );
+            m_pTextPos->Append( nCpStt );
 
         nEmptyStt = 3;
     }
 
     while( 6 > nEmptyStt++ )
-        pTextPos->Append( nCpStt );
+        m_pTextPos->Append( nCpStt );
 
     // set the flags at the Dop right away
     WW8Dop& rDop = *rWrt.m_pDop;
@@ -1232,14 +1232,14 @@ void WW8_WrPlcSepx::OutHeaderFooter( WW8Export& rWrt, bool bHeader,
 {
     if ( nFlag & nHFFlags )
     {
-        pTextPos->Append( rCpPos );
+        m_pTextPos->Append( rCpPos );
         rWrt.WriteHeaderFooterText( rFormat, bHeader);
         rWrt.WriteStringAsPara( OUString() ); // CR to the end ( otherwise WW complains )
         rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
     }
     else
     {
-        pTextPos->Append( rCpPos );
+        m_pTextPos->Append( rCpPos );
         if ((bHeader? rWrt.m_bHasHdr : rWrt.m_bHasFtr) && nBreakCode!=0)
         {
             rWrt.WriteStringAsPara( OUString() ); // Empty paragraph for empty header/footer
@@ -1972,8 +1972,8 @@ bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
 {
     sal_uLong nCpStart = rWrt.Fc2Cp( rWrt.Strm().Tell() );
 
-    OSL_ENSURE( !pTextPos, "who set the pointer?" );
-    pTextPos.reset( new WW8_WrPlc0( nCpStart ) );
+    OSL_ENSURE( !m_pTextPos, "who set the pointer?" );
+    m_pTextPos.reset( new WW8_WrPlc0( nCpStart ) );
 
     WriteFootnoteEndText( rWrt, nCpStart );
     CheckForFacinPg( rWrt );
@@ -1995,16 +1995,16 @@ bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
     }
     rWrt.SetHdFtIndex( nOldIndex ); //0
 
-    if ( pTextPos->Count() )
+    if ( m_pTextPos->Count() )
     {
         // HdFt available?
         sal_uLong nCpEnd = rWrt.Fc2Cp( rWrt.Strm().Tell() );
-        pTextPos->Append( nCpEnd );  // End of last Header/Footer for PlcfHdd
+        m_pTextPos->Append( nCpEnd );  // End of last Header/Footer for PlcfHdd
 
         if ( nCpEnd > nCpStart )
         {
             ++nCpEnd;
-            pTextPos->Append( nCpEnd + 1 );  // End of last Header/Footer for PlcfHdd
+            m_pTextPos->Append( nCpEnd + 1 );  // End of last Header/Footer for PlcfHdd
 
             rWrt.WriteStringAsPara( OUString() ); // CR to the end ( otherwise WW complains )
         }
@@ -2013,7 +2013,7 @@ bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
     }
     else
     {
-        pTextPos.reset();
+        m_pTextPos.reset();
     }
 
     return rWrt.m_pFib->m_ccpHdr != 0;
@@ -2039,12 +2039,12 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
 {
     OSL_ENSURE(m_SectionAttributes.size() == static_cast<size_t>(m_aSects.size())
         , "WritePlcSed(): arrays out of sync!");
-    OSL_ENSURE( aCps.size() == m_aSects.size() + 1, "WrPlcSepx: DeSync" );
+    OSL_ENSURE( m_aCps.size() == m_aSects.size() + 1, "WrPlcSepx: DeSync" );
     sal_uInt64 nFcStart = rWrt.m_pTableStrm->Tell();
 
     for( decltype(m_aSects)::size_type i = 0; i <= m_aSects.size(); i++ )
     {
-        sal_uInt32 nP = aCps[i];
+        sal_uInt32 nP = m_aCps[i];
         rWrt.m_pTableStrm->WriteUInt32(nP);
     }
 
@@ -2063,10 +2063,10 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
 void WW8_WrPlcSepx::WritePlcHdd( WW8Export& rWrt ) const
 {
     // Don't write out the PlcfHdd if ccpHdd is 0: it's a validation failure case.
-    if( rWrt.m_pFib->m_ccpHdr != 0 && pTextPos && pTextPos->Count() )
+    if( rWrt.m_pFib->m_ccpHdr != 0 && m_pTextPos && m_pTextPos->Count() )
     {
         rWrt.m_pFib->m_fcPlcfhdd = rWrt.m_pTableStrm->Tell();
-        pTextPos->Write( *rWrt.m_pTableStrm );             // Plc0
+        m_pTextPos->Write( *rWrt.m_pTableStrm );             // Plc0
         rWrt.m_pFib->m_lcbPlcfhdd = rWrt.m_pTableStrm->Tell() -
                                 rWrt.m_pFib->m_fcPlcfhdd;
     }
@@ -2133,8 +2133,8 @@ WW8_WrPlcSubDoc::~WW8_WrPlcSubDoc()
 
 void WW8_WrPlcFootnoteEdn::Append( WW8_CP nCp, const SwFormatFootnote& rFootnote )
 {
-    aCps.push_back( nCp );
-    aContent.push_back( &rFootnote );
+    m_aCps.push_back( nCp );
+    m_aContent.push_back( &rFootnote );
 }
 
 WW8_Annotation::WW8_Annotation(const SwPostItField* pPostIt, WW8_CP nRangeStart, WW8_CP nRangeEnd)
@@ -2180,7 +2180,7 @@ void WW8_WrPlcAnnotations::AddRangeStartPosition(const OUString& rName, WW8_CP n
 
 void WW8_WrPlcAnnotations::Append( WW8_CP nCp, const SwPostItField *pPostIt )
 {
-    aCps.push_back( nCp );
+    m_aCps.push_back( nCp );
     WW8_Annotation* p;
     if( m_aRangeStartPositions.find(pPostIt->GetName()) != m_aRangeStartPositions.end() )
     {
@@ -2193,15 +2193,15 @@ void WW8_WrPlcAnnotations::Append( WW8_CP nCp, const SwPostItField *pPostIt )
     {
         p = new WW8_Annotation(pPostIt, nCp, nCp);
     }
-    aContent.push_back( p );
+    m_aContent.push_back( p );
 }
 
 void WW8_WrPlcAnnotations::Append( WW8_CP nCp, const SwRedlineData *pRedline )
 {
     maProcessedRedlines.insert(pRedline);
-    aCps.push_back( nCp );
+    m_aCps.push_back( nCp );
     WW8_Annotation* p = new WW8_Annotation(pRedline);
-    aContent.push_back( p );
+    m_aContent.push_back( p );
 }
 
 bool WW8_WrPlcAnnotations::IsNewRedlineComment( const SwRedlineData *pRedline )
@@ -2211,19 +2211,19 @@ bool WW8_WrPlcAnnotations::IsNewRedlineComment( const SwRedlineData *pRedline )
 
 WW8_WrPlcAnnotations::~WW8_WrPlcAnnotations()
 {
-    for(const void * p : aContent)
+    for(const void * p : m_aContent)
         delete static_cast<WW8_Annotation const *>(p);
 }
 
 bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
     WW8_CP& rCount )
 {
-    sal_uInt16 nLen = aContent.size();
+    sal_uInt16 nLen = m_aContent.size();
     if ( !nLen )
         return false;
 
     sal_uLong nCpStart = rWrt.Fc2Cp( rWrt.Strm().Tell() );
-    pTextPos.reset( new WW8_WrPlc0( nCpStart ) );
+    m_pTextPos.reset( new WW8_WrPlc0( nCpStart ) );
     sal_uInt16 i;
 
     switch ( nTTyp )
@@ -2232,10 +2232,10 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
             for ( i = 0; i < nLen; i++ )
             {
                 // beginning for PlcfAtnText
-                pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
+                m_pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
 
                 rWrt.WritePostItBegin();
-                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
+                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(m_aContent[i]);
                 if (rAtn.mpRichText)
                     rWrt.WriteOutliner(*rAtn.mpRichText, nTTyp);
                 else
@@ -2252,13 +2252,13 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
             {
                 // textbox content
                 WW8_CP nCP = rWrt.Fc2Cp( rWrt.Strm().Tell() );
-                aCps.insert( aCps.begin()+i, nCP );
-                pTextPos->Append( nCP );
+                m_aCps.insert( m_aCps.begin()+i, nCP );
+                m_pTextPos->Append( nCP );
 
-                if( aContent[ i ] != nullptr )
+                if( m_aContent[ i ] != nullptr )
                 {
                     // is it a writer or sdr - textbox?
-                    const SdrObject& rObj = *static_cast<SdrObject const *>(aContent[ i ]);
+                    const SdrObject& rObj = *static_cast<SdrObject const *>(m_aContent[ i ]);
                     if (rObj.GetObjInventor() == SdrInventor::FmForm)
                     {
                         sal_uInt8 nOldTyp = rWrt.m_nTextTyp;
@@ -2304,9 +2304,9 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
                         }
                     }
                 }
-                else if (i < aSpareFormats.size() && aSpareFormats[i])
+                else if (i < m_aSpareFormats.size() && m_aSpareFormats[i])
                 {
-                    const SwFrameFormat& rFormat = *aSpareFormats[i];
+                    const SwFrameFormat& rFormat = *m_aSpareFormats[i];
                     const SwNodeIndex* pNdIdx = rFormat.GetContent().GetContentIdx();
                     rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1,
                                pNdIdx->GetNode().EndOfSectionIndex(), nTTyp );
@@ -2322,10 +2322,10 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
             for ( i = 0; i < nLen; i++ )
             {
                 // beginning for PlcfFootnoteText/PlcfEdnText
-                pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
+                m_pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
 
                 // Note content
-                const SwFormatFootnote* pFootnote = static_cast<SwFormatFootnote const *>(aContent[ i ]);
+                const SwFormatFootnote* pFootnote = static_cast<SwFormatFootnote const *>(m_aContent[ i ]);
                 rWrt.WriteFootnoteBegin( *pFootnote );
                 const SwNodeIndex* pIdx = pFootnote->GetTextFootnote()->GetStartNode();
                 OSL_ENSURE( pIdx, "Where is the start node of Foot-/Endnote?" );
@@ -2339,12 +2339,12 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp,
             OSL_ENSURE( false, "What kind of SubDocType is that?" );
     }
 
-    pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
+    m_pTextPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
     // CR to the end ( otherwise WW complains )
     rWrt.WriteStringAsPara( OUString() );
 
     WW8_CP nCpEnd = rWrt.Fc2Cp( rWrt.Strm().Tell() );
-    pTextPos->Append( nCpEnd );
+    m_pTextPos->Append( nCpEnd );
     rCount = nCpEnd - nCpStart;
 
     return ( rCount != 0 );
@@ -2365,11 +2365,11 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
 {
 
     sal_uInt64 nFcStart = rWrt.m_pTableStrm->Tell();
-    sal_uInt16 nLen = aCps.size();
+    sal_uInt16 nLen = m_aCps.size();
     if ( !nLen )
         return;
 
-    OSL_ENSURE( aCps.size() + 2 == pTextPos->Count(), "WritePlc: DeSync" );
+    OSL_ENSURE( m_aCps.size() + 2 == m_pTextPos->Count(), "WritePlc: DeSync" );
 
     std::vector<std::pair<OUString,OUString> > aStrArr;
     WW8Fib& rFib = *rWrt.m_pFib;              // n+1-th CP-Pos according to the manual
@@ -2388,7 +2388,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                 int nIdx = 0;
                 for ( sal_uInt16 i = 0; i < nLen; ++i )
                 {
-                    const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
+                    const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(m_aContent[i]);
                     aStrArr.emplace_back(rAtn.msOwner,rAtn.m_sInitials);
                     // record start and end positions for ranges
                     if (rAtn.HasRange())
@@ -2484,7 +2484,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                 // Write the extended >= Word XP ATRD records
                 for( sal_uInt16 i = 0; i < nLen; ++i )
                 {
-                    const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
+                    const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(m_aContent[i]);
 
                     sal_uInt32 nDTTM = sw::ms::DateTime2DTTM(rAtn.maDateTime);
 
@@ -2505,7 +2505,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
         case TXT_TXTBOX:
         case TXT_HFTXTBOX:
             {
-                pTextPos->Write( *rWrt.m_pTableStrm );
+                m_pTextPos->Write( *rWrt.m_pTableStrm );
                 const std::vector<sal_uInt32>* pShapeIds = GetShapeIdArr();
                 OSL_ENSURE( pShapeIds, "Where are the ShapeIds?" );
 
@@ -2513,7 +2513,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                 {
                     // write textbox story - FTXBXS
                     // is it a writer or sdr - textbox?
-                    const SdrObject* pObj = static_cast<SdrObject const *>(aContent[ i ]);
+                    const SdrObject* pObj = static_cast<SdrObject const *>(m_aContent[ i ]);
                     sal_Int32 nCnt = 1;
                     if (dynamic_cast< const SdrTextObj *>( pObj ))
                     {
@@ -2531,9 +2531,9 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
                     }
                     if( nullptr == pObj )
                     {
-                        if (i < aSpareFormats.size() && aSpareFormats[i])
+                        if (i < m_aSpareFormats.size() && m_aSpareFormats[i])
                         {
-                            const SwFrameFormat& rFormat = *aSpareFormats[i];
+                            const SwFrameFormat& rFormat = *m_aSpareFormats[i];
 
                             const SwFormatChain* pChn = &rFormat.GetChain();
                             while( pChn->GetNext() )
@@ -2569,7 +2569,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
     {
         // write CP Positions
         for ( sal_uInt16 i = 0; i < nLen; i++ )
-            SwWW8Writer::WriteLong( *rWrt.m_pTableStrm, aCps[ i ] );
+            SwWW8Writer::WriteLong( *rWrt.m_pTableStrm, m_aCps[ i ] );
 
         // n+1-th CP-Pos according to the manual
         SwWW8Writer::WriteLong( *rWrt.m_pTableStrm,
@@ -2581,7 +2581,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
             sal_uInt16 nlTag = 0;
             for ( sal_uInt16 i = 0; i < nLen; ++i )
             {
-                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
+                const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(m_aContent[i]);
 
                 //aStrArr is sorted
                 auto aIter = std::lower_bound(aStrArr.begin(),
@@ -2630,7 +2630,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
             sal_uInt16 nNo = 0;
             for ( sal_uInt16 i = 0; i < nLen; ++i )             // write Flags
             {
-                const SwFormatFootnote* pFootnote = static_cast<SwFormatFootnote const *>(aContent[ i ]);
+                const SwFormatFootnote* pFootnote = static_cast<SwFormatFootnote const *>(m_aContent[ i ]);
                 SwWW8Writer::WriteShort( *rWrt.m_pTableStrm,
                         !pFootnote->GetNumStr().isEmpty() ? 0 : ++nNo );
             }
@@ -2640,7 +2640,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
     nFcStart = rWrt.m_pTableStrm->Tell();
     rRefCount = nFcStart - rRefStart;
 
-    pTextPos->Write( *rWrt.m_pTableStrm );
+    m_pTextPos->Write( *rWrt.m_pTableStrm );
 
     switch ( nTTyp )
     {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 7cc40d97713c..132fb02bff50 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -959,11 +959,11 @@ sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos )
 }
 
 WW8_WrPlcPn::WW8_WrPlcPn(WW8Export& rWr, ePLCFT ePl, WW8_FC nStartFc)
-    : rWrt(rWr)
-    , nFkpStartPage(0)
-    , ePlc(ePl)
+    : m_rWrt(rWr)
+    , m_nFkpStartPage(0)
+    , m_ePlc(ePl)
 {
-    m_Fkps.push_back(std::make_unique<WW8_WrFkp>(ePlc, nStartFc));
+    m_Fkps.push_back(std::make_unique<WW8_WrFkp>(m_ePlc, nStartFc));
 }
 
 WW8_WrPlcPn::~WW8_WrPlcPn()
@@ -983,16 +983,16 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS
     // big sprm? build the sprmPHugePapx
     sal_uInt8* pNewSprms = const_cast<sal_uInt8*>(pSprms);
     sal_uInt8 aHugePapx[ 8 ];
-    if (PAP == ePlc && 488 <= nVarLen)
+    if (PAP == m_ePlc && 488 <= nVarLen)
     {
         sal_uInt8* p = aHugePapx;
         *p++ = *pSprms++;           // set style Id
         *p++ = *pSprms++;
         nVarLen -= 2;
 
-        sal_uInt64 nDataPos = rWrt.m_pDataStrm->Tell();
-        SwWW8Writer::WriteShort( *rWrt.m_pDataStrm, nVarLen );
-        rWrt.m_pDataStrm->WriteBytes(pSprms, nVarLen);
+        sal_uInt64 nDataPos = m_rWrt.m_pDataStrm->Tell();
+        SwWW8Writer::WriteShort( *m_rWrt.m_pDataStrm, nVarLen );
+        m_rWrt.m_pDataStrm->WriteBytes(pSprms, nVarLen);
 
         Set_UInt16( p, 0x6646 );    // set SprmCode
         Set_UInt32( p, nDataPos );  // set startpos (FC) in the datastream
@@ -1015,7 +1015,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS
     if( !bOk )
     {
         pF->Combine();
-        pF = new WW8_WrFkp(ePlc, pF->GetEndFc()); // Start new Fkp == end of old Fkp
+        pF = new WW8_WrFkp(m_ePlc, pF->GetEndFc()); // Start new Fkp == end of old Fkp
 
         m_Fkps.push_back(std::unique_ptr<WW8_WrFkp>(pF));
         if( !pF->Append( nEndFc, nVarLen, pNewSprms ) )
@@ -1029,54 +1029,54 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS
 
 void WW8_WrPlcPn::WriteFkps()
 {
-    nFkpStartPage = o3tl::narrowing<sal_uInt16>( SwWW8Writer::FillUntil( rWrt.Strm() ) >> 9 );
+    m_nFkpStartPage = o3tl::narrowing<sal_uInt16>( SwWW8Writer::FillUntil( m_rWrt.Strm() ) >> 9 );
 
     for(const std::unique_ptr<WW8_WrFkp> & rp : m_Fkps)
     {
-        rp->Write( rWrt.Strm(), *rWrt.m_pGrf );
+        rp->Write( m_rWrt.Strm(), *m_rWrt.m_pGrf );
     }
 
-    if( CHP == ePlc )
+    if( CHP == m_ePlc )
     {
-        rWrt.m_pFib->m_pnChpFirst = nFkpStartPage;
-        rWrt.m_pFib->m_cpnBteChp = m_Fkps.size();
+        m_rWrt.m_pFib->m_pnChpFirst = m_nFkpStartPage;
+        m_rWrt.m_pFib->m_cpnBteChp = m_Fkps.size();
     }
     else
     {
-        rWrt.m_pFib->m_pnPapFirst = nFkpStartPage;
-        rWrt.m_pFib->m_cpnBtePap = m_Fkps.size();
+        m_rWrt.m_pFib->m_pnPapFirst = m_nFkpStartPage;
+        m_rWrt.m_pFib->m_cpnBtePap = m_Fkps.size();
     }
 }
 
 void WW8_WrPlcPn::WritePlc()
 {
-    sal_uInt64 nFcStart = rWrt.m_pTableStrm->Tell();
+    sal_uInt64 nFcStart = m_rWrt.m_pTableStrm->Tell();
     decltype(m_Fkps)::size_type i;
 
     for (i = 0; i < m_Fkps.size(); ++i)
     {
-        SwWW8Writer::WriteLong( *rWrt.m_pTableStrm,
+        SwWW8Writer::WriteLong( *m_rWrt.m_pTableStrm,
                                 m_Fkps[ i ]->GetStartFc() );
     }
 
-    SwWW8Writer::WriteLong( *rWrt.m_pTableStrm,
+    SwWW8Writer::WriteLong( *m_rWrt.m_pTableStrm,
                                 m_Fkps[ i - 1 ]->GetEndFc() );
 
     // for every FKP output the page
     for (i = 0; i < m_Fkps.size(); ++i)
     {
-        SwWW8Writer::WriteLong( *rWrt.m_pTableStrm, i + nFkpStartPage );
+        SwWW8Writer::WriteLong( *m_rWrt.m_pTableStrm, i + m_nFkpStartPage );
     }
 
-    if( CHP == ePlc )
+    if( CHP == m_ePlc )
     {
-        rWrt.m_pFib->m_fcPlcfbteChpx = nFcStart;
-        rWrt.m_pFib->m_lcbPlcfbteChpx = rWrt.m_pTableStrm->Tell() - nFcStart;
+        m_rWrt.m_pFib->m_fcPlcfbteChpx = nFcStart;
+        m_rWrt.m_pFib->m_lcbPlcfbteChpx = m_rWrt.m_pTableStrm->Tell() - nFcStart;
     }
     else
     {
-        rWrt.m_pFib->m_fcPlcfbtePapx = nFcStart;
-        rWrt.m_pFib->m_lcbPlcfbtePapx = rWrt.m_pTableStrm->Tell() - nFcStart;
+        m_rWrt.m_pFib->m_fcPlcfbtePapx = nFcStart;
+        m_rWrt.m_pFib->m_lcbPlcfbtePapx = m_rWrt.m_pTableStrm->Tell() - nFcStart;
     }
 }
 
@@ -4024,15 +4024,15 @@ void WW8_WrPlcAnnotations::WritePlc( WW8Export& rWrt ) const
 
 void WW8_WrPlcTextBoxes::WritePlc( WW8Export& rWrt ) const
 {
-    if( TXT_TXTBOX == nTyp )
+    if( TXT_TXTBOX == m_nTyp )
     {
-        WriteGenericPlc( rWrt, nTyp, rWrt.m_pFib->m_fcPlcftxbxBkd,
+        WriteGenericPlc( rWrt, m_nTyp, rWrt.m_pFib->m_fcPlcftxbxBkd,
             rWrt.m_pFib->m_lcbPlcftxbxBkd, rWrt.m_pFib->m_fcPlcftxbxText,
             rWrt.m_pFib->m_lcbPlcftxbxText );
     }
     else
     {
-        WriteGenericPlc( rWrt, nTyp, rWrt.m_pFib->m_fcPlcfHdrtxbxBkd,
+        WriteGenericPlc( rWrt, m_nTyp, rWrt.m_pFib->m_fcPlcfHdrtxbxBkd,
             rWrt.m_pFib->m_lcbPlcfHdrtxbxBkd, rWrt.m_pFib->m_fcPlcfHdrtxbxText,
             rWrt.m_pFib->m_lcbPlcfHdrtxbxText );
     }
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index b798b99a6b75..8def69ca2fb4 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -241,11 +241,11 @@ public:
 
 class WW8_WrPlcSepx : public MSWordSections
 {
-    std::vector<WW8_CP> aCps;
+    std::vector<WW8_CP> m_aCps;
     std::vector< std::shared_ptr<WW8_PdAttrDesc> > m_SectionAttributes;
     // hack to prevent adding sections in endnotes
     bool m_bHeaderFooterWritten;
-    std::unique_ptr<WW8_WrPlc0> pTextPos;        // Position of the headers/footers
+    std::unique_ptr<WW8_WrPlc0> m_pTextPos;        // Position of the headers/footers
 
     WW8_WrPlcSepx( const WW8_WrPlcSepx& ) = delete;
     WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) = delete;
@@ -264,7 +264,7 @@ public:
                     const SwNode& rNd,
                     const SwSectionFormat* pSectionFormat,
                     sal_uLong nLnNumRestartNo );
-    void Finish( WW8_CP nEndCp ) { aCps.push_back( nEndCp ); }
+    void Finish( WW8_CP nEndCp ) { m_aCps.push_back( nEndCp ); }
 
     bool WriteKFText( WW8Export& rWrt );
     void WriteSepx( SvStream& rStrm ) const;
@@ -1220,10 +1220,10 @@ private:
     WW8_WrPlcSubDoc(const WW8_WrPlcSubDoc&) = delete;
     WW8_WrPlcSubDoc& operator=(const WW8_WrPlcSubDoc&) = delete;
 protected:
-    std::vector<WW8_CP> aCps;
-    std::vector<const void*> aContent;                // PTRARR of SwFormatFootnote/PostIts/..
-    std::vector<const SwFrameFormat*> aSpareFormats;  // a backup for aContent: if there's no SdrObject, stores the fmt directly here
-    std::unique_ptr<WW8_WrPlc0> pTextPos;             // positions of the individual texts
+    std::vector<WW8_CP> m_aCps;
+    std::vector<const void*> m_aContent;                // PTRARR of SwFormatFootnote/PostIts/..
+    std::vector<const SwFrameFormat*> m_aSpareFormats;  // a backup for aContent: if there's no SdrObject, stores the fmt directly here
+    std::unique_ptr<WW8_WrPlc0> m_pTextPos;             // positions of the individual texts
 
     WW8_WrPlcSubDoc();
     virtual ~WW8_WrPlcSubDoc();
@@ -1290,36 +1290,36 @@ public:
 class WW8_WrPlcTextBoxes : public WW8_WrPlcSubDoc // double Plc for Textboxes
 {                        // Frame/DrawTextboxes!
 private:
-    sal_uInt8 nTyp;
-    std::vector<sal_uInt32> aShapeIds;        // VARARR of ShapeIds for the SwFrameFormats
+    sal_uInt8 m_nTyp;
+    std::vector<sal_uInt32> m_aShapeIds;        // VARARR of ShapeIds for the SwFrameFormats
     virtual const std::vector<sal_uInt32>* GetShapeIdArr() const override;
 
     WW8_WrPlcTextBoxes(const WW8_WrPlcTextBoxes&) = delete;
     WW8_WrPlcTextBoxes& operator=(WW8_WrPlcTextBoxes const &) = delete;
 public:
-    explicit WW8_WrPlcTextBoxes( sal_uInt8 nTTyp ) : nTyp( nTTyp ) {}
+    explicit WW8_WrPlcTextBoxes( sal_uInt8 nTTyp ) : m_nTyp( nTTyp ) {}
 
     bool WriteText( WW8Export& rWrt );
     void WritePlc( WW8Export& rWrt ) const;
     void Append( const SdrObject& rObj, sal_uInt32 nShapeId );
     void Append( const SwFrameFormat* pFormat, sal_uInt32 nShapeId );
-    sal_uInt16 Count() const { return aContent.size(); }
+    sal_uInt16 Count() const { return m_aContent.size(); }
     sal_uInt16 GetPos( const void* p ) const
     {
         std::vector<const void*>::const_iterator it
-            = std::find( aContent.begin(), aContent.end(), p );
-        return it == aContent.end() ? USHRT_MAX : it - aContent.begin();
+            = std::find( m_aContent.begin(), m_aContent.end(), p );
+        return it == m_aContent.end() ? USHRT_MAX : it - m_aContent.begin();
     }
 };
 
 class WW8_WrPlcPn                   // Plc for Page Numbers
 {
 private:
-    WW8Export& rWrt;
+    WW8Export& m_rWrt;
     // Plc for Chpx and Papx ( incl PN-Plc )
     std::vector<std::unique_ptr<WW8_WrFkp>> m_Fkps;
-    sal_uInt16 nFkpStartPage;
-    ePLCFT ePlc;
+    sal_uInt16 m_nFkpStartPage;
+    ePLCFT m_ePlc;
 
     WW8_WrPlcPn(const WW8_WrPlcPn&) = delete;
     WW8_WrPlcPn& operator=(const WW8_WrPlcPn&) = delete;