From ef342691ebb130c0615282d7b88d724e85c6011f Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 18 Dec 2014 22:25:35 +0100
Subject: sw: prefix SwLayoutFrm members

Change-Id: If961ecfe27c6f478f030bab746278b885482b229
---
 sw/source/core/inc/layfrm.hxx   | 11 ++++++-----
 sw/source/core/layout/ssfrm.cxx |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index e47fbda54ead..fa16b142ef94 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -54,7 +54,7 @@ protected:
     virtual void MakeAll() SAL_OVERRIDE;
 
     SwFrm * m_pLower;
-    std::vector<SwAnchoredObject*> aVertPosOrientFrmsFor;
+    std::vector<SwAnchoredObject*> m_VertPosOrientFrmsFor;
 
     virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
     virtual SwTwips GrowFrm  ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
@@ -178,14 +178,15 @@ public:
 
     void SetVertPosOrientFrmFor(SwAnchoredObject *pObj)
     {
-        aVertPosOrientFrmsFor.push_back(pObj);
+        m_VertPosOrientFrmsFor.push_back(pObj);
     }
 
     void ClearVertPosOrientFrmFor(SwAnchoredObject *pObj)
     {
-        aVertPosOrientFrmsFor.erase(
-            std::remove(aVertPosOrientFrmsFor.begin(),
-                aVertPosOrientFrmsFor.end(), pObj), aVertPosOrientFrmsFor.end());
+        m_VertPosOrientFrmsFor.erase(
+            std::remove(m_VertPosOrientFrmsFor.begin(),
+                m_VertPosOrientFrmsFor.end(), pObj),
+            m_VertPosOrientFrmsFor.end());
     }
 };
 
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 10ca392e10bf..a4aa372c1c40 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -432,13 +432,13 @@ void SwCntntFrm::RegisterToNode( SwCntntNode& rNode )
 
 void SwLayoutFrm::Destroy()
 {
-    while (!aVertPosOrientFrmsFor.empty())
+    while (!m_VertPosOrientFrmsFor.empty())
     {
-        SwAnchoredObject *pObj = *aVertPosOrientFrmsFor.begin();
+        SwAnchoredObject *pObj = *m_VertPosOrientFrmsFor.begin();
         pObj->ClearVertPosOrientFrm();
     }
 
-    assert(aVertPosOrientFrmsFor.empty());
+    assert(m_VertPosOrientFrmsFor.empty());
 
     SwFrm *pFrm = m_pLower;
 
-- 
cgit