Kaydet (Commit) fa76bbbe authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwLayouter

2 members were prefixed, 2 not, it was confusing.

Change-Id: I41940e5172ff1fcec8f90afc1b5389072d0869f4
üst 5f653490
...@@ -41,8 +41,8 @@ class SwLayoutFrm; ...@@ -41,8 +41,8 @@ class SwLayoutFrm;
class SwLayouter class SwLayouter
{ {
SwEndnoter* pEndnoter; SwEndnoter* mpEndnoter;
SwLooping* pLooping; SwLooping* mpLooping;
void _CollectEndnotes( SwSectionFrm* pSect ); void _CollectEndnotes( SwSectionFrm* pSect );
bool StartLooping( SwPageFrm* pPage ); bool StartLooping( SwPageFrm* pPage );
......
...@@ -203,8 +203,8 @@ void SwLooping::Control( SwPageFrm* pPage ) ...@@ -203,8 +203,8 @@ void SwLooping::Control( SwPageFrm* pPage )
} }
SwLayouter::SwLayouter() SwLayouter::SwLayouter()
: pEndnoter( NULL ), : mpEndnoter( NULL ),
pLooping( NULL ), mpLooping( NULL ),
// #i28701# // #i28701#
mpMovedFwdFrms( 0L ), mpMovedFwdFrms( 0L ),
// #i35911# // #i35911#
...@@ -214,8 +214,8 @@ SwLayouter::SwLayouter() ...@@ -214,8 +214,8 @@ SwLayouter::SwLayouter()
SwLayouter::~SwLayouter() SwLayouter::~SwLayouter()
{ {
delete pEndnoter; delete mpEndnoter;
delete pLooping; delete mpLooping;
// #i28701# // #i28701#
delete mpMovedFwdFrms; delete mpMovedFwdFrms;
mpMovedFwdFrms = 0L; mpMovedFwdFrms = 0L;
...@@ -226,37 +226,37 @@ SwLayouter::~SwLayouter() ...@@ -226,37 +226,37 @@ SwLayouter::~SwLayouter()
void SwLayouter::_CollectEndnotes( SwSectionFrm* pSect ) void SwLayouter::_CollectEndnotes( SwSectionFrm* pSect )
{ {
if( !pEndnoter ) if( !mpEndnoter )
pEndnoter = new SwEndnoter( this ); mpEndnoter = new SwEndnoter( this );
pEndnoter->CollectEndnotes( pSect ); mpEndnoter->CollectEndnotes( pSect );
} }
bool SwLayouter::HasEndnotes() const bool SwLayouter::HasEndnotes() const
{ {
return pEndnoter->HasEndnotes(); return mpEndnoter->HasEndnotes();
} }
void SwLayouter::CollectEndnote( SwFtnFrm* pFtn ) void SwLayouter::CollectEndnote( SwFtnFrm* pFtn )
{ {
pEndnoter->CollectEndnote( pFtn ); mpEndnoter->CollectEndnote( pFtn );
} }
void SwLayouter::InsertEndnotes( SwSectionFrm* pSect ) void SwLayouter::InsertEndnotes( SwSectionFrm* pSect )
{ {
if( !pEndnoter || pEndnoter->GetSect() != pSect ) if( !mpEndnoter || mpEndnoter->GetSect() != pSect )
return; return;
pEndnoter->InsertEndnotes(); mpEndnoter->InsertEndnotes();
} }
void SwLayouter::LoopControl( SwPageFrm* pPage, sal_uInt8 ) void SwLayouter::LoopControl( SwPageFrm* pPage, sal_uInt8 )
{ {
OSL_ENSURE( pLooping, "Looping: Lost control" ); OSL_ENSURE( mpLooping, "Looping: Lost control" );
pLooping->Control( pPage ); mpLooping->Control( pPage );
} }
void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm ) void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm )
{ {
if ( pLooping && pLooping->IsLoopingLouieLight() ) if ( mpLooping && mpLooping->IsLoopingLouieLight() )
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_FAIL( "Looping Louie (Light): Fixating fractious frame" ); OSL_FAIL( "Looping Louie (Light): Fixating fractious frame" );
...@@ -267,16 +267,16 @@ void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm ) ...@@ -267,16 +267,16 @@ void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm )
bool SwLayouter::StartLooping( SwPageFrm* pPage ) bool SwLayouter::StartLooping( SwPageFrm* pPage )
{ {
if( pLooping ) if( mpLooping )
return false; return false;
pLooping = new SwLooping( pPage ); mpLooping = new SwLooping( pPage );
return true; return true;
} }
void SwLayouter::EndLoopControl() void SwLayouter::EndLoopControl()
{ {
delete pLooping; delete mpLooping;
pLooping = NULL; mpLooping = NULL;
} }
void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect ) void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect )
...@@ -292,9 +292,9 @@ bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ) ...@@ -292,9 +292,9 @@ bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn )
if( !pDoc->getIDocumentLayoutAccess().GetLayouter() ) if( !pDoc->getIDocumentLayoutAccess().GetLayouter() )
return false; return false;
SwLayouter *pLayouter = pDoc->getIDocumentLayoutAccess().GetLayouter(); SwLayouter *pLayouter = pDoc->getIDocumentLayoutAccess().GetLayouter();
if( pLayouter->pEndnoter && pLayouter->pEndnoter->GetSect() && pSect && if( pLayouter->mpEndnoter && pLayouter->mpEndnoter->GetSect() && pSect &&
( pLayouter->pEndnoter->GetSect()->IsAnFollow( pSect ) || ( pLayouter->mpEndnoter->GetSect()->IsAnFollow( pSect ) ||
pSect->IsAnFollow( pLayouter->pEndnoter->GetSect() ) ) ) pSect->IsAnFollow( pLayouter->mpEndnoter->GetSect() ) ) )
{ {
if( pFtn ) if( pFtn )
pLayouter->CollectEndnote( pFtn ); pLayouter->CollectEndnote( pFtn );
...@@ -308,7 +308,7 @@ bool SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage ) ...@@ -308,7 +308,7 @@ bool SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage )
OSL_ENSURE( pDoc, "No doc, no fun" ); OSL_ENSURE( pDoc, "No doc, no fun" );
if( !pDoc->getIDocumentLayoutAccess().GetLayouter() ) if( !pDoc->getIDocumentLayoutAccess().GetLayouter() )
pDoc->getIDocumentLayoutAccess().SetLayouter( new SwLayouter() ); pDoc->getIDocumentLayoutAccess().SetLayouter( new SwLayouter() );
return !pDoc->getIDocumentLayoutAccess().GetLayouter()->pLooping && return !pDoc->getIDocumentLayoutAccess().GetLayouter()->mpLooping &&
pDoc->getIDocumentLayoutAccess().GetLayouter()->StartLooping( pPage ); pDoc->getIDocumentLayoutAccess().GetLayouter()->StartLooping( pPage );
} }
......
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