sw: prefix members of SwPageDescExt

Change-Id: Ie45dbf981dd63181450b471408879cf8c01655d1

sw/inc/pagedesc.hxx

@@ -322,12 +322,12 @@ inline const SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) const
 class SwPageDescExt
 {
 public:
-    SwPageDesc aPageDesc;
+    SwPageDesc m_PageDesc;
 private:
-    SwDoc * pDoc;
-    OUString sFollow;
+    SwDoc * m_pDoc;
+    OUString m_sFollow;
 
-    void SetPageDesc(const SwPageDesc & aPageDesc);
+    void SetPageDesc(const SwPageDesc & rPageDesc);
 
 public:
     SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc * pDoc);

sw/source/core/layout/pagedesc.cxx

@@ -405,16 +405,18 @@ bool SwPageFtnInfo::operator==( const SwPageFtnInfo& rCmp ) const
         && m_nBottomDist== rCmp.GetBottomDist();
 }
 
-SwPageDescExt::SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc * _pDoc)
-    : aPageDesc(rPageDesc), pDoc(_pDoc)
+SwPageDescExt::SwPageDescExt(const SwPageDesc & rPageDesc, SwDoc *const pDoc)
+    : m_PageDesc(rPageDesc)
+    , m_pDoc(pDoc)
 {
     SetPageDesc(rPageDesc);
 }
 
 SwPageDescExt::SwPageDescExt(const SwPageDescExt & rSrc)
-    : aPageDesc(rSrc.aPageDesc), pDoc(rSrc.pDoc)
+    : m_PageDesc(rSrc.m_PageDesc)
+    , m_pDoc(rSrc.m_pDoc)
 {
-    SetPageDesc(rSrc.aPageDesc);
+    SetPageDesc(rSrc.m_PageDesc);
 }
 
 SwPageDescExt::~SwPageDescExt()
@@ -423,15 +425,15 @@ SwPageDescExt::~SwPageDescExt()
 
 OUString SwPageDescExt::GetName() const
 {
-    return aPageDesc.GetName();
+    return m_PageDesc.GetName();
 }
 
-void SwPageDescExt::SetPageDesc(const SwPageDesc & _aPageDesc)
+void SwPageDescExt::SetPageDesc(const SwPageDesc & rPageDesc)
 {
-    aPageDesc = _aPageDesc;
+    m_PageDesc = rPageDesc;
 
-    if (aPageDesc.GetFollow())
-        sFollow = aPageDesc.GetFollow()->GetName();
+    if (m_PageDesc.GetFollow())
+        m_sFollow = m_PageDesc.GetFollow()->GetName();
 }
 
 SwPageDescExt & SwPageDescExt::operator = (const SwPageDesc & rSrc)
@@ -443,16 +445,16 @@ SwPageDescExt & SwPageDescExt::operator = (const SwPageDesc & rSrc)
 
 SwPageDescExt & SwPageDescExt::operator = (const SwPageDescExt & rSrc)
 {
-    SetPageDesc(rSrc.aPageDesc);
+    SetPageDesc(rSrc.m_PageDesc);
 
     return *this;
 }
 
 SwPageDescExt::operator SwPageDesc() const
 {
-    SwPageDesc aResult(aPageDesc);
+    SwPageDesc aResult(m_PageDesc);
 
-    SwPageDesc * pPageDesc = pDoc->FindPageDesc(sFollow);
+    SwPageDesc * pPageDesc = m_pDoc->FindPageDesc(m_sFollow);
 
     if ( 0 != pPageDesc )
         aResult.SetFollow(pPageDesc);

sw/source/core/undo/SwUndoPageDesc.cxx

@@ -107,8 +107,8 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
     OSL_ENSURE(0 != pDoc, "no document?");
 
 #if OSL_DEBUG_LEVEL > 1
-    DebugHeaderFooterContent( aOld.aPageDesc );
-    DebugHeaderFooterContent( aNew.aPageDesc );
+    DebugHeaderFooterContent( aOld.m_PageDesc );
+    DebugHeaderFooterContent( aNew.m_PageDesc );
 #endif
 
     /*
@@ -118,8 +118,8 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
     But this happens, this Undo Ctor will destroy the unnecessary duplicate and manipulate the
     content pointer of the both page descriptions.
     */
-    SwPageDesc &rOldDesc = aOld.aPageDesc;
-    SwPageDesc &rNewDesc = aNew.aPageDesc;
+    SwPageDesc &rOldDesc = aOld.m_PageDesc;
+    SwPageDesc &rNewDesc = aNew.m_PageDesc;
     const SwFmtHeader& rOldHead = rOldDesc.GetMaster().GetHeader();
     const SwFmtHeader& rNewHead = rNewDesc.GetMaster().GetHeader();
     const SwFmtFooter& rOldFoot = rOldDesc.GetMaster().GetFooter();
@@ -182,10 +182,10 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
 
         // After this exchange method the old page description will point to zero,
         // the new one will point to the node position of the original content nodes.
-        ExchangeContentNodes( aOld.aPageDesc, aNew.aPageDesc );
+        ExchangeContentNodes( aOld.m_PageDesc, aNew.m_PageDesc );
 #if OSL_DEBUG_LEVEL > 1
-        DebugHeaderFooterContent( aOld.aPageDesc );
-        DebugHeaderFooterContent( aNew.aPageDesc );
+        DebugHeaderFooterContent( aOld.m_PageDesc );
+        DebugHeaderFooterContent( aNew.m_PageDesc );
 #endif
     }
 }
@@ -340,7 +340,7 @@ void SwUndoPageDesc::UndoImpl(::sw::UndoRedoContext &)
 {
     // Move (header/footer)content node responsibility from new page descriptor to old one again.
     if( bExchange )
-        ExchangeContentNodes( aNew.aPageDesc, aOld.aPageDesc );
+        ExchangeContentNodes( aNew.m_PageDesc, aOld.m_PageDesc );
     pDoc->ChgPageDesc(aOld.GetName(), aOld);
 }
 
@@ -348,7 +348,7 @@ void SwUndoPageDesc::RedoImpl(::sw::UndoRedoContext &)
 {
     // Move (header/footer)content node responsibility from old page descriptor to new one again.
     if( bExchange )
-        ExchangeContentNodes( aOld.aPageDesc, aNew.aPageDesc );
+        ExchangeContentNodes( aOld.m_PageDesc, aNew.m_PageDesc );
     pDoc->ChgPageDesc(aNew.GetName(), aNew);
 }