sw: prefix members of SwEndNoteInfo and SwFootnoteInfo

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

24 files changed, 252 insertions, 252 deletions

diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index b40c8d441bb8..c9084aef3288 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -31,20 +31,20 @@ class SwDoc;
 
 class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
 {
-    mutable sw::WriterMultiListener aDepends;
-    mutable SwTextFormatColl* pTextFormatColl;
-    mutable SwPageDesc* pPageDesc;
-    mutable SwCharFormat* pCharFormat;
-    mutable SwCharFormat* pAnchorFormat;
-    OUString sPrefix;
-    OUString sSuffix;
+    mutable sw::WriterMultiListener m_aDepends;
+    mutable SwTextFormatColl* m_pTextFormatColl;
+    mutable SwPageDesc* m_pPageDesc;
+    mutable SwCharFormat* m_pCharFormat;
+    mutable SwCharFormat* m_pAnchorFormat;
+    OUString m_sPrefix;
+    OUString m_sSuffix;
 protected:
     bool        m_bEndNote;
     virtual void SwClientNotify( const SwModify&, const SfxHint&) override;
 
 public:
-    SvxNumberType aFormat;
-    sal_uInt16    nFootnoteOffset;
+    SvxNumberType m_aFormat;
+    sal_uInt16    m_nFootnoteOffset;
 
     void ChgPageDesc(SwPageDesc* pDesc);
     SwPageDesc* GetPageDesc(SwDoc& rDoc) const;
@@ -52,7 +52,7 @@ public:
     bool DependsOn(const SwPageDesc*) const;
 
     void SetFootnoteTextColl(SwTextFormatColl& rColl);
-    SwTextFormatColl* GetFootnoteTextColl() const { return pTextFormatColl; } // can be 0.
+    SwTextFormatColl* GetFootnoteTextColl() const { return m_pTextFormatColl; } // can be 0.
 
     SwCharFormat* GetCharFormat(SwDoc &rDoc) const;
     void SetCharFormat( SwCharFormat* );
@@ -67,11 +67,11 @@ public:
     SwEndNoteInfo();
     SwEndNoteInfo(const SwEndNoteInfo&);
 
-    const OUString& GetPrefix() const  { return sPrefix; }
-    const OUString& GetSuffix() const  { return sSuffix; }
+    const OUString& GetPrefix() const  { return m_sPrefix; }
+    const OUString& GetSuffix() const  { return m_sSuffix; }
 
-    void SetPrefix(const OUString& rSet) { sPrefix = rSet; }
-    void SetSuffix(const OUString& rSet) { sSuffix = rSet; }
+    void SetPrefix(const OUString& rSet) { m_sPrefix = rSet; }
+    void SetSuffix(const OUString& rSet) { m_sSuffix = rSet; }
 };
 
 enum SwFootnotePos
@@ -91,10 +91,10 @@ class SW_DLLPUBLIC SwFootnoteInfo final : public SwEndNoteInfo
     using SwEndNoteInfo::operator ==;
 
 public:
