[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/inc/ftnboss.hxx   |    8 ++++----
 sw/source/core/layout/ftnfrm.cxx |   20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit b684f4e548b2bd5d5ed264f1c84881462ef24f49
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jun 6 09:20:46 2017 +0200

    sw: prefix members of SwFootnoteBossFrame
    
    Change-Id: I9e9b1eee71ced50a76cff8d641628e451e045030
    Reviewed-on: https://gerrit.libreoffice.org/38428
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 709230a70dea..e92191726da9 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -53,7 +53,7 @@ class SwFootnoteBossFrame: public SwLayoutFrame
     friend class SwPageFrame; // for setting of MaxFootnoteHeight
 
     // max. height of the footnote container on this page
-    SwTwips nMaxFootnoteHeight;
+    SwTwips m_nMaxFootnoteHeight;
 
     SwFootnoteContFrame *MakeFootnoteCont();
     SwFootnoteFrame     *FindFirstFootnote();
@@ -66,12 +66,12 @@ protected:
 public:
     SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib )
         : SwLayoutFrame( pFormat, pSib )
-        , nMaxFootnoteHeight(0)
+        , m_nMaxFootnoteHeight(0)
         {}
 
                  SwLayoutFrame *FindBodyCont();
     inline const SwLayoutFrame *FindBodyCont() const;
-    void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; }
+    void SetMaxFootnoteHeight( const SwTwips nNewMax ) { m_nMaxFootnoteHeight = nNewMax; }
 
     // footnote interface
     void AppendFootnote( SwContentFrame *, SwTextFootnote * );
@@ -90,7 +90,7 @@ public:
     // Set DeadLine (in document coordinates) so that the text formatter can
     // temporarily limit footnote height.
     void    SetFootnoteDeadLine( const SwTwips nDeadLine );
-    SwTwips GetMaxFootnoteHeight() const { return nMaxFootnoteHeight; }
+    SwTwips GetMaxFootnoteHeight() const { return m_nMaxFootnoteHeight; }
 
     // returns value for remaining space until the body reaches minimal height
     SwTwips GetVarSpace() const;
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 78566f1a1535..8084d28e5a8b 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2389,26 +2389,26 @@ void SwFootnoteBossFrame::SetFootnoteDeadLine( const SwTwips nDeadLine )
     pBody->Calc(getRootFrame()->GetCurrShell()->GetOut());
 
     SwFrame *pCont = FindFootnoteCont();
-    const SwTwips nMax = nMaxFootnoteHeight;// current should exceed MaxHeight
+    const SwTwips nMax = m_nMaxFootnoteHeight;// current should exceed MaxHeight
     SwRectFnSet aRectFnSet(this);
     if ( pCont )
     {
         pCont->Calc(getRootFrame()->GetCurrShell()->GetOut());
-        nMaxFootnoteHeight = -aRectFnSet.BottomDist( pCont->Frame(), nDeadLine );
+        m_nMaxFootnoteHeight = -aRectFnSet.BottomDist( pCont->Frame(), nDeadLine );
     }
     else
-        nMaxFootnoteHeight = -aRectFnSet.BottomDist( pBody->Frame(), nDeadLine );
+        m_nMaxFootnoteHeight = -aRectFnSet.BottomDist( pBody->Frame(), nDeadLine );
 
     const SwViewShell *pSh = getRootFrame() ? getRootFrame()->GetCurrShell() : nullptr;
     if( pSh && pSh->GetViewOptions()->getBrowseMode() )
-        nMaxFootnoteHeight += pBody->Grow( LONG_MAX, true );
+        m_nMaxFootnoteHeight += pBody->Grow( LONG_MAX, true );
     if ( IsInSct() )
-        nMaxFootnoteHeight += FindSctFrame()->Grow( LONG_MAX, true );
+        m_nMaxFootnoteHeight += FindSctFrame()->Grow( LONG_MAX, true );
 
-    if ( nMaxFootnoteHeight < 0 )
-        nMaxFootnoteHeight = 0;
-    if ( nMax != LONG_MAX && nMaxFootnoteHeight > nMax )
-        nMaxFootnoteHeight = nMax;
+    if ( m_nMaxFootnoteHeight < 0 )
+        m_nMaxFootnoteHeight = 0;
+    if ( nMax != LONG_MAX && m_nMaxFootnoteHeight > nMax )
+        m_nMaxFootnoteHeight = nMax;
 }
 
 SwTwips SwFootnoteBossFrame::GetVarSpace() const
@@ -2772,7 +2772,7 @@ SwSaveFootnoteHeight::~SwSaveFootnoteHeight()
 {
     // If somebody tweaked the deadline meanwhile, we let it happen
     if ( nNewHeight == pBoss->GetMaxFootnoteHeight() )
-        pBoss->nMaxFootnoteHeight = nOldHeight;
+        pBoss->m_nMaxFootnoteHeight = nOldHeight;
 }
 
 #ifdef DBG_UTIL