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

[Miklos Vajna]

 sw/source/core/inc/ftnfrm.hxx    |   38 +++++++++++++++++++-------------------
 sw/source/core/layout/ftnfrm.cxx |   28 ++++++++++++++--------------
 2 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 4b8214414b8713e8a969655494a244d117cb14af
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Aug 28 08:05:54 2017 +0200

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

diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index 15d8c78ea432..3d3fbb38171b 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -55,13 +55,13 @@ class SwFootnoteFrame: public SwLayoutFrame
     //  - 0     no following existent
     //  - this  for the last one
     //  - otherwise the following FootnoteFrame
-    SwFootnoteFrame     *pFollow;
-    SwFootnoteFrame     *pMaster;      // FootnoteFrame from which I am the following
-    SwContentFrame   *pRef;         // in this ContentFrame is the footnote reference
-    SwTextFootnote     *pAttr;        // footnote attribute (for recognition)
+    SwFootnoteFrame     *mpFollow;
+    SwFootnoteFrame     *mpMaster;      // FootnoteFrame from which I am the following
+    SwContentFrame   *mpReference;         // in this ContentFrame is the footnote reference
+    SwTextFootnote     *mpAttribute;        // footnote attribute (for recognition)
 
     // if true paragraphs in this footnote are NOT permitted to flow backwards
-    bool bBackMoveLocked : 1;
+    bool mbBackMoveLocked : 1;
     // #i49383# - control unlock of position of lower anchored objects.
     bool mbUnlockPosOfLowerObjs : 1;
 
@@ -79,30 +79,30 @@ public:
     const SwContentFrame *GetRef() const;
          SwContentFrame  *GetRef();
 #else
-    const SwContentFrame *GetRef() const    { return pRef; }
-         SwContentFrame  *GetRef()          { return pRef; }
+    const SwContentFrame *GetRef() const    { return mpReference; }
+         SwContentFrame  *GetRef()          { return mpReference; }
 #endif
     const SwContentFrame *GetRefFromAttr()  const;
           SwContentFrame *GetRefFromAttr();
 
-    const SwFootnoteFrame *GetFollow() const   { return pFollow; }
-          SwFootnoteFrame *GetFollow()         { return pFollow; }
+    const SwFootnoteFrame *GetFollow() const   { return mpFollow; }
+          SwFootnoteFrame *GetFollow()         { return mpFollow; }
 
-    const SwFootnoteFrame *GetMaster() const   { return pMaster; }
-          SwFootnoteFrame *GetMaster()         { return pMaster; }
+    const SwFootnoteFrame *GetMaster() const   { return mpMaster; }
+          SwFootnoteFrame *GetMaster()         { return mpMaster; }
 
-    const SwTextFootnote   *GetAttr() const   { return pAttr; }
-          SwTextFootnote   *GetAttr()         { return pAttr; }
+    const SwTextFootnote   *GetAttr() const   { return mpAttribute; }
+          SwTextFootnote   *GetAttr()         { return mpAttribute; }
 
-    void SetFollow( SwFootnoteFrame *pNew ) { pFollow = pNew; }
-    void SetMaster( SwFootnoteFrame *pNew ) { pMaster = pNew; }
-    void SetRef   ( SwContentFrame *pNew ) { pRef = pNew; }
+    void SetFollow( SwFootnoteFrame *pNew ) { mpFollow = pNew; }
+    void SetMaster( SwFootnoteFrame *pNew ) { mpMaster = pNew; }
+    void SetRef   ( SwContentFrame *pNew ) { mpReference = pNew; }
 
     void InvalidateNxtFootnoteCnts( SwPageFrame const * pPage );
 
-    void LockBackMove()     { bBackMoveLocked = true; }
-    void UnlockBackMove()   { bBackMoveLocked = false;}
-    bool IsBackMoveLocked() { return bBackMoveLocked; }
+    void LockBackMove()     { mbBackMoveLocked = true; }
+    void UnlockBackMove()   { mbBackMoveLocked = false;}
+    bool IsBackMoveLocked() { return mbBackMoveLocked; }
 
     // prevents that the last content deletes the SwFootnoteFrame as well (Cut())
     void ColLock()       { mbColLocked = true; }
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 79750ef898bf..ab84d11e1a34 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -418,11 +418,11 @@ SwTwips SwFootnoteContFrame::ShrinkFrame( SwTwips nDiff, bool bTst, bool bInfo )
 
 SwFootnoteFrame::SwFootnoteFrame( SwFrameFormat *pFormat, SwFrame* pSib, SwContentFrame *pCnt, SwTextFootnote *pAt ):
     SwLayoutFrame( pFormat, pSib ),
-    pFollow( nullptr ),
-    pMaster( nullptr ),
-    pRef( pCnt ),
-    pAttr( pAt ),
-    bBackMoveLocked( false ),
+    mpFollow( nullptr ),
+    mpMaster( nullptr ),
+    mpReference( pCnt ),
+    mpAttribute( pAt ),
+    mbBackMoveLocked( false ),
     // #i49383#
     mbUnlockPosOfLowerObjs( true )
 {
@@ -2758,19 +2758,19 @@ SwSaveFootnoteHeight::~SwSaveFootnoteHeight()
 const SwContentFrame* SwFootnoteFrame::GetRef() const
 {
     const SwContentFrame* pRefAttr = GetRefFromAttr();
-    SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr )
-            && !pRefAttr->IsAnFollow( pRef ),
+    SAL_WARN_IF( mpReference != pRefAttr && !mpReference->IsAnFollow( pRefAttr )
+            && !pRefAttr->IsAnFollow( mpReference ),
             "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" );
-    return pRef;
+    return mpReference;
 }
 
 SwContentFrame* SwFootnoteFrame::GetRef()
 {
     const SwContentFrame* pRefAttr = GetRefFromAttr();
-    SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr )
-            && !pRefAttr->IsAnFollow( pRef ),
+    SAL_WARN_IF( mpReference != pRefAttr && !mpReference->IsAnFollow( pRefAttr )
+            && !pRefAttr->IsAnFollow( mpReference ),
             "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" );
-    return pRef;
+    return mpReference;
 }
 #endif
 
@@ -2782,9 +2782,9 @@ const SwContentFrame* SwFootnoteFrame::GetRefFromAttr()  const
 
 SwContentFrame* SwFootnoteFrame::GetRefFromAttr()
 {
-    assert(pAttr && "invalid Attribute");
-    SwTextNode& rTNd = const_cast<SwTextNode&>(pAttr->GetTextNode());
-    SwPosition aPos( rTNd, SwIndex( &rTNd, pAttr->GetStart() ));
+    assert(mpAttribute && "invalid Attribute");
+    SwTextNode& rTNd = const_cast<SwTextNode&>(mpAttribute->GetTextNode());
+    SwPosition aPos( rTNd, SwIndex( &rTNd, mpAttribute->GetStart() ));
     SwContentFrame* pCFrame = rTNd.getLayoutFrame( getRootFrame(), nullptr, &aPos, false );
     return pCFrame;
 }