sw/source/core/inc/layouter.hxx | 4 +-- sw/source/core/layout/layouter.cxx | 44 ++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 24 deletions(-)
New commits: commit fa76bbbe9869b0a009e6e05df1130fac5b4fc15a Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue May 19 08:01:55 2015 +0200 sw: prefix members of SwLayouter 2 members were prefixed, 2 not, it was confusing. Change-Id: I41940e5172ff1fcec8f90afc1b5389072d0869f4 diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index 3df42e9..54def9b 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -41,8 +41,8 @@ class SwLayoutFrm; class SwLayouter { - SwEndnoter* pEndnoter; - SwLooping* pLooping; + SwEndnoter* mpEndnoter; + SwLooping* mpLooping; void _CollectEndnotes( SwSectionFrm* pSect ); bool StartLooping( SwPageFrm* pPage ); diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx index 80e180c..ec26534 100644 --- a/sw/source/core/layout/layouter.cxx +++ b/sw/source/core/layout/layouter.cxx @@ -203,8 +203,8 @@ void SwLooping::Control( SwPageFrm* pPage ) } SwLayouter::SwLayouter() - : pEndnoter( NULL ), - pLooping( NULL ), + : mpEndnoter( NULL ), + mpLooping( NULL ), // #i28701# mpMovedFwdFrms( 0L ), // #i35911# @@ -214,8 +214,8 @@ SwLayouter::SwLayouter() SwLayouter::~SwLayouter() { - delete pEndnoter; - delete pLooping; + delete mpEndnoter; + delete mpLooping; // #i28701# delete mpMovedFwdFrms; mpMovedFwdFrms = 0L; @@ -226,37 +226,37 @@ SwLayouter::~SwLayouter() void SwLayouter::_CollectEndnotes( SwSectionFrm* pSect ) { - if( !pEndnoter ) - pEndnoter = new SwEndnoter( this ); - pEndnoter->CollectEndnotes( pSect ); + if( !mpEndnoter ) + mpEndnoter = new SwEndnoter( this ); + mpEndnoter->CollectEndnotes( pSect ); } bool SwLayouter::HasEndnotes() const { - return pEndnoter->HasEndnotes(); + return mpEndnoter->HasEndnotes(); } void SwLayouter::CollectEndnote( SwFtnFrm* pFtn ) { - pEndnoter->CollectEndnote( pFtn ); + mpEndnoter->CollectEndnote( pFtn ); } void SwLayouter::InsertEndnotes( SwSectionFrm* pSect ) { - if( !pEndnoter || pEndnoter->GetSect() != pSect ) + if( !mpEndnoter || mpEndnoter->GetSect() != pSect ) return; - pEndnoter->InsertEndnotes(); + mpEndnoter->InsertEndnotes(); } void SwLayouter::LoopControl( SwPageFrm* pPage, sal_uInt8 ) { - OSL_ENSURE( pLooping, "Looping: Lost control" ); - pLooping->Control( pPage ); + OSL_ENSURE( mpLooping, "Looping: Lost control" ); + mpLooping->Control( pPage ); } void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm ) { - if ( pLooping && pLooping->IsLoopingLouieLight() ) + if ( mpLooping && mpLooping->IsLoopingLouieLight() ) { #if OSL_DEBUG_LEVEL > 1 OSL_FAIL( "Looping Louie (Light): Fixating fractious frame" ); @@ -267,16 +267,16 @@ void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm ) bool SwLayouter::StartLooping( SwPageFrm* pPage ) { - if( pLooping ) + if( mpLooping ) return false; - pLooping = new SwLooping( pPage ); + mpLooping = new SwLooping( pPage ); return true; } void SwLayouter::EndLoopControl() { - delete pLooping; - pLooping = NULL; + delete mpLooping; + mpLooping = NULL; } void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect ) @@ -292,9 +292,9 @@ bool SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn ) if( !pDoc->getIDocumentLayoutAccess().GetLayouter() ) return false; SwLayouter *pLayouter = pDoc->getIDocumentLayoutAccess().GetLayouter(); - if( pLayouter->pEndnoter && pLayouter->pEndnoter->GetSect() && pSect && - ( pLayouter->pEndnoter->GetSect()->IsAnFollow( pSect ) || - pSect->IsAnFollow( pLayouter->pEndnoter->GetSect() ) ) ) + if( pLayouter->mpEndnoter && pLayouter->mpEndnoter->GetSect() && pSect && + ( pLayouter->mpEndnoter->GetSect()->IsAnFollow( pSect ) || + pSect->IsAnFollow( pLayouter->mpEndnoter->GetSect() ) ) ) { if( pFtn ) pLayouter->CollectEndnote( pFtn ); @@ -308,7 +308,7 @@ bool SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage ) OSL_ENSURE( pDoc, "No doc, no fun" ); if( !pDoc->getIDocumentLayoutAccess().GetLayouter() ) pDoc->getIDocumentLayoutAccess().SetLayouter( new SwLayouter() ); - return !pDoc->getIDocumentLayoutAccess().GetLayouter()->pLooping && + return !pDoc->getIDocumentLayoutAccess().GetLayouter()->mpLooping && pDoc->getIDocumentLayoutAccess().GetLayouter()->StartLooping( pPage ); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits