sw: prefix members of WW8RStyle

Change-Id: Ibc64cdc44d170af11479db47c309faac5665daec
Reviewed-on: https://gerrit.libreoffice.org/53927
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

4 files changed, 147 insertions, 147 deletions

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index cb68c03c438d..af15642868bc 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -713,8 +713,8 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8
 
 SwNumRule* SwWW8ImplReader::GetStyRule()
 {
-    if( m_xStyles->pStyRule )         // Bullet-Style already present
-        return m_xStyles->pStyRule;
+    if( m_xStyles->mpStyRule )         // Bullet-Style already present
+        return m_xStyles->mpStyRule;
 
     const OUString aBaseName("WW8StyleNum");
     const OUString aName( m_rDoc.GetUniqueNumRuleName( &aBaseName, false) );
@@ -722,11 +722,11 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
     // #i86652#
     sal_uInt16 nRul = m_rDoc.MakeNumRule( aName, nullptr, false,
                                     SvxNumberFormat::LABEL_ALIGNMENT );
-    m_xStyles->pStyRule = m_rDoc.GetNumRuleTable()[nRul];
+    m_xStyles->mpStyRule = m_rDoc.GetNumRuleTable()[nRul];
     // Auto == false-> Nummerierungsvorlage
-    m_xStyles->pStyRule->SetAutoRule(false);
+    m_xStyles->mpStyRule->SetAutoRule(false);
 
-    return m_xStyles->pStyRule;
+    return m_xStyles->mpStyRule;
 }
 
 // Sprm 13
@@ -761,7 +761,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short
             else if( *pData == 10 || *pData == 11 )
             {
                 // remember type, the rest happens at Sprm 12
-                m_xStyles->nWwNumLevel = *pData;
+                m_xStyles->mnWwNumLevel = *pData;
             }
         }
     }
@@ -808,7 +808,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
 
         // Missing Levels need not be replenished
         m_rDoc.SetOutlineNumRule( aNR );
-    }else if( m_xStyles->nWwNumLevel == 10 || m_xStyles->nWwNumLevel == 11 ){
+    }else if( m_xStyles->mnWwNumLevel == 10 || m_xStyles->mnWwNumLevel == 11 ){
         SwNumRule* pNR = GetStyRule();
         SetAnld(pNR, reinterpret_cast<WW8_ANLD const *>(pData), 0, false);
         m_pCurrentColl->SetFormatAttr( SwNumRuleItem( pNR->GetName() ) );
@@ -3582,10 +3582,10 @@ const SwFormat* SwWW8ImplReader::GetStyleWithOrgWWName( OUString const & rName )
 
 SprmResult WW8RStyle::HasParaSprm(sal_uInt16 nId) const
 {
-    if( !pParaSprms || !nSprmsLen )
+    if( !mpParaSprms || !mnSprmsLen )
         return SprmResult();
 
-    return maSprmParser.findSprmData(nId, pParaSprms, nSprmsLen);
+    return maSprmParser.findSprmData(nId, mpParaSprms, mnSprmsLen);
 }
 
 void WW8RStyle::ImportSprms(sal_uInt8 *pSprms, short nLen, bool bPap)
@@ -3595,8 +3595,8 @@ void WW8RStyle::ImportSprms(sal_uInt8 *pSprms, short nLen, bool bPap)
 
     if( bPap )
     {
-        pParaSprms = pSprms;   // for HasParaSprms()
-        nSprmsLen = nLen;
+        mpParaSprms = pSprms;   // for HasParaSprms()
+        mnSprmsLen = nLen;
     }
 
     WW8SprmIter aSprmIter(pSprms, nLen, maSprmParser);
@@ -3605,12 +3605,12 @@ void WW8RStyle::ImportSprms(sal_uInt8 *pSprms, short nLen, bool bPap)
 #ifdef DEBUGSPRMREADER
         fprintf(stderr, "id is %x\n", aIter.GetCurrentId());
 #endif
-        pIo->ImportSprm(pSprm, aSprmIter.GetRemLen(), aSprmIter.GetCurrentId());
+        mpIo->ImportSprm(pSprm, aSprmIter.GetRemLen(), aSprmIter.GetCurrentId());
         aSprmIter.advance();
     }
 
-    pParaSprms = nullptr;
-    nSprmsLen = 0;
+    mpParaSprms = nullptr;
+    mnSprmsLen = 0;
 }
 
 void WW8RStyle::ImportSprms(std::size_t nPosFc, short nLen, bool bPap)
