From 64b326811e26e6e3fa6a129e5e03341d044521c9 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 4 Apr 2015 13:59:36 +0200 Subject: sw: prefix members of SwRootFrm Change-Id: I146fa693e89b00c77df33547971fb3a49c7e1b34 Reviewed-on: https://gerrit.libreoffice.org/15148 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/source/core/inc/rootfrm.hxx | 160 ++++++++++++++++++------------------- sw/source/core/layout/newfrm.cxx | 118 +++++++++++++-------------- sw/source/core/layout/pagechg.cxx | 20 ++--- sw/source/core/layout/paintfrm.cxx | 14 ++-- sw/source/core/layout/sectfrm.cxx | 20 ++--- sw/source/core/layout/virtoutp.cxx | 8 +- 6 files changed, 170 insertions(+), 170 deletions(-) (limited to 'sw') diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 8d91b2cc93a4..b5dc726885f7 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -56,12 +56,12 @@ class SwRootFrm: public SwLayoutFrm // Needs to disable the Superfluous temporarily friend void AdjustSizeChgNotify( SwRootFrm *pRoot ); - // Maintains the pLastPage (Cut() and Paste() of SwPageFrm + // Maintains the mpLastPage (Cut() and Paste() of SwPageFrm friend inline void SetLastPage( SwPageFrm* ); // For creating and destroying of the virtual output device manager - friend void _FrmInit(); // Creates pVout - friend void _FrmFinit(); // Destroys pVout + friend void _FrmInit(); // Creates mpVout + friend void _FrmFinit(); // Destroys mpVout std::vector maPageRects;// returns the current rectangle for each page frame // the rectangle is extended to the top/bottom/left/right @@ -74,70 +74,70 @@ class SwRootFrm: public SwLayoutFrm bool mbNeedGrammarCheck; // true when sth needs to be checked (not necessarily started yet!) - static SwLayVout *pVout; - static bool bInPaint; // Protection against double Paints - static bool bNoVirDev;// No virt. Device for SystemPaints - - bool bCheckSuperfluous :1; // Search for empty Pages? - bool bIdleFormat :1; // Trigger Idle Formatter? - bool bBrowseWidthValid :1; // Is nBrowseWidth valid? - bool bTurboAllowed :1; - bool bAssertFlyPages :1; // Insert more Pages for Flys if needed? - bool bIsVirtPageNum :1; // Do we have a virtual pagenumber? - bool bIsNewLayout :1; // Layout loaded or newly created - bool bCallbackActionEnabled:1; // No Action in Notification desired + static SwLayVout *mpVout; + static bool mbInPaint; // Protection against double Paints + static bool mbNoVirDev;// No virt. Device for SystemPaints + + bool mbCheckSuperfluous :1; // Search for empty Pages? + bool mbIdleFormat :1; // Trigger Idle Formatter? + bool mbBrowseWidthValid :1; // Is mnBrowseWidth valid? + bool mbTurboAllowed :1; + bool mbAssertFlyPages :1; // Insert more Pages for Flys if needed? + bool mbIsVirtPageNum :1; // Do we have a virtual pagenumber? + bool mbIsNewLayout :1; // Layout loaded or newly created + bool mbCallbackActionEnabled:1; // No Action in Notification desired // @see dcontact.cxx, ::Changed() - bool bLayoutFreezed; + bool mbLayoutFreezed; /** * For BrowseMode - * nBrowseWidth is the outer margin of the object most to the right. + * mnBrowseWidth is the outer margin of the object most to the right. * The page's right edge should not be smaller than this value. */ - long nBrowseWidth; + long mnBrowseWidth; - /// If we only have to format one CntntFrm, its in pTurbo - const SwCntntFrm *pTurbo; + /// If we only have to format one CntntFrm, its in mpTurbo + const SwCntntFrm *mpTurbo; /// We should not need to always struggle to find the last page, so store it here - SwPageFrm *pLastPage; + SwPageFrm *mpLastPage; /** [ Comment from the original StarOffice checkin ]: * The root takes care of the shell access. Via the document * it should be possible to get at the root frame, and thus always * have access to the shell. - * the pointer pCurrShell is the pointer to any of the shells for + * the pointer mpCurrShell is the pointer to any of the shells for * the document. * Because sometimes it matters which shell is used, it is necessary to * know the active shell. - * this is approximated by setting the pointer pCurrShell when a + * this is approximated by setting the pointer mpCurrShell when a * shell gets the focus (FEShell). Acditionally the pointer will be * set temporarily by SwCurrShell typically via SET_CURR_SHELL * The macro and class can be found in the SwViewShell. These object can * be created nested (also for different kinds of Shells). They are - * collected into the Array pCurrShells. + * collected into the Array mpCurrShells. * Furthermore it can happen that a shell is activated while a curshell - * object is still 'active'. This one will be entered into pWaitingCurrShell + * object is still 'active'. This one will be entered into mpWaitingCurrShell * and will be activated by the last d'tor of CurrShell. * One other problem is the destruction of a shell while it is active. - * The pointer pCurrShell is then reset to an arbitrary other shell. + * The pointer mpCurrShell is then reset to an arbitrary other shell. * If at the time of the destruction of a shell, which is still referneced * by a curshell object, that will be cleaned up as well. */ friend class CurrShell; friend void SetShell( SwViewShell *pSh ); friend void InitCurrShells( SwRootFrm *pRoot ); - SwViewShell *pCurrShell; - SwViewShell *pWaitingCurrShell; - SwCurrShells *pCurrShells; + SwViewShell *mpCurrShell; + SwViewShell *mpWaitingCurrShell; + SwCurrShells *mpCurrShells; /// One Page per DrawModel per Document; is always the size of the Root - SdrPage *pDrawPage; + SdrPage *mpDrawPage; - SwDestroyList* pDestroy; + SwDestroyList* mpDestroy; - sal_uInt16 nPhyPageNums; /// Page count - sal_uInt16 nAccessibleShells; // Number of accessible shells + sal_uInt16 mnPhyPageNums; /// Page count + sal_uInt16 mnAccessibleShells; // Number of accessible shells void ImplCalcBrowseWidth(); void ImplInvalidateBrowseWidth(); @@ -170,7 +170,7 @@ public: virtual ~SwRootFrm(); void Init(SwFrmFmt*); - SwViewShell *GetCurrShell() const { return pCurrShell; } + SwViewShell *GetCurrShell() const { return mpCurrShell; } void DeRegisterShell( SwViewShell *pSh ); /** @@ -190,9 +190,9 @@ public: void UnoRemoveAllActions(); void UnoRestoreAllActions(); - const SdrPage* GetDrawPage() const { return pDrawPage; } - SdrPage* GetDrawPage() { return pDrawPage; } - void SetDrawPage( SdrPage* pNew ){ pDrawPage = pNew; } + const SdrPage* GetDrawPage() const { return mpDrawPage; } + SdrPage* GetDrawPage() { return mpDrawPage; } + void SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; } virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0, bool bTestBackground = false ) const SAL_OVERRIDE; @@ -214,16 +214,16 @@ public: void SetIdleFlags() { - bIdleFormat = true; + mbIdleFormat = true; - SwViewShell* lcl_pCurrShell = GetCurrShell(); + SwViewShell* pCurrShell = GetCurrShell(); // May be NULL if called from SfxBaseModel::dispose // (this happens in the build test 'rtfexport'). - if (lcl_pCurrShell != NULL) - lcl_pCurrShell->GetDoc()->getIDocumentTimerAccess().StartBackgroundJobs(); + if (pCurrShell != NULL) + pCurrShell->GetDoc()->getIDocumentTimerAccess().StartBackgroundJobs(); } - bool IsIdleFormat() const { return bIdleFormat; } - void ResetIdleFormat() { bIdleFormat = false; } + bool IsIdleFormat() const { return mbIdleFormat; } + void ResetIdleFormat() { mbIdleFormat = false; } bool IsNeedGrammarCheck() const { return mbNeedGrammarCheck; } void SetNeedGrammarCheck( bool bVal ) @@ -232,18 +232,18 @@ public: if ( bVal ) { - SwViewShell* lcl_pCurrShell = GetCurrShell(); + SwViewShell* pCurrShell = GetCurrShell(); // May be NULL if called from SfxBaseModel::dispose // (this happens in the build test 'rtfexport'). - if (lcl_pCurrShell != NULL) - lcl_pCurrShell->GetDoc()->getIDocumentTimerAccess().StartBackgroundJobs(); + if (pCurrShell != NULL) + pCurrShell->GetDoc()->getIDocumentTimerAccess().StartBackgroundJobs(); } } /// Makes sure that all requested page-bound Flys find a Page - void SetAssertFlyPages() { bAssertFlyPages = true; } + void SetAssertFlyPages() { mbAssertFlyPages = true; } void AssertFlyPages(); - bool IsAssertFlyPages() { return bAssertFlyPages; } + bool IsAssertFlyPages() { return mbAssertFlyPages; } /** * Makes sure that, starting from the passed Page, all page-bound Frames @@ -262,8 +262,8 @@ public: void InvalidateAllObjPos(); /// Remove superfluous Pages - void SetSuperfluous() { bCheckSuperfluous = true; } - bool IsSuperfluous() const { return bCheckSuperfluous; } + void SetSuperfluous() { mbCheckSuperfluous = true; } + bool IsSuperfluous() const { return mbCheckSuperfluous; } void RemoveSuperfluous(); /** @@ -273,10 +273,10 @@ public: sal_uInt16 GetCurrPage( const SwPaM* ) const; sal_uInt16 SetCurrPage( SwCursor*, sal_uInt16 nPageNum ); Point GetPagePos( sal_uInt16 nPageNum ) const; - sal_uInt16 GetPageNum() const { return nPhyPageNums; } - void DecrPhyPageNums() { --nPhyPageNums; } - void IncrPhyPageNums() { ++nPhyPageNums; } - bool IsVirtPageNum() const { return bIsVirtPageNum; } + sal_uInt16 GetPageNum() const { return mnPhyPageNums; } + void DecrPhyPageNums() { --mnPhyPageNums; } + void IncrPhyPageNums() { ++mnPhyPageNums; } + bool IsVirtPageNum() const { return mbIsVirtPageNum; } inline void SetVirtPageNum( const bool bOf ) const; bool IsDummyPage( sal_uInt16 nPageNum ) const; @@ -299,12 +299,12 @@ public: */ bool MakeTblCrsrs( SwTableCursor& ); - void DisallowTurbo() const { const_cast(this)->bTurboAllowed = false; } - void ResetTurboFlag() const { const_cast(this)->bTurboAllowed = true; } - bool IsTurboAllowed() const { return bTurboAllowed; } - void SetTurbo( const SwCntntFrm *pCntnt ) { pTurbo = pCntnt; } - void ResetTurbo() { pTurbo = 0; } - const SwCntntFrm *GetTurbo() { return pTurbo; } + void DisallowTurbo() const { const_cast(this)->mbTurboAllowed = false; } + void ResetTurboFlag() const { const_cast(this)->mbTurboAllowed = true; } + bool IsTurboAllowed() const { return mbTurboAllowed; } + void SetTurbo( const SwCntntFrm *pCntnt ) { mpTurbo = pCntnt; } + void ResetTurbo() { mpTurbo = 0; } + const SwCntntFrm *GetTurbo() { return mpTurbo; } /// Update the footernumbers of all Pages void UpdateFtnNums(); // Only for page by page numnbering! @@ -314,37 +314,37 @@ public: bool bEndNotes = false ); void CheckFtnPageDescs( bool bEndNote ); - const SwPageFrm *GetLastPage() const { return pLastPage; } - SwPageFrm *GetLastPage() { return pLastPage; } + const SwPageFrm *GetLastPage() const { return mpLastPage; } + SwPageFrm *GetLastPage() { return mpLastPage; } - static bool IsInPaint() { return bInPaint; } + static bool IsInPaint() { return mbInPaint; } - static void SetNoVirDev( const bool bNew ) { bNoVirDev = bNew; } + static void SetNoVirDev( const bool bNew ) { mbNoVirDev = bNew; } inline long GetBrowseWidth() const; - void SetBrowseWidth( long n ) { bBrowseWidthValid = true; nBrowseWidth = n;} + void SetBrowseWidth( long n ) { mbBrowseWidthValid = true; mnBrowseWidth = n;} inline void InvalidateBrowseWidth(); - bool IsNewLayout() const { return bIsNewLayout; } - void ResetNewLayout() { bIsNewLayout = false;} + bool IsNewLayout() const { return mbIsNewLayout; } + void ResetNewLayout() { mbIsNewLayout = false;} /** * Empty SwSectionFrms are registered here for deletion and * destroyed later on or deregistered. */ void InsertEmptySct( SwSectionFrm* pDel ); - void DeleteEmptySct() { if( pDestroy ) _DeleteEmptySct(); } - void RemoveFromList( SwSectionFrm* pSct ) { if( pDestroy ) _RemoveFromList( pSct ); } + void DeleteEmptySct() { if( mpDestroy ) _DeleteEmptySct(); } + void RemoveFromList( SwSectionFrm* pSct ) { if( mpDestroy ) _RemoveFromList( pSct ); } #ifdef DBG_UTIL bool IsInDelList( SwSectionFrm* pSct ) const; #endif - void SetCallbackActionEnabled( bool b ) { bCallbackActionEnabled = b; } - bool IsCallbackActionEnabled() const { return bCallbackActionEnabled; } + void SetCallbackActionEnabled( bool b ) { mbCallbackActionEnabled = b; } + bool IsCallbackActionEnabled() const { return mbCallbackActionEnabled; } - bool IsAnyShellAccessible() const { return nAccessibleShells > 0; } - void AddAccessibleShell() { ++nAccessibleShells; } - void RemoveAccessibleShell() { --nAccessibleShells; } + bool IsAnyShellAccessible() const { return mnAccessibleShells > 0; } + void AddAccessibleShell() { ++mnAccessibleShells; } + void RemoveAccessibleShell() { --mnAccessibleShells; } /** * Get page frame by phyiscal page number @@ -365,26 +365,26 @@ public: const SwRect& GetPagesArea() const { return maPagesArea; } void SetSidebarChanged() { mbSidebarChanged = true; } - bool IsLayoutFreezed() const { return bLayoutFreezed; } - void FreezeLayout( bool freeze ) { bLayoutFreezed = freeze; } + bool IsLayoutFreezed() const { return mbLayoutFreezed; } + void FreezeLayout( bool freeze ) { mbLayoutFreezed = freeze; } }; inline long SwRootFrm::GetBrowseWidth() const { - if ( !bBrowseWidthValid ) + if ( !mbBrowseWidthValid ) const_cast(this)->ImplCalcBrowseWidth(); - return nBrowseWidth; + return mnBrowseWidth; } inline void SwRootFrm::InvalidateBrowseWidth() { - if ( bBrowseWidthValid ) + if ( mbBrowseWidthValid ) ImplInvalidateBrowseWidth(); } inline void SwRootFrm::SetVirtPageNum( const bool bOf) const { - const_cast(this)->bIsVirtPageNum = bOf; + const_cast(this)->mbIsVirtPageNum = bOf; } #endif // INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index f4f9dbafba0c..7a204cc50ce0 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -39,9 +39,9 @@ #include #include -SwLayVout *SwRootFrm::pVout = 0; -bool SwRootFrm::bInPaint = false; -bool SwRootFrm::bNoVirDev = false; +SwLayVout *SwRootFrm::mpVout = 0; +bool SwRootFrm::mbInPaint = false; +bool SwRootFrm::mbNoVirDev = false; SwCache *SwFrm::mpCache = 0; @@ -345,7 +345,7 @@ TYPEINIT1(SwCntntFrm,SwFrm); //rtti for SwCntntFrm void _FrmInit() { - SwRootFrm::pVout = new SwLayVout(); + SwRootFrm::mpVout = new SwLayVout(); SwCache *pNew = new SwCache( 100 #ifdef DBG_UTIL , "static SwBorderAttrs::pCache" @@ -365,7 +365,7 @@ void _FrmFinit() OSL_ENSURE( !pObj, "Who didn't deregister?"); } #endif - delete SwRootFrm::pVout; + delete SwRootFrm::mpVout; delete SwFrm::GetCachePtr(); } @@ -379,9 +379,9 @@ CurrShell::CurrShell( SwViewShell *pNew ) pRoot = pNew->GetLayout(); if ( pRoot ) { - pPrev = pRoot->pCurrShell; - pRoot->pCurrShell = pNew; - pRoot->pCurrShells->insert( this ); + pPrev = pRoot->mpCurrShell; + pRoot->mpCurrShell = pNew; + pRoot->mpCurrShells->insert( this ); } else pPrev = 0; @@ -391,13 +391,13 @@ CurrShell::~CurrShell() { if ( pRoot ) { - pRoot->pCurrShells->erase( this ); + pRoot->mpCurrShells->erase( this ); if ( pPrev ) - pRoot->pCurrShell = pPrev; - if ( pRoot->pCurrShells->empty() && pRoot->pWaitingCurrShell ) + pRoot->mpCurrShell = pPrev; + if ( pRoot->mpCurrShells->empty() && pRoot->mpWaitingCurrShell ) { - pRoot->pCurrShell = pRoot->pWaitingCurrShell; - pRoot->pWaitingCurrShell = 0; + pRoot->mpCurrShell = pRoot->mpWaitingCurrShell; + pRoot->mpWaitingCurrShell = 0; } } } @@ -405,34 +405,34 @@ CurrShell::~CurrShell() void SetShell( SwViewShell *pSh ) { SwRootFrm *pRoot = pSh->GetLayout(); - if ( pRoot->pCurrShells->empty() ) - pRoot->pCurrShell = pSh; + if ( pRoot->mpCurrShells->empty() ) + pRoot->mpCurrShell = pSh; else - pRoot->pWaitingCurrShell = pSh; + pRoot->mpWaitingCurrShell = pSh; } void SwRootFrm::DeRegisterShell( SwViewShell *pSh ) { // Activate some shell if possible - if ( pCurrShell == pSh ) + if ( mpCurrShell == pSh ) { - pCurrShell = nullptr; + mpCurrShell = nullptr; for(SwViewShell& rShell : pSh->GetRingContainer()) { if(&rShell != pSh) { - pCurrShell = &rShell; + mpCurrShell = &rShell; break; } } } // Doesn't matter anymore - if ( pWaitingCurrShell == pSh ) - pWaitingCurrShell = 0; + if ( mpWaitingCurrShell == pSh ) + mpWaitingCurrShell = 0; // Remove references - for ( SwCurrShells::iterator it = pCurrShells->begin(); it != pCurrShells->end(); ++it ) + for ( SwCurrShells::iterator it = mpCurrShells->begin(); it != mpCurrShells->end(); ++it ) { CurrShell *pC = *it; if (pC->pPrev == pSh) @@ -442,7 +442,7 @@ void SwRootFrm::DeRegisterShell( SwViewShell *pSh ) void InitCurrShells( SwRootFrm *pRoot ) { - pRoot->pCurrShells = new SwCurrShells; + pRoot->mpCurrShells = new SwCurrShells; } /* @@ -459,25 +459,25 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, SwViewShell * pSh ) : mbBookMode( false ), mbSidebarChanged( false ), mbNeedGrammarCheck( false ), - bCheckSuperfluous( false ), - bIdleFormat( true ), - bBrowseWidthValid( false ), - bTurboAllowed( true ), - bAssertFlyPages( true ), - bIsVirtPageNum( false ), - bIsNewLayout( true ), - bCallbackActionEnabled ( false ), - bLayoutFreezed ( false ), - nBrowseWidth( MM50*4 ), //2cm minimum - pTurbo( 0 ), - pLastPage( 0 ), - pCurrShell( pSh ), - pWaitingCurrShell( 0 ), - pCurrShells(NULL), - pDrawPage( 0 ), - pDestroy( 0 ), - nPhyPageNums( 0 ), - nAccessibleShells( 0 ) + mbCheckSuperfluous( false ), + mbIdleFormat( true ), + mbBrowseWidthValid( false ), + mbTurboAllowed( true ), + mbAssertFlyPages( true ), + mbIsVirtPageNum( false ), + mbIsNewLayout( true ), + mbCallbackActionEnabled ( false ), + mbLayoutFreezed ( false ), + mnBrowseWidth( MM50*4 ), //2cm minimum + mpTurbo( 0 ), + mpLastPage( 0 ), + mpCurrShell( pSh ), + mpWaitingCurrShell( 0 ), + mpCurrShells(NULL), + mpDrawPage( 0 ), + mpDestroy( 0 ), + mnPhyPageNums( 0 ), + mnAccessibleShells( 0 ) { mnFrmType = FRM_ROOT; setRootFrm( this ); @@ -494,15 +494,15 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) pTimerAccess->StopIdling(); // For creating the Flys by MakeFrms() pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() ); - bCallbackActionEnabled = false; // needs to be set to true before leaving! + mbCallbackActionEnabled = false; // needs to be set to true before leaving! SwDrawModel* pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel(); if ( pMd ) { // Disable "multiple layout" - pDrawPage = pMd->GetPage(0); + mpDrawPage = pMd->GetPage(0); - pDrawPage->SetSize( Frm().SSize() ); + mpDrawPage->SetSize( Frm().SSize() ); } // Initialize the layout: create pages, link content with Cntnt etc. @@ -526,7 +526,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) //#19104# respect the page number offset!! oPgNum = rDesc.GetNumOffset(); if (oPgNum) - bIsVirtPageNum = true; + mbIsVirtPageNum = true; } else if ( pNode ) { @@ -535,10 +535,10 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) //#19104# respect the page number offset!! oPgNum = rDesc.GetNumOffset(); if (oPgNum) - bIsVirtPageNum = true; + mbIsVirtPageNum = true; } else - bIsVirtPageNum = false; + mbIsVirtPageNum = false; if ( !pDesc ) pDesc = &pDoc->GetPageDesc( 0 ); const bool bOdd = !oPgNum || 0 != ( oPgNum.get() % 2 ); @@ -555,18 +555,18 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) SwNodeIndex aTmp( *pDoc->GetNodes().GetEndOfContent().StartOfSectionNode(), 1 ); ::_InsertCnt( pLay, pDoc, aTmp.GetIndex(), true ); //Remove masters that haven't been replaced yet from the list. - RemoveMasterObjs( pDrawPage ); + RemoveMasterObjs( mpDrawPage ); if( pSettingAccess->get(DocumentSettingId::GLOBAL_DOCUMENT) ) pFieldsAccess->UpdateRefFlds( NULL ); //b6433357: Update page fields after loading - if ( !pCurrShell || !pCurrShell->Imp()->IsUpdateExpFlds() ) + if ( !mpCurrShell || !mpCurrShell->Imp()->IsUpdateExpFlds() ) { SwDocPosUpdate aMsgHnt( pPage->Frm().Top() ); pFieldsAccess->UpdatePageFlds( &aMsgHnt ); } pTimerAccess->StartIdling(); - bCallbackActionEnabled = true; + mbCallbackActionEnabled = true; SwViewShell *pViewSh = GetCurrShell(); if (pViewSh) @@ -575,8 +575,8 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) SwRootFrm::~SwRootFrm() { - bTurboAllowed = false; - pTurbo = 0; + mbTurboAllowed = false; + mpTurbo = 0; // fdo#39510 crash on document close with footnotes // Object ownership in writer and esp. in layout are a mess: Before the // document/layout split SwDoc and SwRootFrm were essentially one object @@ -597,18 +597,18 @@ SwRootFrm::~SwRootFrm() pDoc->DelFrmFmt( pRegisteredInNonConst ); pDoc->GetDocumentLayoutManager().ClearSwLayouterEntries(); } - delete pDestroy; - pDestroy = 0; + delete mpDestroy; + mpDestroy = 0; // Remove references - for ( SwCurrShells::iterator it = pCurrShells->begin(); it != pCurrShells->end(); ++it ) + for ( SwCurrShells::iterator it = mpCurrShells->begin(); it != mpCurrShells->end(); ++it ) (*it)->pRoot = 0; - delete pCurrShells; - pCurrShells = 0; + delete mpCurrShells; + mpCurrShells = 0; // Some accessible shells are left => problems on second SwFrm::Destroy call - assert(0 == nAccessibleShells); + assert(0 == mnAccessibleShells); // manually call base classes Destroy because it could call stuff // that accesses members of this diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index a649d84a1787..e4a55acb02d5 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -768,7 +768,7 @@ SwPageDesc *SwPageFrm::FindPageDesc() void AdjustSizeChgNotify( SwRootFrm *pRoot ) { const bool bOld = pRoot->IsSuperfluous(); - pRoot->bCheckSuperfluous = false; + pRoot->mbCheckSuperfluous = false; if ( pRoot->GetCurrShell() ) { for(SwViewShell& rSh : pRoot->GetCurrShell()->GetRingContainer()) @@ -781,12 +781,12 @@ void AdjustSizeChgNotify( SwRootFrm *pRoot ) } } } - pRoot->bCheckSuperfluous = bOld; + pRoot->mbCheckSuperfluous = bOld; } inline void SetLastPage( SwPageFrm *pPage ) { - static_cast(pPage->GetUpper())->pLastPage = pPage; + static_cast(pPage->GetUpper())->mpLastPage = pPage; } void SwPageFrm::Cut() @@ -1298,7 +1298,7 @@ void SwRootFrm::RemoveSuperfluous() if ( !IsSuperfluous() ) return; - bCheckSuperfluous = false; + mbCheckSuperfluous = false; SwPageFrm *pPage = GetLastPage(); long nDocPos = LONG_MAX; @@ -1384,7 +1384,7 @@ void SwRootFrm::AssertFlyPages() { if ( !IsAssertFlyPages() ) return; - bAssertFlyPages = false; + mbAssertFlyPages = false; SwDoc *pDoc = GetFmt()->GetDoc(); const SwFrmFmts *pTbl = pDoc->GetSpzFrmFmts(); @@ -1520,7 +1520,7 @@ void SwRootFrm::MakeAll() void SwRootFrm::ImplInvalidateBrowseWidth() { - bBrowseWidthValid = false; + mbBrowseWidthValid = false; SwFrm *pPg = Lower(); while ( pPg ) { @@ -1546,9 +1546,9 @@ void SwRootFrm::ImplCalcBrowseWidth() if ( !pFrm ) return; - bBrowseWidthValid = true; + mbBrowseWidthValid = true; SwViewShell *pSh = getRootFrm()->GetCurrShell(); - nBrowseWidth = pSh + mnBrowseWidth = pSh ? MINLAY + 2 * pSh->GetOut()-> PixelToLogic( pSh->GetBrowseBorder() ).Width() : 5000; @@ -1585,7 +1585,7 @@ void SwRootFrm::ImplCalcBrowseWidth() default: break; } - nBrowseWidth = std::max( nBrowseWidth, nWidth ); + mnBrowseWidth = std::max( mnBrowseWidth, nWidth ); } } else if ( pFrm->GetDrawObjs() ) @@ -1643,7 +1643,7 @@ void SwRootFrm::ImplCalcBrowseWidth() break; default: /* do nothing */; } - nBrowseWidth = std::max( nBrowseWidth, nWidth ); + mnBrowseWidth = std::max( mnBrowseWidth, nWidth ); } } pFrm = pFrm->FindNextCnt(); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 5de242999117..bb724f88c336 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3161,7 +3161,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c PROTOCOL( this, PROT_FILE_INIT, 0, 0) bool bResetRootPaint = false; - SwViewShell *pSh = pCurrShell; + SwViewShell *pSh = mpCurrShell; if ( pSh->GetWin() ) { @@ -3169,14 +3169,14 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c { return; } - if ( SwRootFrm::bInPaint ) + if ( SwRootFrm::mbInPaint ) { SwPaintQueue::Add( pSh, rRect ); return; } } else - SwRootFrm::bInPaint = bResetRootPaint = true; + SwRootFrm::mbInPaint = bResetRootPaint = true; SwSavePaintStatics *pStatics = 0; if ( gProp.pSGlobalShell ) @@ -3326,7 +3326,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c // 2nd parameter is no longer and will be set to the // rectangle the virtual output device is calculated from , // if the virtual output is used. - pVout->Enter( pSh, aPaintRect, !bNoVirDev ); + mpVout->Enter( pSh, aPaintRect, !mbNoVirDev ); // OD 27.09.2002 #103636# - adjust paint rectangle to pixel size // Thus, all objects overlapping on pixel level with the unadjusted @@ -3335,7 +3335,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c } // maybe this can be put in the above scope. Since we are not sure, just leave it ATM - pVout->SetOrgRect( aPaintRect ); + mpVout->SetOrgRect( aPaintRect ); // OD 29.08.2002 #102450# // determine background color of page for method @@ -3407,7 +3407,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c pPage->RefreshExtraData( aPaintRect ); DELETEZ(gProp.pBLines); - pVout->Leave(); + mpVout->Leave(); // #i68597# // needed to move grid painting inside Begin/EndDrawLayer bounds and to change @@ -3496,7 +3496,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c DELETEZ( gProp.pSLines ); if ( bResetRootPaint ) - SwRootFrm::bInPaint = false; + SwRootFrm::mbInPaint = false; if ( pStatics ) delete pStatics; else diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 80e45a8580ba..9b50f93f9584 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2539,18 +2539,18 @@ void SwSectionFrm::CalcFtnCntnt() */ void SwRootFrm::InsertEmptySct( SwSectionFrm* pDel ) { - if( !pDestroy ) - pDestroy = new SwDestroyList; - pDestroy->insert( pDel ); + if( !mpDestroy ) + mpDestroy = new SwDestroyList; + mpDestroy->insert( pDel ); } void SwRootFrm::_DeleteEmptySct() { - OSL_ENSURE( pDestroy, "Keine Liste, keine Kekse" ); - while( !pDestroy->empty() ) + OSL_ENSURE( mpDestroy, "Keine Liste, keine Kekse" ); + while( !mpDestroy->empty() ) { - SwSectionFrm* pSect = *pDestroy->begin(); - pDestroy->erase( pDestroy->begin() ); + SwSectionFrm* pSect = *mpDestroy->begin(); + mpDestroy->erase( mpDestroy->begin() ); OSL_ENSURE( !pSect->IsColLocked() && !pSect->IsJoinLocked(), "DeleteEmptySct: Locked SectionFrm" ); if( !pSect->Frm().HasArea() && !pSect->ContainsCntnt() ) @@ -2578,14 +2578,14 @@ void SwRootFrm::_DeleteEmptySct() void SwRootFrm::_RemoveFromList( SwSectionFrm* pSct ) { - OSL_ENSURE( pDestroy, "Where's my list?" ); - pDestroy->erase( pSct ); + OSL_ENSURE( mpDestroy, "Where's my list?" ); + mpDestroy->erase( pSct ); } #ifdef DBG_UTIL bool SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const { - return pDestroy && pDestroy->find( pSct ) != pDestroy->end(); + return mpDestroy && mpDestroy->find( pSct ) != mpDestroy->end(); } #endif diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index 8e68a81642e2..78e5cfef4b23 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -54,9 +54,9 @@ inline DbgRect::DbgRect( OutputDevice *pOutDev, const Rectangle &rRect, bool SwRootFrm::FlushVout() { - if( SwRootFrm::pVout->IsFlushable() ) + if( SwRootFrm::mpVout->IsFlushable() ) { - SwRootFrm::pVout->_Flush(); + SwRootFrm::mpVout->_Flush(); return true; } return false; @@ -64,8 +64,8 @@ bool SwRootFrm::FlushVout() bool SwRootFrm::HasSameRect( const SwRect& rRect ) { - if( SwRootFrm::pVout->IsFlushable() ) - return ( rRect == SwRootFrm::pVout->GetOrgRect() ); + if( SwRootFrm::mpVout->IsFlushable() ) + return ( rRect == SwRootFrm::mpVout->GetOrgRect() ); return false; } -- cgit