Kaydet (Commit) ef342691 authored tarafından Michael Stahl's avatar Michael Stahl

sw: prefix SwLayoutFrm members

Change-Id: If961ecfe27c6f478f030bab746278b885482b229
üst 296e8b59
......@@ -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());
}
};
......
......@@ -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;
......
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