@@ -3618,10 +3618,10 @@ void WW8RStyle::ImportSprms(std::size_t nPosFc, short nLen, bool bPap)
     if (!nLen)
         return;
 
-    if (checkSeek(*pStStrm, nPosFc))
+    if (checkSeek(*mpStStrm, nPosFc))
     {
         std::unique_ptr<sal_uInt8[]> pSprms( new sal_uInt8[nLen] );
-        nLen = pStStrm->ReadBytes(pSprms.get(), nLen);
+        nLen = mpStStrm->ReadBytes(pSprms.get(), nLen);
         ImportSprms(pSprms.get(), nLen, bPap);
     }
 }
@@ -3651,12 +3651,12 @@ short WW8RStyle::ImportUPX(short nLen, bool bPAP, bool bOdd)
     if( 0 < nLen ) // Empty ?
     {
         if (bOdd)
-            nLen = nLen - WW8SkipEven( pStStrm );
+            nLen = nLen - WW8SkipEven( mpStStrm );
         else
-            nLen = nLen - WW8SkipOdd( pStStrm );
+            nLen = nLen - WW8SkipOdd( mpStStrm );
 
         sal_Int16 cbUPX(0);
-        pStStrm->ReadInt16( cbUPX );
+        mpStStrm->ReadInt16( cbUPX );
 
         nLen-=2;
 
@@ -3668,7 +3668,7 @@ short WW8RStyle::ImportUPX(short nLen, bool bPAP, bool bOdd)
             if( bPAP )
             {
                 sal_uInt16 id;
-                pStStrm->ReadUInt16( id );
+                mpStStrm->ReadUInt16( id );
 
                 cbUPX-=  2;
                 nLen-=  2;
@@ -3676,12 +3676,12 @@ short WW8RStyle::ImportUPX(short nLen, bool bPAP, bool bOdd)
 
             if( 0 < cbUPX )
             {
-                sal_uInt64 const nPos = pStStrm->Tell(); // if something is interpreted wrong,
+                sal_uInt64 const nPos = mpStStrm->Tell(); // if something is interpreted wrong,
                                                  // this should make it work again
                 ImportSprms( nPos, cbUPX, bPAP );
 
-                if ( pStStrm->Tell() != nPos + cbUPX )
-                    pStStrm->Seek( nPos+cbUPX );
+                if ( mpStStrm->Tell() != nPos + cbUPX )
+                    mpStStrm->Seek( nPos+cbUPX );
 
                 nLen = nLen - cbUPX;
             }
@@ -3695,9 +3695,9 @@ void WW8RStyle::ImportGrupx(short nLen, bool bPara, bool bOdd)
     if( nLen <= 0 )
         return;
     if (bOdd)
-        nLen = nLen - WW8SkipEven( pStStrm );
+        nLen = nLen - WW8SkipEven( mpStStrm );
     else
-        nLen = nLen - WW8SkipOdd( pStStrm );
+        nLen = nLen - WW8SkipOdd( mpStStrm );
 
     if( bPara ) // Grupx.Papx
         nLen = ImportUPX(nLen, true, bOdd);
@@ -3707,63 +3707,63 @@ void WW8RStyle::ImportGrupx(short nLen, bool bPara, bool bOdd)
 WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI)
     : WW8Style(*pI->m_pTableStream, _rFib)
     , maSprmParser(_rFib)
-    , pIo(pI)
-    , pStStrm(pI->m_pTableStream)
-    , pStyRule(nullptr)
-    , pParaSprms(nullptr)
-    , nSprmsLen(0)
-    , nWwNumLevel(0)
-    , bTextColChanged(false)
-    , bFontChanged(false)
-    , bCJKFontChanged(false)
-    , bCTLFontChanged(false)
-    , bFSizeChanged(false)
-    , bFCTLSizeChanged(false)
-    , bWidowsChanged(false)
+    , mpIo(pI)
+    , mpStStrm(pI->m_pTableStream)
+    , mpStyRule(nullptr)
+    , mpParaSprms(nullptr)
+    , mnSprmsLen(0)
+    , mnWwNumLevel(0)
+    , mbTextColChanged(false)
+    , mbFontChanged(false)
+    , mbCJKFontChanged(false)
+    , mbCTLFontChanged(false)
+    , mbFSizeChanged(false)
+    , mbFCTLSizeChanged(false)
+    , mbWidowsChanged(false)
 {
-    pIo->m_vColl.resize(cstd);
+    mpIo->m_vColl.resize(cstd);
 }
 
 void WW8RStyle::Set1StyleDefaults()
 {
     // see #i25247#, #i25561#, #i48064#, #i92341# for default font
-    if (!bCJKFontChanged)   // Style no CJK Font? set the default
-        pIo->SetNewFontAttr(ftcFE, true, RES_CHRATR_CJK_FONT);
+    if (!mbCJKFontChanged)   // Style no CJK Font? set the default
+        mpIo->SetNewFontAttr(ftcFE, true, RES_CHRATR_CJK_FONT);
 
-    if (!bCTLFontChanged)   // Style no CTL Font? set the default
-        pIo->SetNewFontAttr(ftcBi, true, RES_CHRATR_CTL_FONT);
+    if (!mbCTLFontChanged)   // Style no CTL Font? set the default
+        mpIo->SetNewFontAttr(ftcBi, true, RES_CHRATR_CTL_FONT);
 
     // western 2nd to make western charset conversion the default
-    if (!bFontChanged)      // Style has no Font? set the default,
-        pIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT);
+    if (!mbFontChanged)      // Style has no Font? set the default,
+        mpIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT);
 
