diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-21 09:28:12 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-21 09:28:12 +0200 |
commit | 652933e8fe46b24049ad0a6e61811727b1965aea (patch) | |
tree | 7793bb2f8771ca455b6dfae7e37e68270bb8f1f9 | |
parent | 078673b6843ecd7231b146a8472b229d3db4d43b (diff) |
sw: prefix members of SwPageFrm
Change-Id: I7587c587a52310dbfee8e79a038495eb26b108b0
-rw-r--r-- | sw/source/core/inc/pagefrm.hxx | 124 | ||||
-rw-r--r-- | sw/source/core/layout/calcmove.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/layout/flylay.cxx | 42 | ||||
-rw-r--r-- | sw/source/core/layout/pagechg.cxx | 44 | ||||
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 |
5 files changed, 110 insertions, 110 deletions
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index d2e797e53b6f..2979491b1aff 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -48,25 +48,25 @@ class SwPageFrm: public SwFootnoteBossFrm { friend class SwFrm; - SwSortedObjs *pSortedObjs; - - SwPageDesc *pDesc; //PageDesc that describes the Page - - sal_uInt16 nPhyPageNum; // Physical page number - - bool bInvalidContent :1; - bool bInvalidLayout :1; - bool bInvalidFlyContent :1; - bool bInvalidFlyLayout :1; - bool bInvalidFlyInCnt :1; - bool bFootnotePage :1; // This Page is for document end footnotes - bool bEmptyPage :1; // This Page is an explicitly empty page - bool bEndNotePage :1; // 'Footnote page' for end notes - bool bInvalidSpelling :1; // We need online spelling - bool bInvalidSmartTags :1; // We need checking for smarttags - bool bInvalidAutoCmplWrds :1; // Update auto complete word list - bool bInvalidWordCount :1; - bool bHasGrid :1; // Grid for Asian layout + SwSortedObjs *m_pSortedObjs; + + SwPageDesc *m_pDesc; //PageDesc that describes the Page + + sal_uInt16 m_nPhyPageNum; // Physical page number + + bool m_bInvalidContent :1; + bool m_bInvalidLayout :1; + bool m_bInvalidFlyContent :1; + bool m_bInvalidFlyLayout :1; + bool m_bInvalidFlyInCnt :1; + bool m_bFootnotePage :1; // This Page is for document end footnotes + bool m_bEmptyPage :1; // This Page is an explicitly empty page + bool m_bEndNotePage :1; // 'Footnote page' for end notes + bool m_bInvalidSpelling :1; // We need online spelling + bool m_bInvalidSmartTags :1; // We need checking for smarttags + bool m_bInvalidAutoCmplWrds :1; // Update auto complete word list + bool m_bInvalidWordCount :1; + bool m_bHasGrid :1; // Grid for Asian layout static const sal_Int8 mnShadowPxWidth; @@ -120,8 +120,8 @@ public: void PrepareHeader(); void PrepareFooter(); - const SwSortedObjs *GetSortedObjs() const { return pSortedObjs; } - SwSortedObjs *GetSortedObjs() { return pSortedObjs; } + const SwSortedObjs *GetSortedObjs() const { return m_pSortedObjs; } + SwSortedObjs *GetSortedObjs() { return m_pSortedObjs; } void AppendDrawObjToPage( SwAnchoredObject& _rNewObj ); void RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj ); @@ -131,8 +131,8 @@ public: void MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest ); // Optimized Remove/Append void SetPageDesc( SwPageDesc *, SwFrameFormat * ); - SwPageDesc *GetPageDesc() { return pDesc; } - const SwPageDesc *GetPageDesc() const { return pDesc; } + SwPageDesc *GetPageDesc() { return m_pDesc; } + const SwPageDesc *GetPageDesc() const { return m_pDesc; } SwPageDesc *FindPageDesc(); SwContentFrm *FindLastBodyContent(); @@ -145,7 +145,7 @@ public: // Specialized GetContentPos() for Field in Frames void GetContentPosition( const Point &rPt, SwPosition &rPos ) const; - bool IsEmptyPage() const { return bEmptyPage; } // Explicitly empty page + bool IsEmptyPage() const { return m_bEmptyPage; } // Explicitly empty page void UpdateFootnoteNum(); @@ -174,7 +174,7 @@ public: virtual void CheckDirection( bool bVert ) override; void CheckGrid( bool bInvalidate ); void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const; - bool HasGrid() const { return bHasGrid; } + bool HasGrid() const { return m_bHasGrid; } void PaintDecorators( ) const; virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; @@ -187,15 +187,15 @@ public: void RefreshSubsidiary( const SwRect& ) const; /// Foot note interface - bool IsFootnotePage() const { return bFootnotePage; } - bool IsEndNotePage() const { return bEndNotePage; } - void SetFootnotePage( bool b ) { bFootnotePage = b; } - void SetEndNotePage( bool b ) { bEndNotePage = b; } + bool IsFootnotePage() const { return m_bFootnotePage; } + bool IsEndNotePage() const { return m_bEndNotePage; } + void SetFootnotePage( bool b ) { m_bFootnotePage = b; } + void SetEndNotePage( bool b ) { m_bEndNotePage = b; } - inline sal_uInt16 GetPhyPageNum() const { return nPhyPageNum;} - inline void SetPhyPageNum( sal_uInt16 nNum ) { nPhyPageNum = nNum;} - inline void DecrPhyPageNum() { --nPhyPageNum; } - inline void IncrPhyPageNum() { ++nPhyPageNum; } + inline sal_uInt16 GetPhyPageNum() const { return m_nPhyPageNum;} + inline void SetPhyPageNum( sal_uInt16 nNum ) { m_nPhyPageNum = nNum;} + inline void DecrPhyPageNum() { --m_nPhyPageNum; } + inline void IncrPhyPageNum() { ++m_nPhyPageNum; } /// Validate, invalidate and query the Page status /// Layout/Content and Fly/non-Fly respectively are inspected separately @@ -221,15 +221,15 @@ public: inline bool IsInvalidFly() const; bool IsRightShadowNeeded() const; bool IsLeftShadowNeeded() const; - bool IsInvalidFlyLayout() const { return bInvalidFlyLayout; } - bool IsInvalidFlyContent() const { return bInvalidFlyContent; } - bool IsInvalidFlyInCnt() const { return bInvalidFlyInCnt; } - bool IsInvalidLayout() const { return bInvalidLayout; } - bool IsInvalidContent() const { return (bInvalidContent || bInvalidFlyInCnt); } - bool IsInvalidSpelling() const { return bInvalidSpelling; } - bool IsInvalidSmartTags() const { return bInvalidSmartTags; } - bool IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; } - bool IsInvalidWordCount() const { return bInvalidWordCount; } + bool IsInvalidFlyLayout() const { return m_bInvalidFlyLayout; } + bool IsInvalidFlyContent() const { return m_bInvalidFlyContent; } + bool IsInvalidFlyInCnt() const { return m_bInvalidFlyInCnt; } + bool IsInvalidLayout() const { return m_bInvalidLayout; } + bool IsInvalidContent() const { return (m_bInvalidContent || m_bInvalidFlyInCnt); } + bool IsInvalidSpelling() const { return m_bInvalidSpelling; } + bool IsInvalidSmartTags() const { return m_bInvalidSmartTags; } + bool IsInvalidAutoCompleteWords() const { return m_bInvalidAutoCmplWrds; } + bool IsInvalidWordCount() const { return m_bInvalidWordCount; } /** SwPageFrm::GetDrawBackgrdColor @@ -349,86 +349,86 @@ inline const SwContentFrm *SwPageFrm::FindLastBodyContent() const } inline void SwPageFrm::InvalidateFlyLayout() const { - const_cast<SwPageFrm*>(this)->bInvalidFlyLayout = true; + const_cast<SwPageFrm*>(this)->m_bInvalidFlyLayout = true; } inline void SwPageFrm::InvalidateFlyContent() const { - const_cast<SwPageFrm*>(this)->bInvalidFlyContent = true; + const_cast<SwPageFrm*>(this)->m_bInvalidFlyContent = true; } inline void SwPageFrm::InvalidateFlyInCnt() const { - const_cast<SwPageFrm*>(this)->bInvalidFlyInCnt = true; + const_cast<SwPageFrm*>(this)->m_bInvalidFlyInCnt = true; } inline void SwPageFrm::InvalidateLayout() const { - const_cast<SwPageFrm*>(this)->bInvalidLayout = true; + const_cast<SwPageFrm*>(this)->m_bInvalidLayout = true; } inline void SwPageFrm::InvalidateContent() const { - const_cast<SwPageFrm*>(this)->bInvalidContent = true; + const_cast<SwPageFrm*>(this)->m_bInvalidContent = true; } inline void SwPageFrm::InvalidateSpelling() const { - const_cast<SwPageFrm*>(this)->bInvalidSpelling = true; + const_cast<SwPageFrm*>(this)->m_bInvalidSpelling = true; } inline void SwPageFrm::InvalidateSmartTags() const { - const_cast<SwPageFrm*>(this)->bInvalidSmartTags = true; + const_cast<SwPageFrm*>(this)->m_bInvalidSmartTags = true; } inline void SwPageFrm::InvalidateAutoCompleteWords() const { - const_cast<SwPageFrm*>(this)->bInvalidAutoCmplWrds = true; + const_cast<SwPageFrm*>(this)->m_bInvalidAutoCmplWrds = true; } inline void SwPageFrm::InvalidateWordCount() const { - const_cast<SwPageFrm*>(this)->bInvalidWordCount = true; + const_cast<SwPageFrm*>(this)->m_bInvalidWordCount = true; } inline void SwPageFrm::ValidateFlyLayout() const { - const_cast<SwPageFrm*>(this)->bInvalidFlyLayout = false; + const_cast<SwPageFrm*>(this)->m_bInvalidFlyLayout = false; } inline void SwPageFrm::ValidateFlyContent() const { - const_cast<SwPageFrm*>(this)->bInvalidFlyContent = false; + const_cast<SwPageFrm*>(this)->m_bInvalidFlyContent = false; } inline void SwPageFrm::ValidateFlyInCnt() const { - const_cast<SwPageFrm*>(this)->bInvalidFlyInCnt = false; + const_cast<SwPageFrm*>(this)->m_bInvalidFlyInCnt = false; } inline void SwPageFrm::ValidateLayout() const { - const_cast<SwPageFrm*>(this)->bInvalidLayout = false; + const_cast<SwPageFrm*>(this)->m_bInvalidLayout = false; } inline void SwPageFrm::ValidateContent() const { - const_cast<SwPageFrm*>(this)->bInvalidContent = false; + const_cast<SwPageFrm*>(this)->m_bInvalidContent = false; } inline void SwPageFrm::ValidateSpelling() const { - const_cast<SwPageFrm*>(this)->bInvalidSpelling = false; + const_cast<SwPageFrm*>(this)->m_bInvalidSpelling = false; } inline void SwPageFrm::ValidateSmartTags() const { - const_cast<SwPageFrm*>(this)->bInvalidSmartTags = false; + const_cast<SwPageFrm*>(this)->m_bInvalidSmartTags = false; } inline void SwPageFrm::ValidateAutoCompleteWords() const { - const_cast<SwPageFrm*>(this)->bInvalidAutoCmplWrds = false; + const_cast<SwPageFrm*>(this)->m_bInvalidAutoCmplWrds = false; } inline void SwPageFrm::ValidateWordCount() const { - const_cast<SwPageFrm*>(this)->bInvalidWordCount = false; + const_cast<SwPageFrm*>(this)->m_bInvalidWordCount = false; } inline bool SwPageFrm::IsInvalid() const { - return (bInvalidContent || bInvalidLayout || bInvalidFlyInCnt); + return (m_bInvalidContent || m_bInvalidLayout || m_bInvalidFlyInCnt); } inline bool SwPageFrm::IsInvalidFly() const { - return bInvalidFlyLayout || bInvalidFlyContent; + return m_bInvalidFlyLayout || m_bInvalidFlyContent; } diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index e404302126ec..fb66080b808f 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -734,15 +734,15 @@ void SwPageFrm::MakeAll(vcl::RenderContext* pRenderContext) nBot += nTmp; // Here we check whether paragraph anchored objects // protrude outside the Body/FootnoteCont. - if( pSortedObjs && !pFrm->IsHeaderFrm() && + if( m_pSortedObjs && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() ) - lcl_CheckObjects( pSortedObjs, pFrm, nBot ); + lcl_CheckObjects( m_pSortedObjs, pFrm, nBot ); pFrm = pFrm->GetNext(); } nBot += nBottom; // And the page anchored ones - if ( pSortedObjs ) - lcl_CheckObjects( pSortedObjs, this, nBot ); + if ( m_pSortedObjs ) + lcl_CheckObjects( m_pSortedObjs, this, nBot ); nBot -= Frm().Top(); // #i35143# - If second page frame // exists, the first page doesn't have to fulfill the diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 45b6a22171fd..1c96097a42d8 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -587,10 +587,10 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew ) { InvalidateFlyContent(); - if ( !pSortedObjs ) - pSortedObjs = new SwSortedObjs(); + if ( !m_pSortedObjs ) + m_pSortedObjs = new SwSortedObjs(); - const bool bSucessInserted = pSortedObjs->Insert( *pNew ); + const bool bSucessInserted = m_pSortedObjs->Insert( *pNew ); OSL_ENSURE( bSucessInserted, "Fly not inserted in Sorted." ); (void) bSucessInserted; @@ -669,13 +669,13 @@ void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove ) // executed. // Remove it _before_ disposing accessible frames to avoid accesses to // the Frm from event handlers. - if (pSortedObjs) + if (m_pSortedObjs) { - pSortedObjs->Remove(*pToRemove); - if (!pSortedObjs->size()) + m_pSortedObjs->Remove(*pToRemove); + if (!m_pSortedObjs->size()) { - delete pSortedObjs; - pSortedObjs = 0; + delete m_pSortedObjs; + m_pSortedObjs = 0; } } @@ -727,18 +727,18 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest ) } // The FlyColl might be gone already, because the page's dtor is being executed. - if ( pSortedObjs ) + if ( m_pSortedObjs ) { - pSortedObjs->Remove( *pToMove ); - if ( !pSortedObjs->size() ) + m_pSortedObjs->Remove( *pToMove ); + if ( !m_pSortedObjs->size() ) { - DELETEZ( pSortedObjs ); + DELETEZ( m_pSortedObjs ); } } // Register if ( !pDest->GetSortedObjs() ) - pDest->pSortedObjs = new SwSortedObjs(); + pDest->m_pSortedObjs = new SwSortedObjs(); const bool bSucessInserted = pDest->GetSortedObjs()->Insert( *pToMove ); OSL_ENSURE( bSucessInserted, "Fly not inserted in Sorted." ); @@ -823,13 +823,13 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj ) return; } - if ( !pSortedObjs ) + if ( !m_pSortedObjs ) { - pSortedObjs = new SwSortedObjs(); + m_pSortedObjs = new SwSortedObjs(); } - if ( !pSortedObjs->Insert( _rNewObj ) ) + if ( !m_pSortedObjs->Insert( _rNewObj ) ) { - OSL_ENSURE( pSortedObjs->Contains( _rNewObj ), + OSL_ENSURE( m_pSortedObjs->Contains( _rNewObj ), "Drawing object not appended into list <pSortedObjs>." ); } // #i87493# @@ -849,12 +849,12 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj ) return; } - if ( pSortedObjs ) + if ( m_pSortedObjs ) { - pSortedObjs->Remove( _rToRemoveObj ); - if ( !pSortedObjs->size() ) + m_pSortedObjs->Remove( _rToRemoveObj ); + if ( !m_pSortedObjs->size() ) { - DELETEZ( pSortedObjs ); + DELETEZ( m_pSortedObjs ); } if ( GetUpper() ) { diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 71ec07ed4526..3c43775dcffe 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -155,26 +155,26 @@ void SwBodyFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAt SwPageFrm::SwPageFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwPageDesc *pPgDsc ) : SwFootnoteBossFrm( pFormat, pSib ), - pSortedObjs( 0 ), - pDesc( pPgDsc ), - nPhyPageNum( 0 ) + m_pSortedObjs( 0 ), + m_pDesc( pPgDsc ), + m_nPhyPageNum( 0 ) { SetDerivedVert( false ); SetDerivedR2L( false ); - if( pDesc ) + if( m_pDesc ) { - bHasGrid = true; + m_bHasGrid = true; SwTextGridItem const*const pGrid(GetGridItem(this)); if( !pGrid ) - bHasGrid = false; + m_bHasGrid = false; } else - bHasGrid = false; + m_bHasGrid = false; SetMaxFootnoteHeight( pPgDsc->GetFootnoteInfo().GetHeight() ? pPgDsc->GetFootnoteInfo().GetHeight() : LONG_MAX ), mnFrmType = FRM_PAGE; - bInvalidLayout = bInvalidContent = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = true; - bInvalidFlyLayout = bInvalidFlyContent = bInvalidFlyInCnt = bFootnotePage = bEndNotePage = false; + m_bInvalidLayout = m_bInvalidContent = m_bInvalidSpelling = m_bInvalidSmartTags = m_bInvalidAutoCmplWrds = m_bInvalidWordCount = true; + m_bInvalidFlyLayout = m_bInvalidFlyContent = m_bInvalidFlyInCnt = m_bFootnotePage = m_bEndNotePage = false; SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); @@ -192,9 +192,9 @@ SwPageFrm::SwPageFrm( SwFrameFormat *pFormat, SwFrm* pSib, SwPageDesc *pPgDsc ) // create and insert body area if it is not a blank page SwDoc *pDoc = pFormat->GetDoc(); - if ( !(bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat())) ) + if ( !(m_bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat())) ) { - bEmptyPage = false; + m_bEmptyPage = false; Calc(pRenderContext); // so that the PrtArea is correct SwBodyFrm *pBodyFrm = new SwBodyFrm( pDoc->GetDfltFrameFormat(), this ); pBodyFrm->ChgSize( Prt().SSize() ); @@ -232,17 +232,17 @@ void SwPageFrm::DestroyImpl() } // empty FlyContainer, deletion of the Flys is done by the anchor (in base class SwFrm) - if ( pSortedObjs ) + if ( m_pSortedObjs ) { // Objects can be anchored at pages that are before their anchors (why ever...). // In such cases, we would access already freed memory. - for ( size_t i = 0; i < pSortedObjs->size(); ++i ) + for ( size_t i = 0; i < m_pSortedObjs->size(); ++i ) { - SwAnchoredObject* pAnchoredObj = (*pSortedObjs)[i]; + SwAnchoredObject* pAnchoredObj = (*m_pSortedObjs)[i]; pAnchoredObj->SetPageFrm( 0L ); } - delete pSortedObjs; - pSortedObjs = 0; // reset to zero to prevent problems when detaching the Flys + delete m_pSortedObjs; + m_pSortedObjs = 0; // reset to zero to prevent problems when detaching the Flys } if ( !IsEmptyPage() ) //#59184# unnessesary for empty pages @@ -276,11 +276,11 @@ SwPageFrm::~SwPageFrm() void SwPageFrm::CheckGrid( bool bInvalidate ) { - bool bOld = bHasGrid; - bHasGrid = true; + bool bOld = m_bHasGrid; + m_bHasGrid = true; SwTextGridItem const*const pGrid(GetGridItem(this)); - bHasGrid = 0 != pGrid; - if( bInvalidate || bOld != bHasGrid ) + m_bHasGrid = 0 != pGrid; + if( bInvalidate || bOld != m_bHasGrid ) { SwLayoutFrm* pBody = FindBodyCont(); if( pBody ) @@ -538,7 +538,7 @@ void SwPageFrm::SwClientNotify(const SwModify& rModify, const SfxHint& rHint) { // currently the savest way: static_cast<SwRootFrm*>(GetUpper())->SetSuperfluous(); - SetMaxFootnoteHeight(pDesc->GetFootnoteInfo().GetHeight()); + SetMaxFootnoteHeight(m_pDesc->GetFootnoteInfo().GetHeight()); if(!GetMaxFootnoteHeight()) SetMaxFootnoteHeight(LONG_MAX); SetColMaxFootnoteHeight(); @@ -690,7 +690,7 @@ bool SwPageFrm::GetInfo( SfxPoolItem & rInfo ) const void SwPageFrm::SetPageDesc( SwPageDesc *pNew, SwFrameFormat *pFormat ) { - pDesc = pNew; + m_pDesc = pNew; if ( pFormat ) SetFrameFormat( pFormat ); } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ac06ab9b76ca..69751e0de87f 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -5665,7 +5665,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFormatCol &rFormat void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const { - if( !bHasGrid || gProp.pSRetoucheFly || gProp.pSRetoucheFly2 ) + if( !m_bHasGrid || gProp.pSRetoucheFly || gProp.pSRetoucheFly2 ) return; SwTextGridItem const*const pGrid(GetGridItem(this)); if( pGrid && ( OUTDEV_PRINTER != pOut->GetOutDevType() ? |