sw: prefix members of StgWriter, SwAsciiOptions, SwReader and SwTextBlocks

See tdf#94879 for motivation.

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

2 files changed, 44 insertions, 44 deletions

diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index eb89e87ffea1..9ff97e447f9a 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -565,31 +565,31 @@ void SwAsciiOptions::ReadUserData( const OUString& rStr )
     sal_Int32 nToken = 0;
     OUString sToken = rStr.getToken(0, ',', nToken); // 1. Charset name
     if (!sToken.isEmpty())
-        eCharSet = CharSetFromName(sToken);
+        m_eCharSet = CharSetFromName(sToken);
     if (nToken >= 0 && !(sToken = rStr.getToken(0, ',', nToken)).isEmpty()) // 2. Line ending type
     {
         if (sToken.equalsIgnoreAsciiCase("CRLF"))
-            eCRLF_Flag = LINEEND_CRLF;
+            m_eCRLF_Flag = LINEEND_CRLF;
         else if (sToken.equalsIgnoreAsciiCase("LF"))
-            eCRLF_Flag = LINEEND_LF;
+            m_eCRLF_Flag = LINEEND_LF;
         else
-            eCRLF_Flag = LINEEND_CR;
+            m_eCRLF_Flag = LINEEND_CR;
     }
     if (nToken >= 0 && !(sToken = rStr.getToken(0, ',', nToken)).isEmpty()) // 3. Font name
-        sFont = sToken;
+        m_sFont = sToken;
     if (nToken >= 0 && !(sToken = rStr.getToken(0, ',', nToken)).isEmpty()) // 4. Language tag
-        nLanguage = LanguageTag::convertToLanguageTypeWithFallback(sToken);
+        m_nLanguage = LanguageTag::convertToLanguageTypeWithFallback(sToken);
     if (nToken >= 0 && !(sToken = rStr.getToken(0, ',', nToken)).isEmpty()) // 5. Include BOM?
