sw: prefix members of SwPageFtnInfo

Change-Id: I5ccad27938941d5b1311bb4fd15353ea8ea34d77

sw/inc/pagedesc.hxx

@@ -42,33 +42,34 @@ enum SwFtnAdj
 /// Footnote information.
 class SW_DLLPUBLIC SwPageFtnInfo
 {
-    SwTwips     nMaxHeight;              ///< maximum height of the footnote area.
-    sal_uLong   nLineWidth;              ///< width of separator line
-    editeng::SvxBorderStyle eLineStyle;  ///< Style of the separator line
-    Color       aLineColor;              ///< color of the separator line
-    Fraction    aWidth;                  ///< percentage width of the separator line.
-    SwFtnAdj    eAdj;                    ///< line adjustment.
-    SwTwips     nTopDist;                ///< distance between body and separator.
-    SwTwips     nBottomDist;             ///< distance between separator and first footnote
+private:
+    SwTwips     m_nMaxHeight;   ///< maximum height of the footnote area.
+    sal_uLong   m_nLineWidth;   ///< width of separator line
+    editeng::SvxBorderStyle m_eLineStyle;  ///< Style of the separator line
+    Color       m_LineColor;    ///< color of the separator line
+    Fraction    m_Width;        ///< percentage width of the separator line.
+    SwFtnAdj    m_eAdjust;      ///< line adjustment.
+    SwTwips     m_nTopDist;     ///< distance between body and separator.
+    SwTwips     m_nBottomDist;  ///< distance between separator and first footnote
 
 public:
-    SwTwips     GetHeight() const       { return nMaxHeight; }
-    sal_uLong           GetLineWidth() const { return nLineWidth; }
-    const Color&    GetLineColor() const { return aLineColor;}
-    editeng::SvxBorderStyle  GetLineStyle() const { return eLineStyle; }
-    const Fraction& GetWidth() const    { return aWidth; }
-    SwFtnAdj    GetAdj()    const       { return eAdj; }
-    SwTwips     GetTopDist()const       { return nTopDist; }
-    SwTwips     GetBottomDist() const   { return nBottomDist; }
-
-    void SetHeight( SwTwips  nNew )     { nMaxHeight = nNew; }
-    void SetLineWidth(sal_uLong nSet  )     { nLineWidth = nSet; }
-    void SetLineStyle( editeng::SvxBorderStyle eSet )   { eLineStyle = eSet; }
-    void SetLineColor(const Color& rCol )  { aLineColor = rCol;}
-    void SetWidth( const Fraction &rNew){ aWidth = rNew; }
-    void SetAdj   ( SwFtnAdj eNew )     { eAdj = eNew; }
-    void SetTopDist   ( SwTwips nNew )  { nTopDist = nNew; }
-    void SetBottomDist( SwTwips nNew )  { nBottomDist = nNew; }
+    SwTwips     GetHeight() const       { return m_nMaxHeight; }
+    sal_uLong   GetLineWidth() const    { return m_nLineWidth; }
+    const Color& GetLineColor() const   { return m_LineColor;}
+    editeng::SvxBorderStyle  GetLineStyle() const { return m_eLineStyle; }
+    const Fraction& GetWidth() const    { return m_Width; }
+    SwFtnAdj    GetAdj() const          { return m_eAdjust; }
+    SwTwips     GetTopDist() const      { return m_nTopDist; }
+    SwTwips     GetBottomDist() const   { return m_nBottomDist; }
+
+    void SetHeight(SwTwips const nNew)      { m_nMaxHeight = nNew; }
+    void SetLineWidth(sal_uLong const nSet) { m_nLineWidth = nSet; }
+    void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = eSet;}
+    void SetLineColor(const Color& rCol)    { m_LineColor = rCol;}
+    void SetWidth(const Fraction & rNew)    { m_Width = rNew; }
+    void SetAdj(SwFtnAdj const eNew)        { m_eAdjust = eNew; }
+    void SetTopDist   (SwTwips const nNew)  { m_nTopDist = nNew; }
+    void SetBottomDist(SwTwips const nNew)  { m_nBottomDist = nNew; }
 
     SwPageFtnInfo();
     SwPageFtnInfo( const SwPageFtnInfo& );

sw/source/core/layout/pagedesc.cxx