-    if( !pIo->m_bNoAttrImport )
+    if( !mpIo->m_bNoAttrImport )
     {
         // Style has no text color set, winword default is auto
-        if ( !bTextColChanged )
-            pIo->m_pCurrentColl->SetFormatAttr(SvxColorItem(COL_AUTO, RES_CHRATR_COLOR));
+        if ( !mbTextColChanged )
+            mpIo->m_pCurrentColl->SetFormatAttr(SvxColorItem(COL_AUTO, RES_CHRATR_COLOR));
 
         // Style has no FontSize ? WinWord Default is 10pt for western and asian
-        if( !bFSizeChanged )
+        if( !mbFSizeChanged )
         {
             SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
-            pIo->m_pCurrentColl->SetFormatAttr(aAttr);
+            mpIo->m_pCurrentColl->SetFormatAttr(aAttr);
             aAttr.SetWhich(RES_CHRATR_CJK_FONTSIZE);
-            pIo->m_pCurrentColl->SetFormatAttr(aAttr);
+            mpIo->m_pCurrentColl->SetFormatAttr(aAttr);
         }
 
         // Style has no FontSize ? WinWord Default is 10pt for western and asian
-        if( !bFCTLSizeChanged )
+        if( !mbFCTLSizeChanged )
         {
             SvxFontHeightItem aAttr(200, 100, RES_CHRATR_FONTSIZE);
             aAttr.SetWhich(RES_CHRATR_CTL_FONTSIZE);
-            pIo->m_pCurrentColl->SetFormatAttr(aAttr);
+            mpIo->m_pCurrentColl->SetFormatAttr(aAttr);
         }
 
-        if( !bWidowsChanged )  // Widows ?
+        if( !mbWidowsChanged )  // Widows ?
         {
-            pIo->m_pCurrentColl->SetFormatAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
-            pIo->m_pCurrentColl->SetFormatAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
+            mpIo->m_pCurrentColl->SetFormatAttr( SvxWidowsItem( 2, RES_PARATR_WIDOWS ) );
+            mpIo->m_pCurrentColl->SetFormatAttr( SvxOrphansItem( 2, RES_PARATR_ORPHANS ) );
         }
     }
 }
@@ -3777,7 +3777,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
     {
         // Para-Style
         sw::util::ParaStyleMapper::StyleResult aResult =
-            pIo->m_aParaStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
+            mpIo->m_aParaStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
         pColl = aResult.first;
         bStyExist = aResult.second;
     }
@@ -3785,22 +3785,22 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
     {
         // Char-Style
         sw::util::CharStyleMapper::StyleResult aResult =
-            pIo->m_aCharStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
+            mpIo->m_aCharStyleMapper.GetStyle(rSI.GetOrgWWName(), eSti);
         pColl = aResult.first;
         bStyExist = aResult.second;
     }
 
-    bool bImport = !bStyExist || pIo->m_bNewDoc; // import content ?
+    bool bImport = !bStyExist || mpIo->m_bNewDoc; // import content ?
 
     // Do not override character styles the list import code created earlier.
     if (bImport && bStyExist && rSI.GetOrgWWName().startsWith("WW8Num"))
         bImport = false;
 
-    bool bOldNoImp = pIo->m_bNoAttrImport;
+    bool bOldNoImp = mpIo->m_bNoAttrImport;
     rSI.m_bImportSkipped = !bImport;
 
     if( !bImport )
-        pIo->m_bNoAttrImport = true;
+        mpIo->m_bNoAttrImport = true;
     else
     {
         if (bStyExist)
@@ -3809,7 +3809,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
         }
         pColl->SetAuto(false);          // suggested by JP
     }                                   // but changes the UI