-    OUString  aQuoVadis;
-    OUString  aErgoSum;
-    SwFootnotePos  ePos;
-    SwFootnoteNum  eNum;
+    OUString  m_aQuoVadis;
+    OUString  m_aErgoSum;
+    SwFootnotePos  m_ePos;
+    SwFootnoteNum  m_eNum;
 
     SwFootnoteInfo& operator=(const SwFootnoteInfo&);
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 6a31591c0a2c..9001db35e92c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -86,7 +86,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92470_footnoteRestart, "tdf92470_footnoteRestart
     CPPUNIT_ASSERT( pTextDoc );
     SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     CPPUNIT_ASSERT( pDoc );
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote doesn't restart every Page", FTNNUM_PAGE, pDoc->GetFootnoteInfo().eNum );
+    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote doesn't restart every Page", FTNNUM_PAGE, pDoc->GetFootnoteInfo().m_eNum );
 
     uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(25), getProperty<sal_Int32>(xPageStyle, "FootnoteLineRelativeWidth"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index ece282f437aa..d28322e7cedd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -740,9 +740,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf55427_footnote2endnote, "tdf55427_footnote2endno
     CPPUNIT_ASSERT(pTextDoc);
     SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     // The footnote numbering type of ARABIC will not transfer over when those footnotes are converted to endnotes.
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote numbering type", SVX_NUM_ARABIC, pDoc->GetFootnoteInfo().aFormat.GetNumberingType() );
+    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote numbering type", SVX_NUM_ARABIC, pDoc->GetFootnoteInfo().m_aFormat.GetNumberingType() );
     // The original document has a real endnote using ROMAN_LOWER numbering, so that setting MUST remain unchanged.
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Endnote numbering type", SVX_NUM_ROMAN_LOWER, pDoc->GetEndNoteInfo().aFormat.GetNumberingType() );
+    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Endnote numbering type", SVX_NUM_ROMAN_LOWER, pDoc->GetEndNoteInfo().m_aFormat.GetNumberingType() );
 
     uno::Reference<text::XFootnotesSupplier> xFootnotesSupplier(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XIndexAccess> xFootnotes = xFootnotesSupplier->getFootnotes();
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index 677b8b0c225c..9abcdf7a9eef 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -122,9 +122,9 @@ DECLARE_WW8EXPORT_TEST(testTdf55427_footnote2endnote, "tdf55427_footnote2endnote
     CPPUNIT_ASSERT(pTextDoc);
     SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
     // The footnote numbering type of ARABIC will not transfer over when those footnotes are converted to endnotes.
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote numbering type", SVX_NUM_ARABIC, pDoc->GetFootnoteInfo().aFormat.GetNumberingType() );
+    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote numbering type", SVX_NUM_ARABIC, pDoc->GetFootnoteInfo().m_aFormat.GetNumberingType() );
     // The original document has a real endnote using ROMAN_LOWER numbering, so that setting MUST remain unchanged.
-    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Endnote numbering type", SVX_NUM_ROMAN_LOWER, pDoc->GetEndNoteInfo().aFormat.GetNumberingType() );
+    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Endnote numbering type", SVX_NUM_ROMAN_LOWER, pDoc->GetEndNoteInfo().m_aFormat.GetNumberingType() );
 
     uno::Reference<text::XFootnotesSupplier> xFootnotesSupplier(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XIndexAccess> xFootnotes = xFootnotesSupplier->getFootnotes();
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 20b3e344e356..882959ede139 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -39,116 +39,116 @@
 
 SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo)
 {
-    pTextFormatColl = rInfo.pTextFormatColl;
-    pPageDesc = rInfo.pPageDesc;
-    pCharFormat = rInfo.pCharFormat;
-    pAnchorFormat = rInfo.pAnchorFormat;
-    aDepends.EndListeningAll();
-    aDepends.StartListening(pTextFormatColl);
-    aDepends.StartListening(pPageDesc);
-    aDepends.StartListening(pCharFormat);
-    aDepends.StartListening(pAnchorFormat);
-
-    aFormat = rInfo.aFormat;
-    nFootnoteOffset = rInfo.nFootnoteOffset;
+    m_pTextFormatColl = rInfo.m_pTextFormatColl;
+    m_pPageDesc = rInfo.m_pPageDesc;
+    m_pCharFormat = rInfo.m_pCharFormat;
+    m_pAnchorFormat = rInfo.m_pAnchorFormat;
+    m_aDepends.EndListeningAll();
+    m_aDepends.StartListening(m_pTextFormatColl);
+    m_aDepends.StartListening(m_pPageDesc);
+    m_aDepends.StartListening(m_pCharFormat);
+    m_aDepends.StartListening(m_pAnchorFormat);
+
+    m_aFormat = rInfo.m_aFormat;
+    m_nFootnoteOffset = rInfo.m_nFootnoteOffset;
     m_bEndNote = rInfo.m_bEndNote;
-    sPrefix = rInfo.sPrefix;
-    sSuffix = rInfo.sSuffix;
+    m_sPrefix = rInfo.m_sPrefix;
+    m_sSuffix = rInfo.m_sSuffix;
     return *this;
 }
 
 bool SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const
 {
     return
-            pTextFormatColl == rInfo.pTextFormatColl &&
-            pPageDesc == rInfo.pPageDesc &&
-            pCharFormat == rInfo.pCharFormat &&
-            pAnchorFormat == rInfo.pAnchorFormat &&
-            aFormat.GetNumberingType() == rInfo.aFormat.GetNumberingType() &&
-            nFootnoteOffset == rInfo.nFootnoteOffset &&
+            m_pTextFormatColl == rInfo.m_pTextFormatColl &&
+            m_pPageDesc == rInfo.m_pPageDesc &&
+            m_pCharFormat == rInfo.m_pCharFormat &&
+            m_pAnchorFormat == rInfo.m_pAnchorFormat &&
+            m_aFormat.GetNumberingType() == rInfo.m_aFormat.GetNumberingType() &&
+            m_nFootnoteOffset == rInfo.m_nFootnoteOffset &&
             m_bEndNote == rInfo.m_bEndNote &&
-            sPrefix == rInfo.sPrefix &&
-            sSuffix == rInfo.sSuffix;
+            m_sPrefix == rInfo.m_sPrefix &&
+            m_sSuffix == rInfo.m_sSuffix;
 }
 
 SwEndNoteInfo::SwEndNoteInfo(const SwEndNoteInfo& rInfo) :
     SwClient(nullptr),
-    aDepends(*this),
-    pTextFormatColl(rInfo.pTextFormatColl),
-    pPageDesc(rInfo.pPageDesc),
-    pCharFormat(rInfo.pCharFormat),
-    pAnchorFormat(rInfo.pAnchorFormat),
-    sPrefix( rInfo.sPrefix ),
-    sSuffix( rInfo.sSuffix ),
+    m_aDepends(*this),
+    m_pTextFormatColl(rInfo.m_pTextFormatColl),
+    m_pPageDesc(rInfo.m_pPageDesc),
+    m_pCharFormat(rInfo.m_pCharFormat),
+    m_pAnchorFormat(rInfo.m_pAnchorFormat),
+    m_sPrefix( rInfo.m_sPrefix ),
+    m_sSuffix( rInfo.m_sSuffix ),
     m_bEndNote( true ),
-    aFormat( rInfo.aFormat ),
-    nFootnoteOffset( rInfo.nFootnoteOffset )
+    m_aFormat( rInfo.m_aFormat ),
+    m_nFootnoteOffset( rInfo.m_nFootnoteOffset )
 {
-    aDepends.StartListening(pTextFormatColl);
-    aDepends.StartListening(pPageDesc);
-    aDepends.StartListening(pCharFormat);
-    aDepends.StartListening(pAnchorFormat);
+    m_aDepends.StartListening(m_pTextFormatColl);
+    m_aDepends.StartListening(m_pPageDesc);
+    m_aDepends.StartListening(m_pCharFormat);
+    m_aDepends.StartListening(m_pAnchorFormat);
 }
 
 SwEndNoteInfo::SwEndNoteInfo() :
     SwClient(nullptr),
-    aDepends(*this),
-    pTextFormatColl(nullptr),
-    pPageDesc(nullptr),
-    pCharFormat(nullptr),
-    pAnchorFormat(nullptr),
+    m_aDepends(*this),
+    m_pTextFormatColl(nullptr),
+    m_pPageDesc(nullptr),
+    m_pCharFormat(nullptr),
+    m_pAnchorFormat(nullptr),
     m_bEndNote( true ),
-    nFootnoteOffset( 0 )
+    m_nFootnoteOffset( 0 )
 {
-    aFormat.SetNumberingType(SVX_NUM_ROMAN_LOWER);
+    m_aFormat.SetNumberingType(SVX_NUM_ROMAN_LOWER);
 }
 
 SwPageDesc* SwEndNoteInfo::GetPageDesc(SwDoc& rDoc) const
 {
-    if(!pPageDesc)
+    if(!m_pPageDesc)
     {
-        pPageDesc = rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast<sal_uInt16>(
+        m_pPageDesc = rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast<sal_uInt16>(
             m_bEndNote ? RES_POOLPAGE_ENDNOTE : RES_POOLPAGE_FOOTNOTE ) );
-        aDepends.StartListening(pPageDesc);
+        m_aDepends.StartListening(m_pPageDesc);
     }
-    return pPageDesc;
+    return m_pPageDesc;
 }
 
 bool SwEndNoteInfo::KnowsPageDesc() const
 {
-    return pPageDesc != nullptr;
+    return m_pPageDesc != nullptr;
 }
 
 bool SwEndNoteInfo::DependsOn(const SwPageDesc* pDesc) const
 {
-    return pPageDesc == pDesc;
+    return m_pPageDesc == pDesc;
 }
 
 void SwEndNoteInfo::ChgPageDesc(SwPageDesc* pDesc)
 {
-    aDepends.EndListening(pPageDesc);
-    pPageDesc = pDesc;
-    aDepends.StartListening(pPageDesc);
+    m_aDepends.EndListening(m_pPageDesc);
+    m_pPageDesc = pDesc;
+    m_aDepends.StartListening(m_pPageDesc);
 }
 
 void SwEndNoteInfo::SetFootnoteTextColl(SwTextFormatColl& rFormat)
 {
-    aDepends.EndListening(pTextFormatColl);
-    pTextFormatColl = &rFormat;
-    aDepends.StartListening(pTextFormatColl);
+    m_aDepends.EndListening(m_pTextFormatColl);
+    m_pTextFormatColl = &rFormat;
+    m_aDepends.StartListening(m_pTextFormatColl);
 }
 
 SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc& rDoc) const
 {
     auto pCharFormatFromDoc = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( static_cast<sal_uInt16>(
         m_bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE ) );
-    if (pCharFormat != pCharFormatFromDoc)
+    if (m_pCharFormat != pCharFormatFromDoc)
     {
-        aDepends.EndListening(pCharFormat);
-        aDepends.StartListening(pCharFormatFromDoc);
-        pCharFormat = pCharFormatFromDoc;
+        m_aDepends.EndListening(m_pCharFormat);
+        m_aDepends.StartListening(pCharFormatFromDoc);
+        m_pCharFormat = pCharFormatFromDoc;
     }
-    return pCharFormat;
+    return m_pCharFormat;
 }
 
 namespace
@@ -184,13 +184,13 @@ SwCharFormat* SwEndNoteInfo::GetAnchorCharFormat(SwDoc& rDoc) const
 {
     auto pAnchorFormatFromDoc = rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( static_cast<sal_uInt16>(
         m_bEndNote ? RES_POOLCHR_ENDNOTE_ANCHOR : RES_POOLCHR_FOOTNOTE_ANCHOR ) );
-    if(pAnchorFormat != pAnchorFormatFromDoc)
+    if(m_pAnchorFormat != pAnchorFormatFromDoc)
     {
-        aDepends.EndListening(pAnchorFormat);
-        aDepends.StartListening(pAnchorFormatFromDoc);
-        pAnchorFormat = pAnchorFormatFromDoc;
+        m_aDepends.EndListening(m_pAnchorFormat);
+        m_aDepends.StartListening(pAnchorFormatFromDoc);
+        m_pAnchorFormat = pAnchorFormatFromDoc;
     }
-    return pAnchorFormat;
+    return m_pAnchorFormat;
 }
 
 void SwEndNoteInfo::SetAnchorCharFormat(SwCharFormat* pFormat)
@@ -206,8 +206,8 @@ void SwEndNoteInfo::SetAnchorCharFormat(SwCharFormat* pFormat)
 SwCharFormat* SwEndNoteInfo::GetCurrentCharFormat(const bool bAnchor) const
 {
     return bAnchor
-        ? pAnchorFormat
-        : pCharFormat;
+        ? m_pAnchorFormat
+        : m_pCharFormat;
 }
 
 void SwEndNoteInfo::SwClientNotify( const SwModify& rModify, const SfxHint& rHint)
@@ -217,8 +217,8 @@ void SwEndNoteInfo::SwClientNotify( const SwModify& rModify, const SfxHint& rHin
         const sal_uInt16 nWhich = pLegacyHint->m_pOld ? pLegacyHint->m_pOld->Which() : pLegacyHint->m_pNew ? pLegacyHint->m_pNew->Which() : 0 ;
         if (RES_ATTRSET_CHG == nWhich || RES_FMT_CHG == nWhich)
         {
-            auto pFormat = GetCurrentCharFormat(pCharFormat == nullptr);
-            if (!pFormat || !aDepends.IsListeningTo(pFormat) || pFormat->IsFormatInDTOR())
+            auto pFormat = GetCurrentCharFormat(m_pCharFormat == nullptr);
+            if (!pFormat || !m_aDepends.IsListeningTo(pFormat) || pFormat->IsFormatInDTOR())
                 return;
             SwDoc* pDoc = pFormat->GetDoc();
             SwFootnoteIdxs& rFootnoteIdxs = pDoc->GetFootnoteIdxs();
@@ -238,52 +238,52 @@ void SwEndNoteInfo::SwClientNotify( const SwModify& rModify, const SfxHint& rHin
     else if (auto pModifyChangedHint = dynamic_cast<const sw::ModifyChangedHint*>(&rHint))
     {
         auto pNew = const_cast<SwModify*>(pModifyChangedHint->m_pNew);
-        if(pAnchorFormat == &rModify)
-            pAnchorFormat = static_cast<SwCharFormat*>(pNew);
-        else if(pCharFormat == &rModify)
-            pCharFormat = static_cast<SwCharFormat*>(pNew);
-        else if(pPageDesc == &rModify)
-            pPageDesc = static_cast<SwPageDesc*>(pNew);
-        else if(pTextFormatColl == &rModify)
-            pTextFormatColl = static_cast<SwTextFormatColl*>(pNew);
+        if(m_pAnchorFormat == &rModify)
+            m_pAnchorFormat = static_cast<SwCharFormat*>(pNew);
+        else if(m_pCharFormat == &rModify)
+            m_pCharFormat = static_cast<SwCharFormat*>(pNew);
+        else if(m_pPageDesc == &rModify)
+            m_pPageDesc = static_cast<SwPageDesc*>(pNew);
+        else if(m_pTextFormatColl == &rModify)
+            m_pTextFormatColl = static_cast<SwTextFormatColl*>(pNew);
     }
 }
 
 SwFootnoteInfo& SwFootnoteInfo::operator=(const SwFootnoteInfo& rInfo)
 {
     SwEndNoteInfo::operator=(rInfo);
-    aQuoVadis =  rInfo.aQuoVadis;
-    aErgoSum = rInfo.aErgoSum;
-    ePos = rInfo.ePos;
-    eNum = rInfo.eNum;
+    m_aQuoVadis =  rInfo.m_aQuoVadis;
+    m_aErgoSum = rInfo.m_aErgoSum;
+    m_ePos = rInfo.m_ePos;
+    m_eNum = rInfo.m_eNum;
     return *this;
 }
 
 bool SwFootnoteInfo::operator==( const SwFootnoteInfo& rInfo ) const
 {
-    return  ePos == rInfo.ePos &&
-            eNum == rInfo.eNum &&
+    return  m_ePos == rInfo.m_ePos &&
+            m_eNum == rInfo.m_eNum &&
             SwEndNoteInfo::operator==(rInfo) &&
-            aQuoVadis == rInfo.aQuoVadis &&
-            aErgoSum == rInfo.aErgoSum;
+            m_aQuoVadis == rInfo.m_aQuoVadis &&
+            m_aErgoSum == rInfo.m_aErgoSum;
 }
 
 SwFootnoteInfo::SwFootnoteInfo(const SwFootnoteInfo& rInfo) :
     SwEndNoteInfo( rInfo ),
-    aQuoVadis( rInfo.aQuoVadis ),
-    aErgoSum( rInfo.aErgoSum ),
-    ePos( rInfo.ePos ),
-    eNum( rInfo.eNum )
+    m_aQuoVadis( rInfo.m_aQuoVadis ),
+    m_aErgoSum( rInfo.m_aErgoSum ),
+    m_ePos( rInfo.m_ePos ),
+    m_eNum( rInfo.m_eNum )
 {
     m_bEndNote = false;
 }
 
 SwFootnoteInfo::SwFootnoteInfo() :
     SwEndNoteInfo(),
-    ePos( FTNPOS_PAGE ),
-    eNum( FTNNUM_DOC )
+    m_ePos( FTNPOS_PAGE ),
+    m_eNum( FTNNUM_DOC )
 {
-    aFormat.SetNumberingType(SVX_NUM_ARABIC);
+    m_aFormat.SetNumberingType(SVX_NUM_ARABIC);
     m_bEndNote = false;
 }
 
@@ -300,12 +300,12 @@ void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo)
         GetIDocumentUndoRedo().AppendUndo( std::make_unique<SwUndoFootNoteInfo>(rOld, this) );
     }
 
-    bool bFootnotePos  = rInfo.ePos != rOld.ePos;
-    bool bFootnoteDesc = rOld.ePos == FTNPOS_CHAPTER &&
+    bool bFootnotePos  = rInfo.m_ePos != rOld.m_ePos;
+    bool bFootnoteDesc = rOld.m_ePos == FTNPOS_CHAPTER &&
                         rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
-    bool bExtra   = rInfo.aQuoVadis != rOld.aQuoVadis ||
-                        rInfo.aErgoSum != rOld.aErgoSum ||
-                        rInfo.aFormat.GetNumberingType() != rOld.aFormat.GetNumberingType() ||
+    bool bExtra   = rInfo.m_aQuoVadis != rOld.m_aQuoVadis ||
+                        rInfo.m_aErgoSum != rOld.m_aErgoSum ||
+                        rInfo.m_aFormat.GetNumberingType() != rOld.m_aFormat.GetNumberingType() ||
                         rInfo.GetPrefix() != rOld.GetPrefix() ||
                         rInfo.GetSuffix() != rOld.GetSuffix();
     SwCharFormat *pOldChrFormat = rOld.GetCharFormat( *this ),
@@ -342,7 +342,7 @@ void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo)
             }
         }
     }