-        bIncludeBOM = !(sToken.equalsIgnoreAsciiCase("FALSE"));
+        m_bIncludeBOM = !(sToken.equalsIgnoreAsciiCase("FALSE"));
 }
 
 void SwAsciiOptions::WriteUserData(OUString& rStr)
 {
     // 1. charset
-    rStr = NameFromCharSet(eCharSet) + ",";
+    rStr = NameFromCharSet(m_eCharSet) + ",";
 
     // 2. LineEnd
-    switch(eCRLF_Flag)
+    switch(m_eCRLF_Flag)
     {
     case LINEEND_CRLF:
         rStr += "CRLF";
@@ -604,17 +604,17 @@ void SwAsciiOptions::WriteUserData(OUString& rStr)
     rStr += ",";
 
     // 3. Fontname
-    rStr += sFont + ",";
+    rStr += m_sFont + ",";
 
     // 4. Language
-    if (nLanguage)
+    if (m_nLanguage)
     {
-        rStr += LanguageTag::convertToBcp47(nLanguage);
+        rStr += LanguageTag::convertToBcp47(m_nLanguage);
     }
     rStr += ",";
 
     // 5. Whether to include byte-order-mark
-    if( bIncludeBOM )
+    if( m_bIncludeBOM )
     {
         rStr += "true";
     }
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index d26214c43c44..25568a51ad32 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -75,14 +75,14 @@ ErrCode SwReader::Read( const Reader& rOptions )
 {
     // copy variables
     Reader* po = const_cast<Reader*>(&rOptions);
-    po->m_pStream = pStrm;
-    po->m_pStorage  = pStg;
-    po->m_xStorage  = xStg;
-    po->m_bInsertMode = nullptr != pCursor;
+    po->m_pStream = mpStrm;
+    po->m_pStorage  = mpStg;
+    po->m_xStorage  = mxStg;
+    po->m_bInsertMode = nullptr != mpCursor;
     po->m_bSkipImages = mbSkipImages;
 
     // if a Medium is selected, get its Stream
-    if( nullptr != (po->m_pMedium = pMedium ) &&
+    if( nullptr != (po->m_pMedium = mpMedium ) &&
         !po->SetStrmStgPtr() )
     {
         po->SetReadUTF8( false );
@@ -104,8 +104,8 @@ ErrCode SwReader::Read( const Reader& rOptions )
     mxDoc->SetInXMLImport( dynamic_cast< XMLReader* >(po) !=  nullptr );
 
     SwPaM *pPam;
-    if( pCursor )
-        pPam = pCursor;
+    if( mpCursor )
+        pPam = mpCursor;
     else
     {
         // if the Reader was not called by a Shell, create a PaM ourselves
@@ -123,7 +123,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
 
     bool bReadPageDescs = false;
     bool const bDocUndo = mxDoc->GetIDocumentUndoRedo().DoesUndo();
-    bool bSaveUndo = bDocUndo && pCursor;
+    bool bSaveUndo = bDocUndo && mpCursor;
     if( bSaveUndo )
     {
         // the reading of the page template cannot be undone!
@@ -160,7 +160,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
         mxDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::Ignore );
 
         std::unique_ptr<SwPaM> pUndoPam;
-        if( bDocUndo || pCursor )
+        if( bDocUndo || mpCursor )
         {
             // set Pam to the previous node, so that it is not also moved
             const SwNodeIndex& rTmp = pPam->GetPoint()->nNode;
@@ -168,7 +168,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
         }
 
         // store for now all Fly's
-        if( pCursor )
+        if( mpCursor )
         {
             std::copy(mxDoc->GetSpzFrameFormats()->begin(),
                 mxDoc->GetSpzFrameFormats()->end(), std::back_inserter(aFlyFrameArr));
@@ -183,7 +183,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
 
         mxDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld );
 
-        nError = po->Read( *mxDoc, sBaseURL, *pPam, aFileName );
+        nError = po->Read( *mxDoc, msBaseURL, *pPam, maFileName );
 
         // an ODF document may contain redline mode in settings.xml; save it!
         ePostReadRedlineFlags = mxDoc->getIDocumentRedlineAccess().GetRedlineFlags();
@@ -216,7 +216,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
             }
         }
 
-        if( pCursor )
+        if( mpCursor )
         {
             *pUndoPam->GetMark() = *pPam->GetPoint();
             ++pUndoPam->GetPoint()->nNode;
@@ -277,7 +277,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
                                 {
                                     pFrameFormat->MakeFrames();
                                 }
-                                else if( pCursor )
+                                else if( mpCursor )
                                 {
                                     mxDoc->SetContainsAtPageObjWithContentAnchor( true );
                                 }
@@ -323,10 +323,10 @@ ErrCode SwReader::Read( const Reader& rOptions )
          *     When Seeking, the current Status-, EOF- and bad-Bit is set;
          *     nobody knows why
          */
-        if( pStrm )
+        if( mpStrm )
         {
-            pStrm->Seek(0);
-            pStrm->ResetError();
+            mpStrm->Seek(0);
+            mpStrm->ResetError();
         }
     }
 
@@ -356,7 +356,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
     }
 
     // delete Pam if it was created only for reading
-    if( !pCursor )
+    if( !mpCursor )
     {
         delete pPam;          // open a new one
 
@@ -374,7 +374,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
     mxDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld );
     mxDoc->SetOle2Link( aOLELink );
 
-    if( pCursor )                 // the document is now modified
+    if( mpCursor )                 // the document is now modified
         mxDoc->getIDocumentState().SetModified();
     // #i38810# - If links have been updated, the document
     // have to be modified. During update of links the OLE link at the document
@@ -395,8 +395,8 @@ ErrCode SwReader::Read( const Reader& rOptions )
 
 
 SwReader::SwReader(SfxMedium& rMedium, const OUString& rFileName, SwDoc *pDocument)
-    : SwDocFac(pDocument), pStrm(nullptr), pMedium(&rMedium), pCursor(nullptr),
-    aFileName(rFileName), mbSkipImages(false)
+    : SwDocFac(pDocument), mpStrm(nullptr), mpMedium(&rMedium), mpCursor(nullptr),
+    maFileName(rFileName), mbSkipImages(false)
 {
     SetBaseURL( rMedium.GetBaseURL() );
     SetSkipImages( rMedium.IsSkipImages() );
@@ -405,21 +405,21 @@ SwReader::SwReader(SfxMedium& rMedium, const OUString& rFileName, SwDoc *pDocume
 
 // Read into an existing document
 SwReader::SwReader(SvStream& rStrm, const OUString& rFileName, const OUString& rBaseURL, SwPaM& rPam)
-    : SwDocFac(rPam.GetDoc()), pStrm(&rStrm), pMedium(nullptr), pCursor(&rPam),
-    aFileName(rFileName), mbSkipImages(false)
+    : SwDocFac(rPam.GetDoc()), mpStrm(&rStrm), mpMedium(nullptr), mpCursor(&rPam),
+    maFileName(rFileName), mbSkipImages(false)
 {
     SetBaseURL( rBaseURL );
 }
 
 SwReader::SwReader(SfxMedium& rMedium, const OUString& rFileName, SwPaM& rPam)
-    : SwDocFac(rPam.GetDoc()), pStrm(nullptr), pMedium(&rMedium),
-    pCursor(&rPam), aFileName(rFileName), mbSkipImages(false)
+    : SwDocFac(rPam.GetDoc()), mpStrm(nullptr), mpMedium(&rMedium),
+    mpCursor(&rPam), maFileName(rFileName), mbSkipImages(false)
 {
     SetBaseURL( rMedium.GetBaseURL() );
 }
 
 SwReader::SwReader( const uno::Reference < embed::XStorage > &rStg, const OUString& rFilename, SwPaM &rPam )
-    : SwDocFac(rPam.GetDoc()), pStrm(nullptr), xStg( rStg ), pMedium(nullptr), pCursor(&rPam), aFileName(rFilename), mbSkipImages(false)
+    : SwDocFac(rPam.GetDoc()), mpStrm(nullptr), mxStg( rStg ), mpMedium(nullptr), mpCursor(&rPam), maFileName(rFilename), mbSkipImages(false)
 {
 }
 
@@ -636,13 +636,13 @@ bool SwReader::HasGlossaries( const Reader& rOptions )
 {
     // copy variables
     Reader* po = const_cast<Reader*>(&rOptions);
-    po->m_pStream = pStrm;
-    po->m_pStorage  = pStg;
+    po->m_pStream = mpStrm;
+    po->m_pStorage  = mpStg;
     po->m_bInsertMode = false;
 
     // if a Medium is selected, get its Stream
     bool bRet = false;
-    if(  nullptr == (po->m_pMedium = pMedium ) || po->SetStrmStgPtr() )
+    if(  nullptr == (po->m_pMedium = mpMedium ) || po->SetStrmStgPtr() )
         bRet = po->HasGlossaries();
     return bRet;
 }
@@ -652,13 +652,13 @@ bool SwReader::ReadGlossaries( const Reader& rOptions,
 {
     // copy variables
     Reader* po = const_cast<Reader*>(&rOptions);
-    po->m_pStream = pStrm;
-    po->m_pStorage  = pStg;
+    po->m_pStream = mpStrm;
+    po->m_pStorage  = mpStg;
     po->m_bInsertMode = false;
 
     // if a Medium is selected, get its Stream
     bool bRet = false;
-    if( nullptr == (po->m_pMedium = pMedium ) || po->SetStrmStgPtr() )
+    if( nullptr == (po->m_pMedium = mpMedium ) || po->SetStrmStgPtr() )
         bRet = po->ReadGlossaries( rBlocks, bSaveRelFiles );
     return bRet;
 }