-    pIo->m_pCurrentColl = pColl;
+    mpIo->m_pCurrentColl = pColl;
     rSI.m_pFormat = pColl;                  // remember translation WW->SW
     rSI.m_bImportSkipped = !bImport;
 
@@ -3817,7 +3817,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
     sal_uInt16 j = rSI.m_nBase;
     if (j != nThisStyle && j < cstd )
     {
-        SwWW8StyInf* pj = &pIo->m_vColl[j];
+        SwWW8StyInf* pj = &mpIo->m_vColl[j];
         if (rSI.m_pFormat && pj->m_pFormat && rSI.m_bColl == pj->m_bColl)
         {
             rSI.m_pFormat->SetDerivedFrom( pj->m_pFormat );  // ok, set Based on
@@ -3834,19 +3834,19 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
             rSI.m_bParaAutoAfter = pj->m_bParaAutoAfter;
 
             if (pj->m_xWWFly)
-                rSI.m_xWWFly.reset(new WW8FlyPara(pIo->m_bVer67, pj->m_xWWFly.get()));
+                rSI.m_xWWFly.reset(new WW8FlyPara(mpIo->m_bVer67, pj->m_xWWFly.get()));
         }
     }
-    else if( pIo->m_bNewDoc && bStyExist )
+    else if( mpIo->m_bNewDoc && bStyExist )
         rSI.m_pFormat->SetDerivedFrom();
 
     rSI.m_nFollow = nNextStyle;       // remember Follow
 
-    pStyRule = nullptr;                   // recreate if necessary
-    bTextColChanged = bFontChanged = bCJKFontChanged = bCTLFontChanged =
-        bFSizeChanged = bFCTLSizeChanged = bWidowsChanged = false;
-    pIo->SetNCurrentColl( nThisStyle );
-    pIo->m_bStyNormal = nThisStyle == 0;
+    mpStyRule = nullptr;                   // recreate if necessary
+    mbTextColChanged = mbFontChanged = mbCJKFontChanged = mbCTLFontChanged =
+        mbFSizeChanged = mbFCTLSizeChanged = mbWidowsChanged = false;
+    mpIo->SetNCurrentColl( nThisStyle );
+    mpIo->m_bStyNormal = nThisStyle == 0;
     return bOldNoImp;
 }
 
