Kaydet (Commit) b684f4e5 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwFootnoteBossFrame

Change-Id: I9e9b1eee71ced50a76cff8d641628e451e045030
Reviewed-on: https://gerrit.libreoffice.org/38428Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst f2396945
...@@ -53,7 +53,7 @@ class SwFootnoteBossFrame: public SwLayoutFrame ...@@ -53,7 +53,7 @@ class SwFootnoteBossFrame: public SwLayoutFrame
friend class SwPageFrame; // for setting of MaxFootnoteHeight friend class SwPageFrame; // for setting of MaxFootnoteHeight
// max. height of the footnote container on this page // max. height of the footnote container on this page
SwTwips nMaxFootnoteHeight; SwTwips m_nMaxFootnoteHeight;
SwFootnoteContFrame *MakeFootnoteCont(); SwFootnoteContFrame *MakeFootnoteCont();
SwFootnoteFrame *FindFirstFootnote(); SwFootnoteFrame *FindFirstFootnote();
...@@ -66,12 +66,12 @@ protected: ...@@ -66,12 +66,12 @@ protected:
public: public:
SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib ) SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib )
: SwLayoutFrame( pFormat, pSib ) : SwLayoutFrame( pFormat, pSib )
, nMaxFootnoteHeight(0) , m_nMaxFootnoteHeight(0)
{} {}
SwLayoutFrame *FindBodyCont(); SwLayoutFrame *FindBodyCont();
inline const SwLayoutFrame *FindBodyCont() const; inline const SwLayoutFrame *FindBodyCont() const;
void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; } void SetMaxFootnoteHeight( const SwTwips nNewMax ) { m_nMaxFootnoteHeight = nNewMax; }
// footnote interface // footnote interface
void AppendFootnote( SwContentFrame *, SwTextFootnote * ); void AppendFootnote( SwContentFrame *, SwTextFootnote * );
...@@ -90,7 +90,7 @@ public: ...@@ -90,7 +90,7 @@ public:
// Set DeadLine (in document coordinates) so that the text formatter can // Set DeadLine (in document coordinates) so that the text formatter can
// temporarily limit footnote height. // temporarily limit footnote height.
void SetFootnoteDeadLine( const SwTwips nDeadLine ); 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 // returns value for remaining space until the body reaches minimal height
SwTwips GetVarSpace() const; SwTwips GetVarSpace() const;
......
...@@ -2389,26 +2389,26 @@ void SwFootnoteBossFrame::SetFootnoteDeadLine( const SwTwips nDeadLine ) ...@@ -2389,26 +2389,26 @@ void SwFootnoteBossFrame::SetFootnoteDeadLine( const SwTwips nDeadLine )
pBody->Calc(getRootFrame()->GetCurrShell()->GetOut()); pBody->Calc(getRootFrame()->GetCurrShell()->GetOut());
SwFrame *pCont = FindFootnoteCont(); SwFrame *pCont = FindFootnoteCont();
const SwTwips nMax = nMaxFootnoteHeight;// current should exceed MaxHeight const SwTwips nMax = m_nMaxFootnoteHeight;// current should exceed MaxHeight
SwRectFnSet aRectFnSet(this); SwRectFnSet aRectFnSet(this);
if ( pCont ) if ( pCont )
{ {
pCont->Calc(getRootFrame()->GetCurrShell()->GetOut()); pCont->Calc(getRootFrame()->GetCurrShell()->GetOut());
nMaxFootnoteHeight = -aRectFnSet.BottomDist( pCont->Frame(), nDeadLine ); m_nMaxFootnoteHeight = -aRectFnSet.BottomDist( pCont->Frame(), nDeadLine );
} }
else else
nMaxFootnoteHeight = -aRectFnSet.BottomDist( pBody->Frame(), nDeadLine ); m_nMaxFootnoteHeight = -aRectFnSet.BottomDist( pBody->Frame(), nDeadLine );
const SwViewShell *pSh = getRootFrame() ? getRootFrame()->GetCurrShell() : nullptr; const SwViewShell *pSh = getRootFrame() ? getRootFrame()->GetCurrShell() : nullptr;
if( pSh && pSh->GetViewOptions()->getBrowseMode() ) if( pSh && pSh->GetViewOptions()->getBrowseMode() )
nMaxFootnoteHeight += pBody->Grow( LONG_MAX, true ); m_nMaxFootnoteHeight += pBody->Grow( LONG_MAX, true );
if ( IsInSct() ) if ( IsInSct() )
nMaxFootnoteHeight += FindSctFrame()->Grow( LONG_MAX, true ); m_nMaxFootnoteHeight += FindSctFrame()->Grow( LONG_MAX, true );
if ( nMaxFootnoteHeight < 0 ) if ( m_nMaxFootnoteHeight < 0 )
nMaxFootnoteHeight = 0; m_nMaxFootnoteHeight = 0;
if ( nMax != LONG_MAX && nMaxFootnoteHeight > nMax ) if ( nMax != LONG_MAX && m_nMaxFootnoteHeight > nMax )
nMaxFootnoteHeight = nMax; m_nMaxFootnoteHeight = nMax;
} }
SwTwips SwFootnoteBossFrame::GetVarSpace() const SwTwips SwFootnoteBossFrame::GetVarSpace() const
...@@ -2772,7 +2772,7 @@ SwSaveFootnoteHeight::~SwSaveFootnoteHeight() ...@@ -2772,7 +2772,7 @@ SwSaveFootnoteHeight::~SwSaveFootnoteHeight()
{ {
// If somebody tweaked the deadline meanwhile, we let it happen // If somebody tweaked the deadline meanwhile, we let it happen
if ( nNewHeight == pBoss->GetMaxFootnoteHeight() ) if ( nNewHeight == pBoss->GetMaxFootnoteHeight() )
pBoss->nMaxFootnoteHeight = nOldHeight; pBoss->m_nMaxFootnoteHeight = nOldHeight;
} }
#ifdef DBG_UTIL #ifdef DBG_UTIL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment