sw: prefix members of SwFormatChain, SwFormatHeader, SwFormatFooter and ...

... SwFormatFootnoteEndAtTextEnd

Change-Id: I2b092c8a6d713e2741e99f334b2e9d2247cde6c2
Reviewed-on: https://gerrit.libreoffice.org/69380
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

4 files changed, 50 insertions, 50 deletions

diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index e85ac8db5b8b..4dcc89b44970 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -30,8 +30,8 @@ class IntlWrapper;
 /// Connection (text flow) between two FlyFrames.
 class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem
 {
-    SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent).
-             aNext; ///< Next SwFlyFrameFormat (if existent).
+    SwClient m_aPrev, ///< Previous SwFlyFrameFormat (if existent).
+             m_aNext; ///< Next SwFlyFrameFormat (if existent).
 
 public:
     SwFormatChain() : SfxPoolItem( RES_CHAIN ) {}
@@ -50,8 +50,8 @@ public:
 
     virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
 
-    SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); }
-    SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); }
+    SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(m_aPrev.GetRegisteredIn())); }
+    SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(m_aNext.GetRegisteredIn())); }
 
     void SetPrev( SwFlyFrameFormat *pFormat );
     void SetNext( SwFlyFrameFormat *pFormat );
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 2cc217f0ae12..b6afeff29cdb 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -36,14 +36,14 @@ enum SwFootnoteEndPosEnum
 
 class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem<SwFootnoteEndPosEnum>
 {
-    OUString sPrefix;
-    OUString sSuffix;
-    SvxNumberType aFormat;
-    sal_uInt16      nOffset;
+    OUString m_sPrefix;
+    OUString m_sSuffix;
+    SvxNumberType m_aFormat;
+    sal_uInt16      m_nOffset;
 
 protected:
     SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
-        : SfxEnumItem( nWhichL, ePos ), nOffset( 0 )
+        : SfxEnumItem( nWhichL, ePos ), m_nOffset( 0 )
     {}
 
 public:
@@ -66,19 +66,19 @@ public:
     SwFormatFootnoteEndAtTextEnd(SwFormatFootnoteEndAtTextEnd const &) = default;
         // SfxPoolItem copy function dichotomy
 
-    SvxNumType GetNumType() const        { return aFormat.GetNumberingType(); }
-    void SetNumType( SvxNumType eType )  { aFormat.SetNumberingType(eType); }
+    SvxNumType GetNumType() const        { return m_aFormat.GetNumberingType(); }
+    void SetNumType( SvxNumType eType )  { m_aFormat.SetNumberingType(eType); }
 
-    const SvxNumberType& GetSwNumType() const   { return aFormat; }
+    const SvxNumberType& GetSwNumType() const   { return m_aFormat; }
 
-    sal_uInt16 GetOffset() const                { return nOffset; }
-    void SetOffset( sal_uInt16 nOff )           { nOffset = nOff; }
+    sal_uInt16 GetOffset() const                { return m_nOffset; }
+    void SetOffset( sal_uInt16 nOff )           { m_nOffset = nOff; }
 
-    const OUString& GetPrefix() const      { return sPrefix; }
-    void SetPrefix(const OUString& rSet)   { sPrefix = rSet; }
+    const OUString& GetPrefix() const      { return m_sPrefix; }
+    void SetPrefix(const OUString& rSet)   { m_sPrefix = rSet; }
 
-    const OUString& GetSuffix() const      { return sSuffix; }
-    void SetSuffix(const OUString& rSet)   { sSuffix = rSet; }
+    const OUString& GetSuffix() const      { return m_sSuffix; }
+    void SetSuffix(const OUString& rSet)   { m_sSuffix = rSet; }
 };
 
 class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index e8a0c7a95e08..25b338759062 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -32,7 +32,7 @@ class IntlWrapper;
 
 class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
 {
-    bool const bActive;       ///< Only for controlling (creation of content).
+    bool const m_bActive;       ///< Only for controlling (creation of content).
 
 public:
     SwFormatHeader( bool bOn = false );
@@ -55,7 +55,7 @@ public:
           SwFrameFormat *GetHeaderFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
 
     void RegisterToFormat( SwFormat& rFormat );
-    bool IsActive() const { return bActive; }
+    bool IsActive() const { return m_bActive; }
 };
 
  /**Footer, for pageformats
@@ -63,7 +63,7 @@ public:
 
 class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
 {
-    bool const bActive;       // Only for controlling (creation of content).
+    bool const m_bActive;       // Only for controlling (creation of content).
 
 public:
     SwFormatFooter( bool bOn = false );
@@ -86,7 +86,7 @@ public:
           SwFrameFormat *GetFooterFormat()       { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
 
     void RegisterToFormat( SwFormat& rFormat );
-    bool IsActive() const { return bActive; }
+    bool IsActive() const { return m_bActive; }
 };
 
 inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 15d7c4b513d9..deec3f657033 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -449,21 +449,21 @@ sal_uInt16  SwFormatFillOrder::GetValueCount() const
 SwFormatHeader::SwFormatHeader( SwFrameFormat *pHeaderFormat )
     : SfxPoolItem( RES_HEADER ),
     SwClient( pHeaderFormat ),
-    bActive( pHeaderFormat )
+    m_bActive( pHeaderFormat )
 {
 }
 
 SwFormatHeader::SwFormatHeader( const SwFormatHeader &rCpy )
     : SfxPoolItem( RES_HEADER ),
     SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ),
-    bActive( rCpy.IsActive() )
+    m_bActive( rCpy.IsActive() )
 {
 }
 
 SwFormatHeader::SwFormatHeader( bool bOn )
     : SfxPoolItem( RES_HEADER ),
     SwClient( nullptr ),
-    bActive( bOn )
+    m_bActive( bOn )
 {
 }
 
@@ -477,7 +477,7 @@ bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
     return ( GetRegisteredIn() == static_cast<const SwFormatHeader&>(rAttr).GetRegisteredIn() &&
-             bActive == static_cast<const SwFormatHeader&>(rAttr).IsActive() );
+             m_bActive == static_cast<const SwFormatHeader&>(rAttr).IsActive() );
 }
 
 SfxPoolItem*  SwFormatHeader::Clone( SfxItemPool* ) const
@@ -494,21 +494,21 @@ void SwFormatHeader::RegisterToFormat( SwFormat& rFormat )
 SwFormatFooter::SwFormatFooter( SwFrameFormat *pFooterFormat )
     : SfxPoolItem( RES_FOOTER ),
     SwClient( pFooterFormat ),
-    bActive( pFooterFormat )
+    m_bActive( pFooterFormat )
 {
 }
 
 SwFormatFooter::SwFormatFooter( const SwFormatFooter &rCpy )
     : SfxPoolItem( RES_FOOTER ),
     SwClient( const_cast<SwModify*>(rCpy.GetRegisteredIn()) ),
-    bActive( rCpy.IsActive() )
+    m_bActive( rCpy.IsActive() )
 {
 }
 
 SwFormatFooter::SwFormatFooter( bool bOn )
     : SfxPoolItem( RES_FOOTER ),
     SwClient( nullptr ),
-    bActive( bOn )
+    m_bActive( bOn )
 {
 }
 
@@ -527,7 +527,7 @@ bool SwFormatFooter::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
     return ( GetRegisteredIn() == static_cast<const SwFormatFooter&>(rAttr).GetRegisteredIn() &&
-             bActive == static_cast<const SwFormatFooter&>(rAttr).IsActive() );
+             m_bActive == static_cast<const SwFormatFooter&>(rAttr).IsActive() );
 }
 
 SfxPoolItem*  SwFormatFooter::Clone( SfxItemPool* ) const
@@ -1916,10 +1916,10 @@ SwFormatFootnoteEndAtTextEnd& SwFormatFootnoteEndAtTextEnd::operator=(
                         const SwFormatFootnoteEndAtTextEnd& rAttr )
 {
     SfxEnumItem::SetValue( rAttr.GetValue() );
-    aFormat = rAttr.aFormat;
-    nOffset = rAttr.nOffset;
-    sPrefix = rAttr.sPrefix;
-    sSuffix = rAttr.sSuffix;
+    m_aFormat = rAttr.m_aFormat;
+    m_nOffset = rAttr.m_nOffset;
+    m_sPrefix = rAttr.m_sPrefix;
+    m_sSuffix = rAttr.m_sSuffix;
     return *this;
 }
 
@@ -1927,10 +1927,10 @@ bool SwFormatFootnoteEndAtTextEnd::operator==( const SfxPoolItem& rItem ) const
 {
     const SwFormatFootnoteEndAtTextEnd& rAttr = static_cast<const SwFormatFootnoteEndAtTextEnd&>(rItem);
     return SfxEnumItem::operator==( rAttr ) &&
-            aFormat.GetNumberingType() == rAttr.aFormat.GetNumberingType() &&
-            nOffset == rAttr.nOffset &&
-            sPrefix == rAttr.sPrefix &&
-            sSuffix == rAttr.sSuffix;
+            m_aFormat.GetNumberingType() == rAttr.m_aFormat.GetNumberingType() &&
+            m_nOffset == rAttr.m_nOffset &&
+            m_sPrefix == rAttr.m_sPrefix &&
+            m_sSuffix == rAttr.m_sSuffix;
 }
 
 bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1944,13 +1944,13 @@ bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMember
         case MID_RESTART_NUM :
             rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ;
         break;
-        case MID_NUM_START_AT: rVal <<= static_cast<sal_Int16>(nOffset); break;
+        case MID_NUM_START_AT: rVal <<= static_cast<sal_Int16>(m_nOffset); break;
         case MID_OWN_NUM     :
             rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT;
         break;
-        case MID_NUM_TYPE    : rVal <<= static_cast<sal_Int16>(aFormat.GetNumberingType()); break;
-        case MID_PREFIX      : rVal <<= sPrefix; break;
-        case MID_SUFFIX      : rVal <<= sSuffix; break;
+        case MID_NUM_TYPE    : rVal <<= static_cast<sal_Int16>(m_aFormat.GetNumberingType()); break;
+        case MID_PREFIX      : rVal <<= m_sPrefix; break;
+        case MID_SUFFIX      : rVal <<= m_sSuffix; break;
         default: return false;
     }
     return true;
@@ -1985,7 +1985,7 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe
             sal_Int16 nVal = 0;
             rVal >>= nVal;
             if(nVal >= 0)
-                nOffset = nVal;
+                m_nOffset = nVal;
             else
                 bRet = false;
         }
@@ -2007,7 +2007,7 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe
                 (nVal <= SVX_NUM_ARABIC ||
                     SVX_NUM_CHARS_UPPER_LETTER_N == nVal ||
                         SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
-                aFormat.SetNumberingType(static_cast<SvxNumType>(nVal));
+                m_aFormat.SetNumberingType(static_cast<SvxNumType>(nVal));
             else
                 bRet = false;
         }
@@ -2015,13 +2015,13 @@ bool SwFormatFootnoteEndAtTextEnd::PutValue( const uno::Any& rVal, sal_uInt8 nMe
         case MID_PREFIX      :
         {
             OUString sVal; rVal >>= sVal;
-            sPrefix = sVal;
+            m_sPrefix = sVal;
         }
         break;
         case MID_SUFFIX      :
         {
             OUString sVal; rVal >>= sVal;
-            sSuffix = sVal;
+            m_sSuffix = sVal;
         }
         break;
         default: bRet = false;
@@ -2071,17 +2071,17 @@ SfxPoolItem* SwFormatChain::Clone( SfxItemPool* ) const
 void SwFormatChain::SetPrev( SwFlyFrameFormat *pFormat )
 {
     if ( pFormat )
-        pFormat->Add( &aPrev );
+        pFormat->Add( &m_aPrev );
     else
-        aPrev.EndListeningAll();
+        m_aPrev.EndListeningAll();
 }
 
 void SwFormatChain::SetNext( SwFlyFrameFormat *pFormat )
 {
     if ( pFormat )
-        pFormat->Add( &aNext );
+        pFormat->Add( &m_aNext );
     else
-        aNext.EndListeningAll();
+        m_aNext.EndListeningAll();
 }
 
 bool SwFormatChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const