@@ -3854,32 +3854,32 @@ void WW8RStyle::PostStyle(SwWW8StyInf const &rSI, bool bOldNoImp)
 {
     // Reset attribute flags, because there are no style-ends.
 
-    pIo->m_bHasBorder = pIo->m_bSpec = pIo->m_bObj = pIo->m_bSymbol = false;
-    pIo->m_nCharFormat = -1;
+    mpIo->m_bHasBorder = mpIo->m_bSpec = mpIo->m_bObj = mpIo->m_bSymbol = false;
+    mpIo->m_nCharFormat = -1;
 
     // if style is based on nothing or base ignored
-    if ((rSI.m_nBase >= cstd || pIo->m_vColl[rSI.m_nBase].m_bImportSkipped) && rSI.m_bColl)
+    if ((rSI.m_nBase >= cstd || mpIo->m_vColl[rSI.m_nBase].m_bImportSkipped) && rSI.m_bColl)
     {
         // If Char-Styles does not work
         // -> set hard WW-Defaults
         Set1StyleDefaults();
     }
 
-    pStyRule = nullptr;                   // to be on the safe side
-    pIo->m_bStyNormal = false;
-    pIo->SetNCurrentColl( 0 );
-    pIo->m_bNoAttrImport = bOldNoImp;
+    mpStyRule = nullptr;                   // to be on the safe side
+    mpIo->m_bStyNormal = false;
+    mpIo->SetNCurrentColl( 0 );
+    mpIo->m_bNoAttrImport = bOldNoImp;
     // reset the list-remember-fields, if used when reading styles
-    pIo->m_nLFOPosition = USHRT_MAX;
-    pIo->m_nListLevel = WW8ListManager::nMaxLevel;
+    mpIo->m_nLFOPosition = USHRT_MAX;
+    mpIo->m_nListLevel = WW8ListManager::nMaxLevel;
 }
 
 void WW8RStyle::Import1Style( sal_uInt16 nNr )
 {
-    if (nNr >= pIo->m_vColl.size())
+    if (nNr >= mpIo->m_vColl.size())
         return;
 
-    SwWW8StyInf &rSI = pIo->m_vColl[nNr];
+    SwWW8StyInf &rSI = mpIo->m_vColl[nNr];
 
     if( rSI.m_bImported || !rSI.m_bValid )
         return;
@@ -3888,10 +3888,10 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
 
     // valid and not NUL and not yet imported
 
-    if( rSI.m_nBase < cstd && !pIo->m_vColl[rSI.m_nBase].m_bImported )
+    if( rSI.m_nBase < cstd && !mpIo->m_vColl[rSI.m_nBase].m_bImported )
         Import1Style( rSI.m_nBase );
 
-    pStStrm->Seek( rSI.m_nFilePos );
+    mpStStrm->Seek( rSI.m_nFilePos );
 
     sal_uInt16 nSkip;
     OUString sName;
@@ -3905,15 +3905,15 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
 
     if ( !xStd || sName.isEmpty() || ((1 != xStd->sgc) && (2 != xStd->sgc)) )
     {
-        nSkip = std::min<sal_uInt64>(nSkip, pStStrm->remainingSize());
-        pStStrm->Seek(pStStrm->Tell() + nSkip);
+        nSkip = std::min<sal_uInt64>(nSkip, mpStStrm->remainingSize());
+        mpStStrm->Seek(mpStStrm->Tell() + nSkip);
         return;
     }
 
     bool bOldNoImp = PrepareStyle(rSI, static_cast<ww::sti>(xStd->sti), nNr, xStd->istdNext);
 
     // if something is interpreted wrong, this should make it work again
-    long nPos = pStStrm->Tell();
+    long nPos = mpStStrm->Tell();
 
     //Variable parts of the STD start at even byte offsets, but "inside
     //the STD", which I take to meaning even in relation to the starting
@@ -3926,24 +3926,24 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
 
     PostStyle(rSI, bOldNoImp);
 
-    pStStrm->Seek( nPos+nSkip );
+    mpStStrm->Seek( nPos+nSkip );
 }
 
 void WW8RStyle::RecursiveReg(sal_uInt16 nNr)
 {
-    if (nNr >= pIo->m_vColl.size())
+    if (nNr >= mpIo->m_vColl.size())
         return;
 
-    SwWW8StyInf &rSI = pIo->m_vColl[nNr];
+    SwWW8StyInf &rSI = mpIo->m_vColl[nNr];
     if( rSI.m_bImported || !rSI.m_bValid )
         return;
 
     rSI.m_bImported = true;
 
-    if( rSI.m_nBase < cstd && !pIo->m_vColl[rSI.m_nBase].m_bImported )
+    if( rSI.m_nBase < cstd && !mpIo->m_vColl[rSI.m_nBase].m_bImported )
         RecursiveReg(rSI.m_nBase);
 
-    pIo->RegisterNumFormatOnStyle(nNr);
+    mpIo->RegisterNumFormatOnStyle(nNr);
 
 }
 
@@ -3960,7 +3960,7 @@ void WW8RStyle::PostProcessStyles()
      formats and use it to mark handled ones
     */
     for (i=0; i < cstd; ++i)