@@ -355,54 +355,54 @@ SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
     return 0;
 }
 
-SwPageFtnInfo::SwPageFtnInfo() :
-    nMaxHeight( 0 ),
-    nLineWidth(10),
-    eLineStyle( table::BorderLineStyle::SOLID ),
-    aWidth( 25, 100 ),
-    nTopDist( 57 ),         //1mm
-    nBottomDist( 57 )
-{
-    eAdj = FRMDIR_HORI_RIGHT_TOP == GetDefaultFrameDirection(GetAppLanguage()) ?
+SwPageFtnInfo::SwPageFtnInfo()
+    : m_nMaxHeight( 0 )
+    , m_nLineWidth(10)
+    , m_eLineStyle( table::BorderLineStyle::SOLID )
+    , m_Width( 25, 100 )
+    , m_nTopDist( 57 )         //1mm
+    , m_nBottomDist( 57 )
+{
+    m_eAdjust = FRMDIR_HORI_RIGHT_TOP == GetDefaultFrameDirection(GetAppLanguage()) ?
            FTNADJ_RIGHT :
            FTNADJ_LEFT;
 }
 
-SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy ) :
-    nMaxHeight( rCpy.GetHeight() ),
-    nLineWidth(rCpy.nLineWidth),
-    eLineStyle(rCpy.eLineStyle),
-    aLineColor(rCpy.aLineColor),
-    aWidth( rCpy.GetWidth() ),
-    eAdj( rCpy.GetAdj() ),
-    nTopDist( rCpy.GetTopDist() ),
-    nBottomDist( rCpy.GetBottomDist() )
+SwPageFtnInfo::SwPageFtnInfo( const SwPageFtnInfo &rCpy )
+    : m_nMaxHeight(rCpy.GetHeight())
+    , m_nLineWidth(rCpy.m_nLineWidth)
+    , m_eLineStyle(rCpy.m_eLineStyle)
+    , m_LineColor(rCpy.m_LineColor)
+    , m_Width(rCpy.GetWidth())
+    , m_eAdjust(rCpy.GetAdj())
+    , m_nTopDist(rCpy.GetTopDist())
+    , m_nBottomDist(rCpy.GetBottomDist())
 {
 }
 
 SwPageFtnInfo &SwPageFtnInfo::operator=( const SwPageFtnInfo& rCpy )
 {
-    nMaxHeight  = rCpy.GetHeight();
-    nLineWidth  = rCpy.nLineWidth;
-    eLineStyle  = rCpy.eLineStyle;
-    aLineColor  = rCpy.aLineColor;
-    aWidth      = rCpy.GetWidth();
-    eAdj        = rCpy.GetAdj();
-    nTopDist    = rCpy.GetTopDist();
-    nBottomDist = rCpy.GetBottomDist();
+    m_nMaxHeight  = rCpy.GetHeight();
+    m_nLineWidth  = rCpy.m_nLineWidth;
+    m_eLineStyle  = rCpy.m_eLineStyle;
+    m_LineColor   = rCpy.m_LineColor;
+    m_Width       = rCpy.GetWidth();
+    m_eAdjust     = rCpy.GetAdj();
+    m_nTopDist    = rCpy.GetTopDist();
+    m_nBottomDist = rCpy.GetBottomDist();
     return *this;
 }
 
 bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const
 {
-    return ( nMaxHeight == rCmp.GetHeight() &&
-             nLineWidth == rCmp.nLineWidth &&
-             eLineStyle == rCmp.eLineStyle &&
-             aLineColor == rCmp.aLineColor &&
-             aWidth     == rCmp.GetWidth() &&
-             eAdj       == rCmp.GetAdj() &&
-             nTopDist   == rCmp.GetTopDist() &&
-             nBottomDist== rCmp.GetBottomDist() );
+    return m_nMaxHeight == rCmp.GetHeight()
+        && m_nLineWidth == rCmp.m_nLineWidth
+        && m_eLineStyle == rCmp.m_eLineStyle
+        && m_LineColor  == rCmp.m_LineColor
+        && m_Width      == rCmp.GetWidth()
+        && m_eAdjust    == rCmp.GetAdj()
+        && m_nTopDist   == rCmp.GetTopDist()
+        && m_nBottomDist== rCmp.GetBottomDist();
 }
 
 SwPageDescExt::SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc * _pDoc)