-    if( FTNNUM_PAGE != rInfo.eNum )
+    if( FTNNUM_PAGE != rInfo.m_eNum )
         GetFootnoteIdxs().UpdateAllFootnote();
     else if( bFootnoteChrFormats )
     {
@@ -372,13 +372,13 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
             std::make_unique<SwUndoEndNoteInfo>( GetEndNoteInfo(), this ) );
     }
 
-    bool bNumChg  = rInfo.nFootnoteOffset != GetEndNoteInfo().nFootnoteOffset;
+    bool bNumChg  = rInfo.m_nFootnoteOffset != GetEndNoteInfo().m_nFootnoteOffset;
     // this seems to be an optimization: UpdateAllFootnote() is only called
     // if the offset changes; if the offset is the same,
     // but type/prefix/suffix changes, just set new numbers.
     bool const bExtra = !bNumChg &&
-            (   (rInfo.aFormat.GetNumberingType() !=
-                    GetEndNoteInfo().aFormat.GetNumberingType())
+            (   (rInfo.m_aFormat.GetNumberingType() !=
+                    GetEndNoteInfo().m_aFormat.GetNumberingType())
             ||  (rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix())
             ||  (rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix())
             );
@@ -523,7 +523,7 @@ bool SwDoc::SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
 
         if ( bTypeChgd )
             rFootnoteArr.UpdateAllFootnote();
-        if( FTNNUM_PAGE != GetFootnoteInfo().eNum )
+        if( FTNNUM_PAGE != GetFootnoteInfo().m_eNum )
         {
             if ( !bTypeChgd )
                 rFootnoteArr.UpdateAllFootnote();
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 85b1229b4d5a..ee431f5955af 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1527,7 +1527,7 @@ void SwDoc::SetAllUniqueFlyNames()
         // #i52775# Chapter footnotes did not get updated correctly.
         // Calling UpdateAllFootnote() instead of UpdateFootnote() solves this problem,
         // but I do not dare to call UpdateAllFootnote() in all cases: Safety first.
-        if ( FTNNUM_CHAPTER == GetFootnoteInfo().eNum )
+        if ( FTNNUM_CHAPTER == GetFootnoteInfo().m_eNum )
         {
             GetFootnoteIdxs().UpdateAllFootnote();
         }
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index d0efa05bb990..f28a1562a8af 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -150,7 +150,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
     UpdateNumRule();
 
     // update if we have foot notes && numbering by chapter
-    if( !GetFootnoteIdxs().empty() && FTNNUM_CHAPTER == GetFootnoteInfo().eNum )
+    if( !GetFootnoteIdxs().empty() && FTNNUM_CHAPTER == GetFootnoteInfo().m_eNum )
         GetFootnoteIdxs().UpdateAllFootnote();
 
     getIDocumentFieldsAccess().UpdateExpFields(nullptr, true);
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 0ca3a8b117f2..d28d9309aaef 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -74,7 +74,7 @@ void SwFootnoteIdxs::UpdateFootnote( const SwNodeIndex& rStt )
 
     // For normal foot notes we treat per-chapter and per-document numbering
     // separately. For Endnotes we only have per-document numbering.
-    if( FTNNUM_CHAPTER == rFootnoteInfo.eNum )
+    if( FTNNUM_CHAPTER == rFootnoteInfo.m_eNum )
     {
         SwRootFrame const* pLayout(nullptr);
         std::set<SwRootFrame*> layouts = pDoc->GetAllLayouts();
@@ -166,9 +166,9 @@ void SwFootnoteIdxs::UpdateFootnote( const SwNodeIndex& rStt )
             {
                 pTextFootnote->SetNumber(
                     (nChapterStart <= nNode && nNode < nChapterEnd)
-                        ? rFootnoteInfo.nFootnoteOffset + nFootnoteNo
+                        ? rFootnoteInfo.m_nFootnoteOffset + nFootnoteNo
                         : rFootnote.GetNumber(),
-                    rFootnoteInfo.nFootnoteOffset + nFootnoteNoHidden,
+                    rFootnoteInfo.m_nFootnoteOffset + nFootnoteNoHidden,
                     rFootnote.GetNumStr() );
                 if (nChapterStart <= nNode && nNode < nChapterEnd)
                 {
@@ -185,7 +185,7 @@ void SwFootnoteIdxs::UpdateFootnote( const SwNodeIndex& rStt )
     SwUpdFootnoteEndNtAtEnd aNumArr;
 
     // unless we have per-document numbering, only look at endnotes here
-    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.eNum;
+    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.m_eNum;
 
     size_t nPos;
     size_t nFootnoteNo = 1;
@@ -236,9 +236,9 @@ void SwFootnoteIdxs::UpdateFootnote( const SwNodeIndex& rStt )
             {
                 if (rFootnote.IsEndNote())
                 {
-                    nSectNo.first = rEndInfo.nFootnoteOffset + nEndNo;
+                    nSectNo.first = rEndInfo.m_nFootnoteOffset + nEndNo;
                     ++nEndNo;
-                    nSectNo.second = rEndInfo.nFootnoteOffset + nEndNoHidden;
+                    nSectNo.second = rEndInfo.m_nFootnoteOffset + nEndNoHidden;
                     if (!IsFootnoteDeleted(rIDRA, *pTextFootnote))
                     {
                         ++nEndNoHidden;
@@ -246,9 +246,9 @@ void SwFootnoteIdxs::UpdateFootnote( const SwNodeIndex& rStt )
                 }
                 else
                 {
-                    nSectNo.first = rFootnoteInfo.nFootnoteOffset + nFootnoteNo;
+                    nSectNo.first = rFootnoteInfo.m_nFootnoteOffset + nFootnoteNo;
                     ++nFootnoteNo;
-                    nSectNo.second = rFootnoteInfo.nFootnoteOffset + nFootnoteNoHidden;
+                    nSectNo.second = rFootnoteInfo.m_nFootnoteOffset + nFootnoteNoHidden;
                     if (!IsFootnoteDeleted(rIDRA, *pTextFootnote))
                     {
                         ++nFootnoteNoHidden;
@@ -282,7 +282,7 @@ void SwFootnoteIdxs::UpdateAllFootnote()
     std::set<SwRootFrame*> aAllLayouts = pDoc->GetAllLayouts();
     // For normal Footnotes per-chapter and per-document numbering are treated separately.
     // For Endnotes we only have document-wise numbering.
-    if( FTNNUM_CHAPTER == rFootnoteInfo.eNum )
+    if( FTNNUM_CHAPTER == rFootnoteInfo.m_eNum )
     {
         // sw_redlinehide: here we need to know if there's *any* layout with
         // IsHideRedlines(), because then the hidden-numbers have to be updated
@@ -315,8 +315,8 @@ void SwFootnoteIdxs::UpdateAllFootnote()
                         !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
                     {
                         pTextFootnote->SetNumber(
-                            rFootnoteInfo.nFootnoteOffset + nNo,
-                            rFootnoteInfo.nFootnoteOffset + nNoNo,
+                            rFootnoteInfo.m_nFootnoteOffset + nNo,
+                            rFootnoteInfo.m_nFootnoteOffset + nNoNo,
                             rFootnote.GetNumStr() );
                         ++nNo;
                         if (!IsFootnoteDeleted(rIDRA, *pTextFootnote))
@@ -345,8 +345,8 @@ void SwFootnoteIdxs::UpdateAllFootnote()
                 !SwUpdFootnoteEndNtAtEnd::FindSectNdWithEndAttr( *pTextFootnote ))
             {
                 pTextFootnote->SetNumber(
-                        rFootnoteInfo.nFootnoteOffset + nNo,
-                        rFootnoteInfo.nFootnoteOffset + nNoNo,
+                        rFootnoteInfo.m_nFootnoteOffset + nNo,
+                        rFootnoteInfo.m_nFootnoteOffset + nNoNo,
                         rFootnote.GetNumStr() );
                 ++nNo;
                 if (!IsFootnoteDeleted(rIDRA, *pTextFootnote))
@@ -358,7 +358,7 @@ void SwFootnoteIdxs::UpdateAllFootnote()
     }
 
     // We use bool here, so that we also iterate through the Endnotes with a chapter setting.
-    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.eNum;
+    const bool bEndNoteOnly = FTNNUM_DOC != rFootnoteInfo.m_eNum;
     sal_uInt16 nFootnoteNo = 1;
     sal_uInt16 nEndnoteNo = 1;
     sal_uInt16 nFootnoteNoHidden = 1;
@@ -374,9 +374,9 @@ void SwFootnoteIdxs::UpdateAllFootnote()
             {
                 if (rFootnote.IsEndNote())
                 {
-                    nSectNo.first = rEndInfo.nFootnoteOffset + nEndnoteNo;
+                    nSectNo.first = rEndInfo.m_nFootnoteOffset + nEndnoteNo;
                     ++nEndnoteNo;
-                    nSectNo.second = rEndInfo.nFootnoteOffset + nEndnoteNoHidden;
+                    nSectNo.second = rEndInfo.m_nFootnoteOffset + nEndnoteNoHidden;
                     if (!IsFootnoteDeleted(rIDRA, *pTextFootnote))
                     {
                         ++nEndnoteNoHidden;
@@ -384,9 +384,9 @@ void SwFootnoteIdxs::UpdateAllFootnote()
                 }
                 else
                 {
-                    nSectNo.first = rFootnoteInfo.nFootnoteOffset + nFootnoteNo;
+                    nSectNo.first = rFootnoteInfo.m_nFootnoteOffset + nFootnoteNo;
                     ++nFootnoteNo;
-                    nSectNo.second = rFootnoteInfo.nFootnoteOffset + nFootnoteNoHidden;
+                    nSectNo.second = rFootnoteInfo.m_nFootnoteOffset + nFootnoteNoHidden;
                     if (!IsFootnoteDeleted(rIDRA, *pTextFootnote))
                     {
                         ++nFootnoteNoHidden;
@@ -401,7 +401,7 @@ void SwFootnoteIdxs::UpdateAllFootnote()
         }
     }
 
-    if (pLayout && FTNNUM_PAGE == rFootnoteInfo.eNum)
+    if (pLayout && FTNNUM_PAGE == rFootnoteInfo.m_eNum)
         for( auto aLayout : aAllLayouts )
             aLayout->UpdateFootnoteNums();
 }
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index b9c6c428784f..6e1d3edb6e52 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -832,7 +832,7 @@ bool SwFrame::IsFootnoteAllowed() const
 void SwRootFrame::UpdateFootnoteNums()
 {
     // page numbering only if set at the document
-    if ( GetFormat()->GetDoc()->GetFootnoteInfo().eNum == FTNNUM_PAGE )
+    if ( GetFormat()->GetDoc()->GetFootnoteInfo().m_eNum == FTNNUM_PAGE )
     {
         SwPageFrame *pPage = static_cast<SwPageFrame*>(Lower());
         while ( pPage && !pPage->IsFootnotePage() )
@@ -1493,7 +1493,7 @@ void SwFootnoteBossFrame::AppendFootnote( SwContentFrame *pRef, SwTextFootnote *
             }
         }
     }
-    else if( FTNPOS_CHAPTER == pDoc->GetFootnoteInfo().ePos && ( !GetUpper()->
+    else if( FTNPOS_CHAPTER == pDoc->GetFootnoteInfo().m_ePos && ( !GetUpper()->
              IsSctFrame() || !static_cast<SwSectionFrame*>(GetUpper())->IsFootnoteAtEnd() ) )
     {
         while ( pPage->GetNext() && !pPage->IsFootnotePage() &&
@@ -2140,7 +2140,7 @@ void SwFootnoteBossFrame::MoveFootnotes_( SwFootnoteFrames &rFootnoteArr, bool b
 void SwFootnoteBossFrame::MoveFootnotes( const SwContentFrame *pSrc, SwContentFrame *pDest,
                              SwTextFootnote const *pAttr )
 {
-    if( ( GetFormat()->GetDoc()->GetFootnoteInfo().ePos == FTNPOS_CHAPTER &&
+    if( ( GetFormat()->GetDoc()->GetFootnoteInfo().m_ePos == FTNPOS_CHAPTER &&
         (!GetUpper()->IsSctFrame() || !static_cast<SwSectionFrame*>(GetUpper())->IsFootnoteAtEnd()))
         || pAttr->GetFootnote().IsEndNote() )
         return;
@@ -2395,7 +2395,7 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const SwTwips nDeadLine, const boo
 void SwPageFrame::UpdateFootnoteNum()
 {
     // page numbering only if set at the document
-    if ( GetFormat()->GetDoc()->GetFootnoteInfo().eNum != FTNNUM_PAGE )
+    if ( GetFormat()->GetDoc()->GetFootnoteInfo().m_eNum != FTNNUM_PAGE )
         return;
 
     SwLayoutFrame* pBody = FindBodyCont();
@@ -2628,7 +2628,7 @@ bool SwLayoutFrame::MoveLowerFootnotes( SwContentFrame *pStart, SwFootnoteBossFr
     SwDoc *pDoc = GetFormat()->GetDoc();
     if ( pDoc->GetFootnoteIdxs().empty() )
         return false;
-    if( pDoc->GetFootnoteInfo().ePos == FTNPOS_CHAPTER &&
+    if( pDoc->GetFootnoteInfo().m_ePos == FTNPOS_CHAPTER &&
         ( !IsInSct() || !FindSctFrame()->IsFootnoteAtEnd() ) )
         return true;
 
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 39d2f20fd33e..1bb1ae04159d 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2926,7 +2926,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
 
         SwContentFrame *pCnt;
         if( IsFootnoteFrame() && !static_cast<SwFootnoteFrame*>(this)->GetAttr()->GetFootnote().IsEndNote() &&
-            ( GetFormat()->GetDoc()->GetFootnoteInfo().ePos != FTNPOS_CHAPTER ||
+            ( GetFormat()->GetDoc()->GetFootnoteInfo().m_ePos != FTNPOS_CHAPTER ||
               ( IsInSct() && FindSctFrame()->IsFootnoteAtEnd() ) ) &&
               nullptr != (pCnt = static_cast<SwFootnoteFrame*>(this)->GetRefFromAttr() ) )
         {
@@ -4560,7 +4560,7 @@ void SwRootFrame::SetHideRedlines(bool const bHideRedlines)
     }
 
     SwFootnoteIdxs & rFootnotes(rDoc.GetFootnoteIdxs());
-    if (rDoc.GetFootnoteInfo().eNum == FTNNUM_CHAPTER)
+    if (rDoc.GetFootnoteInfo().m_eNum == FTNNUM_CHAPTER)
     {
         // sadly determining which node is outline node requires hidden layout
         rFootnotes.UpdateAllFootnote();
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 973b7a86c4a7..06bccb92c5ae 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2683,13 +2683,13 @@ static bool lcl_ErgoVadis(SwTextFrame* pFrame, TextFrameIndex & rPos, const Prep
     const SwFootnoteInfo &rFootnoteInfo = pFrame->GetDoc().GetFootnoteInfo();
     if( ePrep == PrepareHint::ErgoSum )
     {
-        if( rFootnoteInfo.aErgoSum.isEmpty() )
+        if( rFootnoteInfo.m_aErgoSum.isEmpty() )
             return false;
         rPos = pFrame->GetOfst();
     }
     else
     {
-        if( rFootnoteInfo.aQuoVadis.isEmpty() )
+        if( rFootnoteInfo.m_aQuoVadis.isEmpty() )
             return false;
         if( pFrame->HasFollow() )
             rPos = pFrame->GetFollow()->GetOfst();
@@ -2832,7 +2832,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
                     // We're the last Footnote; we need to update the
                     // QuoVadis texts now
                     const SwFootnoteInfo &rFootnoteInfo = GetDoc().GetFootnoteInfo();
-                    if( !pPara->UpdateQuoVadis( rFootnoteInfo.aQuoVadis ) )
+                    if( !pPara->UpdateQuoVadis( rFootnoteInfo.m_aQuoVadis ) )
                     {
                         TextFrameIndex nPos = pPara->GetParLen();
                         if( nPos )
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 7ef58985c418..4df50b14e5cc 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -128,7 +128,7 @@ bool SwTextFrame::CalcPrepFootnoteAdjust()
     OSL_ENSURE( HasFootnote(), "Who´s calling me?" );
     SwFootnoteBossFrame *pBoss = FindFootnoteBossFrame( true );
     const SwFootnoteFrame *pFootnote = pBoss->FindFirstFootnote( this );
-    if (pFootnote && FTNPOS_CHAPTER != GetDoc().GetFootnoteInfo().ePos &&
+    if (pFootnote && FTNPOS_CHAPTER != GetDoc().GetFootnoteInfo().m_ePos &&
         ( !pBoss->GetUpper()->IsSctFrame() ||
         !static_cast<SwSectionFrame*>(pBoss->GetUpper())->IsFootnoteAtEnd() ) )
     {
@@ -416,7 +416,7 @@ void SwTextFrame::RemoveFootnote(TextFrameIndex const nStart, TextFrameIndex con
     bool bRemove = false;
     SwFootnoteBossFrame *pFootnoteBoss = nullptr;
     SwFootnoteBossFrame *pEndBoss = nullptr;
-    bool bFootnoteEndDoc = FTNPOS_CHAPTER == GetDoc().GetFootnoteInfo().ePos;
+    bool bFootnoteEndDoc = FTNPOS_CHAPTER == GetDoc().GetFootnoteInfo().m_ePos;
     SwTextNode const* pNode(nullptr);
     sw::MergedAttrIterReverse iter(*this);
     for (SwTextAttr const* pHt = iter.PrevAttr(&pNode); pHt; pHt = iter.PrevAttr(&pNode))
@@ -609,7 +609,7 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDea
     pSect = pBoss->FindSctFrame();
     bool bDocEnd = bEnd ? !( pSect && pSect->IsEndnAtEnd() ) :
                    ( !( pSect && pSect->IsFootnoteAtEnd() ) &&
-                       FTNPOS_CHAPTER == GetDoc().GetFootnoteInfo().ePos);
+                       FTNPOS_CHAPTER == GetDoc().GetFootnoteInfo().m_ePos);
 
     // Footnote can be registered with the Follow
     SwContentFrame *pSrcFrame = FindFootnoteRef( pFootnote );
@@ -841,7 +841,7 @@ SwFootnotePortion *SwTextFormatter::NewFootnotePortion( SwTextFormatInfo &rInf,
     {
         SwSectionFrame *pSct = pBoss->FindSctFrame();
         bool bAtSctEnd = pSct && pSct->IsFootnoteAtEnd();
-        if( FTNPOS_CHAPTER != pDoc->GetFootnoteInfo().ePos || bAtSctEnd )
+        if( FTNPOS_CHAPTER != pDoc->GetFootnoteInfo().m_ePos || bAtSctEnd )
         {
             SwFrame* pFootnoteCont = pBoss->FindFootnoteCont();
             // If the Parent is within an Area, it can only be a Column of this
@@ -1017,9 +1017,9 @@ SwErgoSumPortion *SwTextFormatter::NewErgoSumPortion( SwTextFormatInfo const &rI
     SwParaPortion *pPara = pQuoFrame->GetPara();
     if( pPara )
         pPara->SetErgoSumNum( aPage );
-    if( rFootnoteInfo.aErgoSum.isEmpty() )
+    if( rFootnoteInfo.m_aErgoSum.isEmpty() )
         return nullptr;
-    SwErgoSumPortion *pErgo = new SwErgoSumPortion( rFootnoteInfo.aErgoSum,
+    SwErgoSumPortion *pErgo = new SwErgoSumPortion( rFootnoteInfo.m_aErgoSum,
                                 lcl_GetPageNumber( pQuoPage ) );
     return pErgo;
 }
@@ -1056,7 +1056,7 @@ TextFrameIndex SwTextFormatter::FormatQuoVadis(TextFrameIndex const nOffset)
 
     SwTextFormatInfo &rInf = GetInfo();
     const SwFootnoteInfo &rFootnoteInfo = m_pFrame->GetDoc().GetFootnoteInfo();
-    if( rFootnoteInfo.aQuoVadis.isEmpty() )
+    if( rFootnoteInfo.m_aQuoVadis.isEmpty() )
         return nOffset;
 
     // A remark on QuoVadis/ErgoSum:
@@ -1092,7 +1092,7 @@ TextFrameIndex SwTextFormatter::FormatQuoVadis(TextFrameIndex const nOffset)
     rInf.RealWidth( nOldRealWidth - nLastLeft );
 
     OUString aErgo = lcl_GetPageNumber( pErgoFrame->FindPageFrame() );
-    SwQuoVadisPortion *pQuo = new SwQuoVadisPortion(rFootnoteInfo.aQuoVadis, aErgo );
+    SwQuoVadisPortion *pQuo = new SwQuoVadisPortion(rFootnoteInfo.m_aQuoVadis, aErgo );
     pQuo->SetAscent( rInf.GetAscent()  );
     pQuo->Height( rInf.GetTextHeight() );
     pQuo->Format( rInf );
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index a3f0332cb654..ad5110d4082a 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -250,7 +250,7 @@ OUString SwFormatFootnote::GetViewNumStr(const SwDoc& rDoc,
                 pInfo = &rDoc.GetEndNoteInfo();
             else
                 pInfo = &rDoc.GetFootnoteInfo();
-            sRet = pInfo->aFormat.GetNumStr( nNumber );
+            sRet = pInfo->m_aFormat.GetNumStr( nNumber );
             if( bInclStrings )
             {
                 sRet = pInfo->GetPrefix() + sRet + pInfo->GetSuffix();
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 9f3331c1ecb4..9b2095a27e55 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1579,7 +1579,7 @@ void SwTextNode::ChgTextCollUpdateNum( const SwTextFormatColl *pOldColl,
     SwNodes& rNds = GetNodes();
     // If Level 0 (Chapter), update the footnotes!
     if( ( !nNewLevel || !nOldLevel) && pDoc && !pDoc->GetFootnoteIdxs().empty() &&
-        FTNNUM_CHAPTER == pDoc->GetFootnoteInfo().eNum &&
+        FTNNUM_CHAPTER == pDoc->GetFootnoteInfo().m_eNum &&
         rNds.IsDocNodes() )
     {
         SwNodeIndex aTmpIndex( rNds, GetIndex());
@@ -3522,10 +3522,10 @@ bool SwTextNode::CopyExpandText(SwTextNode& rDestNd, const SwIndex* pDestIdx,
                             if( !rFootnote.GetNumStr().isEmpty() )
                                 sExpand = rFootnote.GetNumStr();
                             else if( rFootnote.IsEndNote() )
-                                sExpand = GetDoc()->GetEndNoteInfo().aFormat.
+                                sExpand = GetDoc()->GetEndNoteInfo().m_aFormat.
                                             GetNumStr(number);
                             else
-                                sExpand = GetDoc()->GetFootnoteInfo().aFormat.
+                                sExpand = GetDoc()->GetFootnoteInfo().m_aFormat.
                                             GetNumStr(number);
                             if( !sExpand.isEmpty() )
                             {
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 0cddeacbf68c..45e7d76b834f 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -339,7 +339,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
                     nTmp > SVX_NUM_BITMAP)))
                 throw lang::IllegalArgumentException();
 
-            aFootnoteInfo.aFormat.SetNumberingType(static_cast<SvxNumType>(nTmp));
+            aFootnoteInfo.m_aFormat.SetNumberingType(static_cast<SvxNumType>(nTmp));
 
         }
         break;
@@ -347,7 +347,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
         {
             sal_Int16 nTmp = 0;
             aValue >>= nTmp;
-            aFootnoteInfo.nFootnoteOffset = nTmp;
+            aFootnoteInfo.m_nFootnoteOffset = nTmp;
         }
         break;
         case WID_FOOTNOTE_COUNTING:
@@ -357,13 +357,13 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
             switch(nTmp)
             {
                 case  FootnoteNumbering::PER_PAGE:
-                    aFootnoteInfo.eNum = FTNNUM_PAGE;
+                    aFootnoteInfo.m_eNum = FTNNUM_PAGE;
                 break;
                 case  FootnoteNumbering::PER_CHAPTER:
-                    aFootnoteInfo.eNum = FTNNUM_CHAPTER;
+                    aFootnoteInfo.m_eNum = FTNNUM_CHAPTER;
                 break;
                 case  FootnoteNumbering::PER_DOCUMENT:
-                    aFootnoteInfo.eNum = FTNNUM_DOC;
+                    aFootnoteInfo.m_eNum = FTNNUM_DOC;
                 break;
             }
         }
@@ -398,21 +398,21 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
         case WID_POSITION_END_OF_DOC:
         {
             bool bVal = *o3tl::doAccess<bool>(aValue);
-            aFootnoteInfo.ePos = bVal ? FTNPOS_CHAPTER : FTNPOS_PAGE;
+            aFootnoteInfo.m_ePos = bVal ? FTNPOS_CHAPTER : FTNPOS_PAGE;
         }
         break;
         case WID_END_NOTICE:
         {
             OUString uTmp;
             aValue >>= uTmp;
-            aFootnoteInfo.aQuoVadis = uTmp;
+            aFootnoteInfo.m_aQuoVadis = uTmp;
         }
         break;
         case WID_BEGIN_NOTICE:
         {
             OUString uTmp;
             aValue >>= uTmp;
-            aFootnoteInfo.aErgoSum = uTmp;
+            aFootnoteInfo.m_aErgoSum = uTmp;
         }
         break;
     }
@@ -447,16 +447,16 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
         break;
         case  WID_NUMBERING_TYPE :
         {
-            aRet <<= static_cast<sal_Int16>(rFootnoteInfo.aFormat.GetNumberingType());
+            aRet <<= static_cast<sal_Int16>(rFootnoteInfo.m_aFormat.GetNumberingType());
         }
         break;
         case  WID_START_AT:
-            aRet <<= static_cast<sal_Int16>(rFootnoteInfo.nFootnoteOffset);
+            aRet <<= static_cast<sal_Int16>(rFootnoteInfo.m_nFootnoteOffset);
         break;
         case  WID_FOOTNOTE_COUNTING  :
         {
             sal_Int16 nRet = 0;
-            switch(rFootnoteInfo.eNum)
+            switch(rFootnoteInfo.m_eNum)
             {
                 case  FTNNUM_PAGE:
                     nRet = FootnoteNumbering::PER_PAGE;
@@ -510,13 +510,13 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
         }
         break;
         case  WID_POSITION_END_OF_DOC:
-            aRet <<= FTNPOS_CHAPTER == rFootnoteInfo.ePos;
+            aRet <<= FTNPOS_CHAPTER == rFootnoteInfo.m_ePos;
         break;
         case  WID_END_NOTICE         :
-            aRet <<= rFootnoteInfo.aQuoVadis;
+            aRet <<= rFootnoteInfo.m_aQuoVadis;
         break;
         case  WID_BEGIN_NOTICE       :
-            aRet <<= rFootnoteInfo.aErgoSum;
+            aRet <<= rFootnoteInfo.m_aErgoSum;
         break;
     }
 
@@ -612,14 +612,14 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
             {
                 sal_Int16 nTmp = 0;
                 aValue >>= nTmp;
-                aEndInfo.aFormat.SetNumberingType(static_cast<SvxNumType>(nTmp));
+                aEndInfo.m_aFormat.SetNumberingType(static_cast<SvxNumType>(nTmp));
             }
             break;
             case  WID_START_AT:
             {
                 sal_Int16 nTmp = 0;
                 aValue >>= nTmp;
-                aEndInfo.nFootnoteOffset = nTmp;
+                aEndInfo.m_nFootnoteOffset = nTmp;
             }
             break;
             case  WID_PARAGRAPH_STYLE    :
@@ -675,10 +675,10 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
                 aRet <<= rEndInfo.GetSuffix();
             break;
             case  WID_NUMBERING_TYPE :
-                aRet <<= static_cast<sal_Int16>(rEndInfo.aFormat.GetNumberingType());
+                aRet <<= static_cast<sal_Int16>(rEndInfo.m_aFormat.GetNumberingType());
             break;
             case  WID_START_AT:
-                aRet <<= static_cast<sal_Int16>(rEndInfo.nFootnoteOffset);
+                aRet <<= static_cast<sal_Int16>(rEndInfo.m_nFootnoteOffset);
             break;
             case  WID_PARAGRAPH_STYLE    :
             {
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 16ff215f9899..3445d7fcdff7 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -150,10 +150,10 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
                         if( !rFootnote.GetNumStr().isEmpty() )
                             sOut = rFootnote.GetNumStr();
                         else if( rFootnote.IsEndNote() )
-                            sOut = rWrt.m_pDoc->GetEndNoteInfo().aFormat.
+                            sOut = rWrt.m_pDoc->GetEndNoteInfo().m_aFormat.
                             GetNumStr( rFootnote.GetNumber() );
                         else
-                            sOut = rWrt.m_pDoc->GetFootnoteInfo().aFormat.
+                            sOut = rWrt.m_pDoc->GetFootnoteInfo().m_aFormat.
                             GetNumStr( rFootnote.GetNumber() );
                     }
                     break;
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 1d628ef49c88..a808f128489d 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -88,14 +88,14 @@ static sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
         switch( nPart )
         {
         case 0:
-            rInfo.aFormat.SetNumberingType( bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC );
+            rInfo.m_aFormat.SetNumberingType( bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC );
             if( !aPart.isEmpty() )
-                rInfo.aFormat.SetNumberingType(SwHTMLParser::GetNumType( aPart,
-                                                             rInfo.aFormat.GetNumberingType() ));
+                rInfo.m_aFormat.SetNumberingType(SwHTMLParser::GetNumType( aPart,
+                                                             rInfo.m_aFormat.GetNumberingType() ));
             break;
 
         case 1:
-            rInfo.nFootnoteOffset = aPart.isEmpty() ? 0 : static_cast<sal_uInt16>(aPart.toInt32());
+            rInfo.m_nFootnoteOffset = aPart.isEmpty() ? 0 : static_cast<sal_uInt16>(aPart.toInt32());
             break;
 
         case 2:
@@ -133,36 +133,36 @@ void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
         switch( nPart )
         {
         case 4:
-            aInfo.eNum = FTNNUM_DOC;
+            aInfo.m_eNum = FTNNUM_DOC;
             if( !aPart.isEmpty() )
             {
                 switch( aPart[0] )
                 {
-                case 'D': aInfo.eNum = FTNNUM_DOC; break;
-                case 'C': aInfo.eNum = FTNNUM_CHAPTER; break;
-                case 'P': aInfo.eNum = FTNNUM_PAGE; break;
+                case 'D': aInfo.m_eNum = FTNNUM_DOC; break;
+                case 'C': aInfo.m_eNum = FTNNUM_CHAPTER; break;
+                case 'P': aInfo.m_eNum = FTNNUM_PAGE; break;
                 }
             }
             break;
 
         case 5:
-            aInfo.ePos = FTNPOS_PAGE;
+            aInfo.m_ePos = FTNPOS_PAGE;
             if( !aPart.isEmpty() )
             {
                 switch( aPart[0] )
                 {
-                case 'C': aInfo.ePos = FTNPOS_CHAPTER; break;
-                case 'P': aInfo.ePos = FTNPOS_PAGE; break;
+                case 'C': aInfo.m_ePos = FTNPOS_CHAPTER; break;
+                case 'P': aInfo.m_ePos = FTNPOS_PAGE; break;
                 }
             }
             break;
 
         case 6:
-            aInfo.aQuoVadis = aPart;
+            aInfo.m_aQuoVadis = aPart;
             break;
 
         case 7:
-            aInfo.aErgoSum = aPart;
+            aInfo.m_aErgoSum = aPart;
             break;
         }
     }
@@ -457,7 +457,7 @@ static int lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
                                  bool bEndNote  )
 {
     int nParts = 0;
-    sal_Int16 eFormat = rInfo.aFormat.GetNumberingType();
+    sal_Int16 eFormat = rInfo.m_aFormat.GetNumberingType();
     if( (bEndNote ? SVX_NUM_ROMAN_LOWER : SVX_NUM_ARABIC) != eFormat )
     {
         const char *pStr = SwHTMLWriter::GetNumFormat( eFormat );
@@ -467,9 +467,9 @@ static int lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
             nParts = 1;
         }
     }
-    if( rInfo.nFootnoteOffset > 0 )
+    if( rInfo.m_nFootnoteOffset > 0 )
     {
-        pParts[1] = OUString::number(rInfo.nFootnoteOffset);
+        pParts[1] = OUString::number(rInfo.m_nFootnoteOffset);
         nParts = 2;
     }
     if( !rInfo.GetPrefix().isEmpty() )
@@ -527,24 +527,24 @@ void SwHTMLWriter::OutFootEndNoteInfo()
         const SwFootnoteInfo& rInfo = m_pDoc->GetFootnoteInfo();
         OUString aParts[8];
         int nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, false );
-        if( rInfo.eNum != FTNNUM_DOC )
+        if( rInfo.m_eNum != FTNNUM_DOC )
         {
-            aParts[4] = rInfo.eNum == FTNNUM_CHAPTER ? OUStringLiteral( "C" ) : OUStringLiteral( "P" );
+            aParts[4] = rInfo.m_eNum == FTNNUM_CHAPTER ? OUStringLiteral( "C" ) : OUStringLiteral( "P" );
             nParts = 5;
         }
-        if( rInfo.ePos != FTNPOS_PAGE)
+        if( rInfo.m_ePos != FTNPOS_PAGE)
         {
             aParts[5] = "C";
             nParts = 6;
         }
-        if( !rInfo.aQuoVadis.isEmpty() )
+        if( !rInfo.m_aQuoVadis.isEmpty() )
         {
-            aParts[6] = rInfo.aQuoVadis;
+            aParts[6] = rInfo.m_aQuoVadis;
             nParts = 7;
         }
-        if( !rInfo.aErgoSum.isEmpty() )
+        if( !rInfo.m_aErgoSum.isEmpty() )
         {
-            aParts[7] = rInfo.aErgoSum;
+            aParts[7] = rInfo.m_aErgoSum;
             nParts = 8;
         }
         if( nParts > 0 )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 172205b11b50..e3146df0ed06 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7522,7 +7522,7 @@ void DocxAttributeOutput::TextFootnote_Impl( const SwFormatFootnote& rFootnote )
     // remember the footnote/endnote to
     // 1) write the footnoteReference/endnoteReference in EndRunProperties()
     // 2) be able to dump them all to footnotes.xml/endnotes.xml
-    if ( !rFootnote.IsEndNote() && m_rExport.m_pDoc->GetFootnoteInfo().ePos != FTNPOS_CHAPTER )
+    if ( !rFootnote.IsEndNote() && m_rExport.m_pDoc->GetFootnoteInfo().m_ePos != FTNPOS_CHAPTER )
         m_pFootnotesList->add( rFootnote );
     else
         m_pEndnotesList->add( rFootnote );
@@ -7633,7 +7633,7 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
 {
     fs->startElementNS(XML_w, tag);
     const char* fmt = nullptr;
-    switch( info.aFormat.GetNumberingType())
+    switch( info.m_aFormat.GetNumberingType())
     {
         case SVX_NUM_CHARS_UPPER_LETTER_N: // fall through, map to upper letters
         case SVX_NUM_CHARS_UPPER_LETTER:
@@ -7665,14 +7665,14 @@ void DocxAttributeOutput::WriteFootnoteEndnotePr( ::sax_fastparser::FSHelperPtr
     }
     if( fmt != nullptr )
         fs->singleElementNS(XML_w, XML_numFmt, FSNS(XML_w, XML_val), fmt);
-    if( info.nFootnoteOffset != 0 )
+    if( info.m_nFootnoteOffset != 0 )
         fs->singleElementNS( XML_w, XML_numStart, FSNS( XML_w, XML_val ),
-            OString::number(info.nFootnoteOffset + 1) );
+            OString::number(info.m_nFootnoteOffset + 1) );
 
     const SwFootnoteInfo* pFootnoteInfo = dynamic_cast<const SwFootnoteInfo*>(&info);
     if( pFootnoteInfo )
     {
-        switch( pFootnoteInfo->eNum )
+        switch( pFootnoteInfo->m_eNum )
         {
             case FTNNUM_PAGE:       fmt = "eachPage"; break;
             case FTNNUM_CHAPTER:    fmt = "eachSect"; break;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 58b2e2c1627c..18992cc46931 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2773,7 +2773,7 @@ void RtfAttributeOutput::TextFootnote_Impl(const SwFormatFootnote& rFootnote)
     m_aRun->append(' ');
     WriteTextFootnoteNumStr(rFootnote);
     m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FOOTNOTE);
-    if (rFootnote.IsEndNote() || m_rExport.m_pDoc->GetFootnoteInfo().ePos == FTNPOS_CHAPTER)
+    if (rFootnote.IsEndNote() || m_rExport.m_pDoc->GetFootnoteInfo().m_ePos == FTNPOS_CHAPTER)
         m_aRun->append(OOO_STRING_SVTOOLS_RTF_FTNALT);
     m_aRun->append(' ');
     WriteTextFootnoteNumStr(rFootnote);
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index c9eb068556f3..8eb5e78e080a 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -860,12 +860,12 @@ ErrCode RtfExport::ExportDocument_Impl()
         // write the footnotes and endnotes-out Info
         const SwFootnoteInfo& rFootnoteInfo = m_pDoc->GetFootnoteInfo();
 
-        const char* pOut = FTNPOS_CHAPTER == rFootnoteInfo.ePos ? OOO_STRING_SVTOOLS_RTF_ENDDOC
-                                                                : OOO_STRING_SVTOOLS_RTF_FTNBJ;
+        const char* pOut = FTNPOS_CHAPTER == rFootnoteInfo.m_ePos ? OOO_STRING_SVTOOLS_RTF_ENDDOC
+                                                                  : OOO_STRING_SVTOOLS_RTF_FTNBJ;
         Strm().WriteCharPtr(pOut).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_FTNSTART);
-        OutLong(rFootnoteInfo.nFootnoteOffset + 1);
+        OutLong(rFootnoteInfo.m_nFootnoteOffset + 1);
 
-        switch (rFootnoteInfo.eNum)
+        switch (rFootnoteInfo.m_eNum)
         {
             case FTNNUM_PAGE:
                 pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG;
@@ -879,7 +879,7 @@ ErrCode RtfExport::ExportDocument_Impl()
         }
         Strm().WriteCharPtr(pOut);
 
-        switch (rFootnoteInfo.aFormat.GetNumberingType())
+        switch (rFootnoteInfo.m_aFormat.GetNumberingType())
         {
             case SVX_NUM_CHARS_LOWER_LETTER:
             case SVX_NUM_CHARS_LOWER_LETTER_N:
@@ -910,9 +910,9 @@ ErrCode RtfExport::ExportDocument_Impl()
             .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AENDDOC)
             .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT)
             .WriteCharPtr(OOO_STRING_SVTOOLS_RTF_AFTNSTART);
-        OutLong(rEndNoteInfo.nFootnoteOffset + 1);
+        OutLong(rEndNoteInfo.m_nFootnoteOffset + 1);
 
-        switch (rEndNoteInfo.aFormat.GetNumberingType())
+        switch (rEndNoteInfo.m_aFormat.GetNumberingType())
         {
             case SVX_NUM_CHARS_LOWER_LETTER:
             case SVX_NUM_CHARS_LOWER_LETTER_N:
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 40a4729a2286..7db63308dc58 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1136,8 +1136,8 @@ void WW8_WrPlcSepx::WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt )
 {
     sal_uInt8 nInfoFlags = 0;
     const SwFootnoteInfo& rInfo = rWrt.m_pDoc->GetFootnoteInfo();
-    if( !rInfo.aErgoSum.isEmpty() )  nInfoFlags |= 0x02;
-    if( !rInfo.aQuoVadis.isEmpty() ) nInfoFlags |= 0x04;
+    if( !rInfo.m_aErgoSum.isEmpty() )  nInfoFlags |= 0x02;
+    if( !rInfo.m_aQuoVadis.isEmpty() ) nInfoFlags |= 0x04;
 
     sal_uInt8 nEmptyStt = 0;
     if( nInfoFlags )
@@ -1147,7 +1147,7 @@ void WW8_WrPlcSepx::WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt )
         if( 0x02 & nInfoFlags )         // Footnote continuation separator
         {
             pTextPos->Append( nCpStt );
-            rWrt.WriteStringAsPara( rInfo.aErgoSum );
+            rWrt.WriteStringAsPara( rInfo.m_aErgoSum );
             rWrt.WriteStringAsPara( OUString() );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
@@ -1157,7 +1157,7 @@ void WW8_WrPlcSepx::WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt )
         if( 0x04 & nInfoFlags )         // Footnote continuation notice
         {
             pTextPos->Append( nCpStt );
-            rWrt.WriteStringAsPara( rInfo.aQuoVadis );
+            rWrt.WriteStringAsPara( rInfo.m_aQuoVadis );
             rWrt.WriteStringAsPara( OUString() );
             nCpStt = rWrt.Fc2Cp( rWrt.Strm().Tell() );
         }
@@ -1173,21 +1173,21 @@ void WW8_WrPlcSepx::WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt )
     // set the flags at the Dop right away
     WW8Dop& rDop = *rWrt.pDop;
     // Footnote Info
-    switch( rInfo.eNum )
+    switch( rInfo.m_eNum )
     {
     case FTNNUM_PAGE:       rDop.rncFootnote = 2; break;
     case FTNNUM_CHAPTER:    rDop.rncFootnote  = 1; break;
     default: rDop.rncFootnote  = 0; break;
     }                                   // rncFootnote
-    rDop.nfcFootnoteRef = WW8Export::GetNumId( rInfo.aFormat.GetNumberingType() );
-    rDop.nFootnote = rInfo.nFootnoteOffset + 1;
+    rDop.nfcFootnoteRef = WW8Export::GetNumId( rInfo.m_aFormat.GetNumberingType() );
+    rDop.nFootnote = rInfo.m_nFootnoteOffset + 1;
     rDop.fpc = rWrt.m_bFootnoteAtTextEnd ? 2 : 1;
 
     // Endnote Info
     rDop.rncEdn = 0;                        // rncEdn: Don't Restart
     const SwEndNoteInfo& rEndInfo = rWrt.m_pDoc->GetEndNoteInfo();
-    rDop.nfcEdnRef = WW8Export::GetNumId( rEndInfo.aFormat.GetNumberingType() );
-    rDop.nEdn = rEndInfo.nFootnoteOffset + 1;
+    rDop.nfcEdnRef = WW8Export::GetNumId( rEndInfo.m_aFormat.GetNumberingType() );
+    rDop.nEdn = rEndInfo.m_nFootnoteOffset + 1;
     rDop.epc = rWrt.m_bEndAtTextEnd ? 3 : 0;
 }
 
@@ -1327,7 +1327,7 @@ void WW8AttributeOutput::SectFootnoteEndnotePr()
 {
     const SwFootnoteInfo& rInfo = m_rWW8Export.m_pDoc->GetFootnoteInfo();
     m_rWW8Export.InsUInt16( NS_sprm::sprmSRncFtn );
-    switch( rInfo.eNum )
+    switch( rInfo.m_eNum )
     {
     case FTNNUM_PAGE:     m_rWW8Export.pO->push_back( sal_uInt8/*rncRstPage*/ (2) ); break;
     case FTNNUM_CHAPTER:  m_rWW8Export.pO->push_back( sal_uInt8/*rncRstSect*/ (1) ); break;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 8bd8dd43a948..6d3749b75d47 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3503,7 +3503,7 @@ void AttributeOutputBase::TextFootnote( const SwFormatFootnote& rFootnote )
 void WW8AttributeOutput::TextFootnote_Impl( const SwFormatFootnote& rFootnote )
 {
     WW8_WrPlcFootnoteEdn* pFootnoteEnd;
-    if ( rFootnote.IsEndNote() || GetExport().m_pDoc->GetFootnoteInfo().ePos == FTNPOS_CHAPTER )
+    if ( rFootnote.IsEndNote() || GetExport().m_pDoc->GetFootnoteInfo().m_ePos == FTNPOS_CHAPTER )
         pFootnoteEnd = m_rWW8Export.pEdn.get();
     else
         pFootnoteEnd = m_rWW8Export.pFootnote.get();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c4cf552d3833..ac1ad3c0bb1b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5145,21 +5145,21 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
 
         SwFootnoteInfo aInfo = m_rDoc.GetFootnoteInfo(); // Copy-Ctor private
 
-        aInfo.ePos = FTNPOS_PAGE;
-        aInfo.eNum = eNumA[m_xWDop->rncFootnote];
+        aInfo.m_ePos = FTNPOS_PAGE;
+        aInfo.m_eNum = eNumA[m_xWDop->rncFootnote];
         sal_uInt16 nfcFootnoteRef = m_xWDop->nfcFootnoteRef & 0xF;
-        aInfo.aFormat.SetNumberingType( eNumTA[nfcFootnoteRef] );
+        aInfo.m_aFormat.SetNumberingType( eNumTA[nfcFootnoteRef] );
         if( m_xWDop->nFootnote )
-            aInfo.nFootnoteOffset = m_xWDop->nFootnote - 1;
+            aInfo.m_nFootnoteOffset = m_xWDop->nFootnote - 1;
         m_rDoc.SetFootnoteInfo( aInfo );
     }
     if (m_xSBase->AreThereEndnotes())
     {
         SwEndNoteInfo aInfo = m_rDoc.GetEndNoteInfo(); // Same as for Footnote
         sal_uInt16 nfcEdnRef = m_xWDop->nfcEdnRef & 0xF;
-        aInfo.aFormat.SetNumberingType( eNumTA[nfcEdnRef] );
+        aInfo.m_aFormat.SetNumberingType( eNumTA[nfcEdnRef] );
         if( m_xWDop->nEdn )
-            aInfo.nFootnoteOffset = m_xWDop->nEdn - 1;
+            aInfo.m_nFootnoteOffset = m_xWDop->nEdn - 1;
         m_rDoc.SetEndNoteInfo( aInfo );
     }
 
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index a4a101c77535..66eef11d9cfa 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -124,7 +124,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
     {
         const SwFootnoteInfo &rInf = pSh->GetFootnoteInfo();
         // set position (page, chapter)
-        if ( rInf.ePos == FTNPOS_PAGE )
+        if ( rInf.m_ePos == FTNPOS_PAGE )
         {
             m_xPosPageBox->set_active(true);
             m_xPageTemplLbl->set_sensitive(false);
@@ -138,17 +138,17 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
             bPosDoc = true;
         }
             // reference tests
-        m_xContEdit->set_text(rInf.aQuoVadis);
-        m_xContFromEdit->set_text(rInf.aErgoSum);
+        m_xContEdit->set_text(rInf.m_aQuoVadis);
+        m_xContFromEdit->set_text(rInf.m_aErgoSum);
 
             // collected
-        SelectNumbering(rInf.eNum);
+        SelectNumbering(rInf.m_eNum);
     }
 
         // numbering
         // art
-    m_xNumViewBox->SelectNumberingType( pInf->aFormat.GetNumberingType());
-    m_xOffsetField->set_value(pInf->nFootnoteOffset + 1);
+    m_xNumViewBox->SelectNumberingType( pInf->m_aFormat.GetNumberingType());
+    m_xOffsetField->set_value(pInf->m_nFootnoteOffset + 1);
     m_xPrefixED->set_text(pInf->GetPrefix().replaceAll("\t", "\\t")); // fdo#65666
     m_xSuffixED->set_text(pInf->GetSuffix().replaceAll("\t", "\\t"));
 
@@ -329,8 +329,8 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
 {
     std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo());
 
-    pInf->nFootnoteOffset = m_xOffsetField->get_value() - 1;
-    pInf->aFormat.SetNumberingType(m_xNumViewBox->GetSelectedNumberingType() );
+    pInf->m_nFootnoteOffset = m_xOffsetField->get_value() - 1;
+    pInf->m_aFormat.SetNumberingType(m_xNumViewBox->GetSelectedNumberingType() );
     pInf->SetPrefix(m_xPrefixED->get_text().replaceAll("\\t", "\t"));
     pInf->SetSuffix(m_xSuffixED->get_text().replaceAll("\\t", "\t"));
 
@@ -361,10 +361,10 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
     else
     {
         SwFootnoteInfo *pI = static_cast<SwFootnoteInfo*>(pInf.get());
-        pI->ePos = m_xPosPageBox->get_active() ? FTNPOS_PAGE : FTNPOS_CHAPTER;
-        pI->eNum = GetNumbering();
-        pI->aQuoVadis = m_xContEdit->get_text();
-        pI->aErgoSum = m_xContFromEdit->get_text();
+        pI->m_ePos = m_xPosPageBox->get_active() ? FTNPOS_PAGE : FTNPOS_CHAPTER;
+        pI->m_eNum = GetNumbering();
+        pI->m_aQuoVadis = m_xContEdit->get_text();
+        pI->m_aErgoSum = m_xContFromEdit->get_text();
         if ( !(*pI == pSh->GetFootnoteInfo()) )
             pSh->SetFootnoteInfo( *pI );
     }