-        pIo->m_vColl[i].m_bImported = false;
+        mpIo->m_vColl[i].m_bImported = false;
 
     /*
      Register the num formats and tabstop changes on the styles recursively.
@@ -3975,7 +3975,7 @@ void WW8RStyle::PostProcessStyles()
     */
     for (i=0; i < cstd; ++i)
     {
-        if (pIo->m_vColl[i].m_bValid)
+        if (mpIo->m_vColl[i].m_bValid)
         {
             RecursiveReg(i);
         }
@@ -3986,9 +3986,9 @@ void WW8RStyle::ScanStyles()        // investigate style dependencies
 {                                   // and detect Filepos for each Style
     for (sal_uInt16 i = 0; i < cstd; ++i)
     {
-        SwWW8StyInf &rSI = pIo->m_vColl[i];
+        SwWW8StyInf &rSI = mpIo->m_vColl[i];
 
-        rSI.m_nFilePos = pStStrm->Tell();        // remember FilePos
+        rSI.m_nFilePos = mpStStrm->Tell();        // remember FilePos
         sal_uInt16 nSkip;
         std::unique_ptr<WW8_STD> xStd(Read1Style(nSkip, nullptr));  // read STD
         rSI.m_bValid = xStd.get() != nullptr;
@@ -4001,8 +4001,8 @@ void WW8RStyle::ScanStyles()        // investigate style dependencies
             rSI = SwWW8StyInf();
 
         xStd.reset();
-        nSkip = std::min<sal_uInt64>(nSkip, pStStrm->remainingSize());
-        pStStrm->Seek(pStStrm->Tell() + nSkip);              // skip Names and Sprms
+        nSkip = std::min<sal_uInt64>(nSkip, mpStStrm->remainingSize());
+        mpStStrm->Seek(mpStStrm->Tell() + nSkip);              // skip Names and Sprms
     }
 }
 
@@ -4245,13 +4245,13 @@ void WW8RStyle::ImportOldFormatStyles()
 {
     for (sal_uInt16 i=0; i < cstd; ++i)
     {
-        pIo->m_vColl[i].m_bColl = true;
+        mpIo->m_vColl[i].m_bColl = true;
         //every chain must end eventually at the null style (style code 222)
-        pIo->m_vColl[i].m_nBase = 222;
+        mpIo->m_vColl[i].m_nBase = 222;
     }
 
     rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset(
-        pIo->m_xWwFib->m_chseTables, pIo->m_xWwFib->m_lid);
+        mpIo->m_xWwFib->m_chseTables, mpIo->m_xWwFib->m_lid);
 
     sal_uInt16 cstcStd(0);
     rSt.ReadUInt16( cstcStd );
@@ -4274,10 +4274,10 @@ void WW8RStyle::ImportOldFormatStyles()
         nByteCount++;
 
         sal_uInt8 stc = static_cast< sal_uInt8 >((stcp - cstcStd) & 255);
-        if (stc >=pIo->m_vColl.size())
+        if (stc >=mpIo->m_vColl.size())
             continue;
 
-        SwWW8StyInf &rSI = pIo->m_vColl[stc];
+        SwWW8StyInf &rSI = mpIo->m_vColl[stc];
         OUString sName;
 
         if (nCount != 0xFF)    // undefined style
@@ -4418,7 +4418,7 @@ void WW8RStyle::ImportOldFormatStyles()
         if (stc == stcBase)
             stcBase = 222;
 
-        SwWW8StyInf &rSI = pIo->m_vColl[stc];
+        SwWW8StyInf &rSI = mpIo->m_vColl[stc];
         rSI.m_nBase = stcBase;
 
         ww::sti eSti = ww::GetCanonicalStiFromStc(stc);
@@ -4432,7 +4432,7 @@ void WW8RStyle::ImportOldFormatStyles()
         rSI.m_bValid = true;
 
         if (ww::StandardStiIsCharStyle(eSti) && !aPAPXOffsets[stcp].mnSize)
-            pIo->m_vColl[stc].m_bColl = false;
+            mpIo->m_vColl[stc].m_bColl = false;
 
         bool bOldNoImp = PrepareStyle(rSI, eSti, stc, stcNext);
 
@@ -4453,20 +4453,20 @@ void WW8RStyle::ImportNewFormatStyles()
     ScanStyles();                       // Scan Based On
 
     for (sal_uInt16 i = 0; i < cstd; ++i) // import Styles
-        if (pIo->m_vColl[i].m_bValid)
+        if (mpIo->m_vColl[i].m_bValid)
             Import1Style( i );
 }
 
 void WW8RStyle::Import()
 {
-    pIo->m_pDfltTextFormatColl  = pIo->m_rDoc.GetDfltTextFormatColl();
-    pIo->m_pStandardFormatColl =
-        pIo->m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, false);
+    mpIo->m_pDfltTextFormatColl  = mpIo->m_rDoc.GetDfltTextFormatColl();
+    mpIo->m_pStandardFormatColl =
+        mpIo->m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD, false);
 
-    if( pIo->m_nIniFlags & WW8FL_NO_STYLES )
+    if( mpIo->m_nIniFlags & WW8FL_NO_STYLES )
         return;
 
-    if (pIo->m_xWwFib->GetFIBVersion() <= ww::eWW2)
+    if (mpIo->m_xWwFib->GetFIBVersion() <= ww::eWW2)
         ImportOldFormatStyles();
     else
         ImportNewFormatStyles();
