summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/frmtool.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-02-09 11:35:20 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-02-09 12:07:15 +0100
commit13003431bface864af739188b1a76a6b9177a1fe (patch)
tree8b73853960d0616cb7e4da86a532eba15882caf1 /sw/source/core/layout/frmtool.cxx
parent0efe5cf57e524aa197fbb57aee8a5548cb32f34a (diff)
SwFrm: rename member variables missing their prefix
Change-Id: I88e7abb29e18859ae4fdce5a613e6d233f9d27a1
Diffstat (limited to 'sw/source/core/layout/frmtool.cxx')
-rw-r--r--sw/source/core/layout/frmtool.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index f0bafdec0c7f..8b43fe66850f 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2506,13 +2506,13 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
if ( pFloat->GetNext() )
{
if( bGo )
- pFloat->pUpper = NULL;
+ pFloat->mpUpper = NULL;
pFloat = pFloat->GetNext();
if( !bGo && pFloat == pStart )
{
bGo = true;
- pFloat->pPrev->pNext = NULL;
- pFloat->pPrev = NULL;
+ pFloat->mpPrev->mpNext = NULL;
+ pFloat->mpPrev = NULL;
}
}
else
@@ -2523,7 +2523,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
//Die naechste Teilkette suchen und die Ketten miteinander verbinden.
SwFrm *pTmp = pFloat->FindNext();
if( bGo )
- pFloat->pUpper = NULL;
+ pFloat->mpUpper = NULL;
if( !pLay->IsInFtn() )
while( pTmp && pTmp->IsInFtn() )
@@ -2534,8 +2534,8 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
if ( pTmp && bGo )
{
- pFloat->pNext = pTmp; //Die beiden Ketten verbinden.
- pFloat->pNext->pPrev = pFloat;
+ pFloat->mpNext = pTmp; //Die beiden Ketten verbinden.
+ pFloat->mpNext->mpPrev = pFloat;
}
pFloat = pTmp;
bGo = bGo || ( pStart == pFloat );
@@ -2614,12 +2614,12 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
pPage->InvalidatePage( pPage ); //Invalides Layout anmelden.
//Vorgaenger festellen und die Verbindung herstellen bzw. initialisieren.
- pSav->pPrev = pSibling;
+ pSav->mpPrev = pSibling;
SwFrm* pNxt;
if ( pSibling )
{
- pNxt = pSibling->pNext;
- pSibling->pNext = pSav;
+ pNxt = pSibling->mpNext;
+ pSibling->mpNext = pSav;
pSibling->_InvalidatePrt();
((SwCntntFrm*)pSibling)->InvalidatePage( pPage );//Invaliden Cntnt anmelden.
if ( ((SwCntntFrm*)pSibling)->GetFollow() )
@@ -2628,7 +2628,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
else
{ pNxt = pParent->pLower;
pParent->pLower = pSav;
- pSav->pUpper = pParent; //Schon mal setzen, sonst ist fuer das
+ pSav->mpUpper = pParent; //Schon mal setzen, sonst ist fuer das
//invalidate der Parent (z.B. ein Fly) nicht klar.
//Invaliden Cntnt anmelden.
if ( pSav->IsCntntFrm() )
@@ -2645,7 +2645,7 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
SwTwips nGrowVal = 0;
SwFrm* pLast;
do
- { pSav->pUpper = pParent;
+ { pSav->mpUpper = pParent;
nGrowVal += (pSav->Frm().*fnRect->fnGetHeight)();
pSav->_InvalidateAll();
@@ -2680,8 +2680,8 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
if( pNxt )
{
- pLast->pNext = pNxt;
- pNxt->pPrev = pLast;
+ pLast->mpNext = pNxt;
+ pNxt->mpPrev = pLast;
}
if ( bGrow )