@@ -4474,11 +4474,11 @@ void WW8RStyle::Import()
     for (sal_uInt16 i = 0; i < cstd; ++i)
     {
         // Follow chain
-        SwWW8StyInf* pi = &pIo->m_vColl[i];
+        SwWW8StyInf* pi = &mpIo->m_vColl[i];
         sal_uInt16 j = pi->m_nFollow;
         if( j < cstd )
         {
-            SwWW8StyInf* pj = &pIo->m_vColl[j];
+            SwWW8StyInf* pj = &mpIo->m_vColl[j];
             if ( j != i                             // rational Index ?
                  && pi->m_pFormat                        // Format ok ?
                  && pj->m_pFormat                        // Derived-Format ok ?
@@ -4499,17 +4499,17 @@ void WW8RStyle::Import()
 
     // for e.g. tables an always valid Std-Style is necessary
 
-    if( pIo->StyleExists(0) && !pIo->m_vColl.empty() &&
-        pIo->m_vColl[0].m_pFormat && pIo->m_vColl[0].m_bColl && pIo->m_vColl[0].m_bValid )
-        pIo->m_pDfltTextFormatColl = static_cast<SwTextFormatColl*>(pIo->m_vColl[0].m_pFormat);
+    if( mpIo->StyleExists(0) && !mpIo->m_vColl.empty() &&
+        mpIo->m_vColl[0].m_pFormat && mpIo->m_vColl[0].m_bColl && mpIo->m_vColl[0].m_bValid )
+        mpIo->m_pDfltTextFormatColl = static_cast<SwTextFormatColl*>(mpIo->m_vColl[0].m_pFormat);
     else
-        pIo->m_pDfltTextFormatColl = pIo->m_rDoc.GetDfltTextFormatColl();
+        mpIo->m_pDfltTextFormatColl = mpIo->m_rDoc.GetDfltTextFormatColl();
 
     // set Hyphenation flag on BASIC para-style
-    if (pIo->m_bNewDoc && pIo->m_pStandardFormatColl)
+    if (mpIo->m_bNewDoc && mpIo->m_pStandardFormatColl)
     {
-        if (pIo->m_xWDop->fAutoHyphen
-            && SfxItemState::SET != pIo->m_pStandardFormatColl->GetItemState(
+        if (mpIo->m_xWDop->fAutoHyphen
+            && SfxItemState::SET != mpIo->m_pStandardFormatColl->GetItemState(
                                             RES_PARATR_HYPHENZONE, false) )
         {
             SvxHyphenZoneItem aAttr(true, RES_PARATR_HYPHENZONE);
@@ -4517,7 +4517,7 @@ void WW8RStyle::Import()
             aAttr.GetMinTrail()   = 2;
             aAttr.GetMaxHyphens() = 0;
 
-            pIo->m_pStandardFormatColl->SetFormatAttr( aAttr );
+            mpIo->m_pStandardFormatColl->SetFormatAttr( aAttr );
         }
 
         /*
@@ -4525,16 +4525,16 @@ void WW8RStyle::Import()
         the page/sections rtl setting the standard style lack of rtl still
         means ltr
         */
-        if (SfxItemState::SET != pIo->m_pStandardFormatColl->GetItemState(RES_FRAMEDIR,
+        if (SfxItemState::SET != mpIo->m_pStandardFormatColl->GetItemState(RES_FRAMEDIR,
             false))
         {
-           pIo->m_pStandardFormatColl->SetFormatAttr(
+           mpIo->m_pStandardFormatColl->SetFormatAttr(
                 SvxFrameDirectionItem(SvxFrameDirection::Horizontal_LR_TB, RES_FRAMEDIR));
         }
     }
 
     // we do not read styles anymore:
-    pIo->m_pCurrentColl = nullptr;
+    mpIo->m_pCurrentColl = nullptr;
 }
 
 rtl_TextEncoding SwWW8StyInf::GetCharSet() const
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index de22c001a9da..a07224253022 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -91,23 +91,23 @@ class WW8RStyle: public WW8Style
 {
 friend class SwWW8ImplReader;
     wwSprmParser maSprmParser;
-    SwWW8ImplReader* pIo;   // parser class
-    SvStream* pStStrm;      // input file
+    SwWW8ImplReader* mpIo;   // parser class
+    SvStream* mpStStrm;      // input file
 
-    SwNumRule* pStyRule;    // bullets and enumerations in styles
+    SwNumRule* mpStyRule;    // bullets and enumerations in styles
 
-    sal_uInt8* pParaSprms;           // all ParaSprms of the UPX if UPX.Papx
-    sal_uInt16 nSprmsLen;           // its length
+    sal_uInt8* mpParaSprms;           // all ParaSprms of the UPX if UPX.Papx
+    sal_uInt16 mnSprmsLen;           // its length
 
-    sal_uInt8 nWwNumLevel;           // for bullets and enumerations in styles
+    sal_uInt8 mnWwNumLevel;           // for bullets and enumerations in styles
 
-    bool bTextColChanged;
-    bool bFontChanged;      // For Simulating Default-Font
-    bool bCJKFontChanged;   // For Simulating Default-CJK Font
-    bool bCTLFontChanged;   // For Simulating Default-CTL Font
-    bool bFSizeChanged;     // For Simulating Default-FontSize
-    bool bFCTLSizeChanged;  // For Simulating Default-CTL FontSize
-    bool bWidowsChanged;    // For Simulating Default-Widows / Orphans
+    bool mbTextColChanged;
+    bool mbFontChanged;      // For Simulating Default-Font
+    bool mbCJKFontChanged;   // For Simulating Default-CJK Font
+    bool mbCTLFontChanged;   // For Simulating Default-CTL Font
+    bool mbFSizeChanged;     // For Simulating Default-FontSize
+    bool mbFCTLSizeChanged;  // For Simulating Default-CTL FontSize
+    bool mbWidowsChanged;    // For Simulating Default-Widows / Orphans
 
     void ImportSprms(std::size_t nPosFc, short nLen, bool bPap);
     void ImportSprms(sal_uInt8 *pSprms, short nLen, bool bPap);
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 178188ee5853..542f6fed46dd 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1912,7 +1912,7 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
         // the current level is finished, what should we do ?
         m_nListLevel = WW8ListManager::nMaxLevel;
         if (m_xStyles && !m_bVer67)
-            m_xStyles->nWwNumLevel = 0;
+            m_xStyles->mnWwNumLevel = 0;
     }
     else
     {
@@ -1931,7 +1931,7 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const sal_uInt8* pData,
             to set the ww6 list level information which we will need when we
             reach the true ww6 list def.  So set it now
             */
-            m_xStyles->nWwNumLevel = m_nListLevel;
+            m_xStyles->mnWwNumLevel = m_nListLevel;
         }
 
         if (WW8ListManager::nMaxLevel <= m_nListLevel )
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 7431cd52e110..621a7060b4e7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3465,7 +3465,7 @@ void SwWW8ImplReader::Read_TextColor( sal_uInt16, const sal_uInt8* pData, short
 
         NewAttr( SvxColorItem(GetCol(b), RES_CHRATR_COLOR));
         if (m_pCurrentColl && m_xStyles)
-            m_xStyles->bTextColChanged = true;
+            m_xStyles->mbTextColChanged = true;
     }
 }
 
@@ -3478,7 +3478,7 @@ void SwWW8ImplReader::Read_TextForeColor(sal_uInt16, const sal_uInt8* pData, sho
         Color aColor(msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)));
         NewAttr(SvxColorItem(aColor, RES_CHRATR_COLOR));
         if (m_pCurrentColl && m_xStyles)
-            m_xStyles->bTextColChanged = true;
+            m_xStyles->mbTextColChanged = true;
     }
 }
 
@@ -3703,11 +3703,11 @@ void SwWW8ImplReader::openFont(sal_uInt16 nFCode, sal_uInt16 nId)
     {
         // remember for simulating default font
         if (RES_CHRATR_CJK_FONT == nId)
-            m_xStyles->bCJKFontChanged = true;
+            m_xStyles->mbCJKFontChanged = true;
         else if (RES_CHRATR_CTL_FONT == nId)
-            m_xStyles->bCTLFontChanged = true;
+            m_xStyles->mbCTLFontChanged = true;
         else
-            m_xStyles->bFontChanged = true;
+            m_xStyles->mbFontChanged = true;
     }
 }
 
@@ -3821,12 +3821,12 @@ void SwWW8ImplReader::Read_FontSize( sal_uInt16 nId, const sal_uInt8* pData, sho
         {
             // remember for simulating default font size
             if (nId == RES_CHRATR_CTL_FONTSIZE)
-                m_xStyles->bFCTLSizeChanged = true;
+                m_xStyles->mbFCTLSizeChanged = true;
             else
             {
-                m_xStyles->bFSizeChanged = true;
+                m_xStyles->mbFSizeChanged = true;
                 if (eVersion <= ww::eWW6)
-                    m_xStyles->bFCTLSizeChanged= true;
+                    m_xStyles->mbFCTLSizeChanged= true;
             }
         }
     }
@@ -4991,7 +4991,7 @@ void SwWW8ImplReader::Read_WidowControl( sal_uInt16, const sal_uInt8* pData, sho
         NewAttr( SvxOrphansItem( nL, RES_PARATR_ORPHANS ) );
 
         if( m_pCurrentColl && m_xStyles )           // Style-Def ?
-            m_xStyles->bWidowsChanged = true; // save for simulation
+            m_xStyles->mbWidowsChanged = true; // save for simulation
                                             // Default-Widows
     }
 }