diff options
Diffstat (limited to 'sw/source/core/inc')
55 files changed, 1381 insertions, 1381 deletions
diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx b/sw/source/core/inc/DocumentContentOperationsManager.hxx index d12e8daad94f..5d8fca4f2f80 100644 --- a/sw/source/core/inc/DocumentContentOperationsManager.hxx +++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx @@ -104,7 +104,7 @@ public: const sal_Int32 nEndContentIndex, const SwNodeIndex& rInsPos, const std::pair<const SwPaM&, const SwPosition&> * pCopiedPaM = nullptr, - bool bMakeNewFrms = true, + bool bMakeNewFrames = true, bool bDelRedlines = true, bool bCopyFlyAtFly = false ) const; void CopyFlyInFlyImpl( const SwNodeRange& rRg, @@ -163,7 +163,7 @@ private: SwFrameFormat* = nullptr ); /* Copy a range within the same or to another document. Position may not lie within range! */ - bool CopyImpl( SwPaM&, SwPosition&, const bool MakeNewFrms /*= true */, + bool CopyImpl( SwPaM&, SwPosition&, const bool MakeNewFrames /*= true */, const bool bCopyAll, SwPaM *const pCpyRng /*= 0*/ ) const; }; diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx index 026e3c0dc9ed..c3f900fce214 100644 --- a/sw/source/core/inc/DocumentLayoutManager.hxx +++ b/sw/source/core/inc/DocumentLayoutManager.hxx @@ -41,8 +41,8 @@ public: virtual SwViewShell *GetCurrentViewShell() override; //< It must be able to communicate to a SwViewShell.This is going to be removed later. virtual void SetCurrentViewShell( SwViewShell* pNew ) override; - virtual const SwRootFrm *GetCurrentLayout() const override; - virtual SwRootFrm *GetCurrentLayout() override; + virtual const SwRootFrame *GetCurrentLayout() const override; + virtual SwRootFrame *GetCurrentLayout() override; virtual bool HasLayout() const override; virtual const SwLayouter* GetLayouter() const override; @@ -51,7 +51,7 @@ public: virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) override; virtual void DelLayoutFormat( SwFrameFormat *pFormat ) override; - virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, bool bSetTextFlyAtt, bool bMakeFrms ) override; + virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor, bool bSetTextFlyAtt, bool bMakeFrames ) override; //Non Interface methods void ClearSwLayouterEntries(); diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx index db0af2fcf38f..4e08d01008a4 100644 --- a/sw/source/core/inc/DocumentSettingManager.hxx +++ b/sw/source/core/inc/DocumentSettingManager.hxx @@ -80,7 +80,7 @@ class DocumentSettingManager : // mbIgnoreTabsAndBlanksForLineCalculation def = false, hidden // mbClipAsCharacterAnchoredWriterFlyFrame def = false, hidden // - Introduced in order to re-activate clipping of as-character anchored - // Writer fly frames in method <SwFlyInCntFrm::MakeAll()> for documents, + // Writer fly frames in method <SwFlyInContentFrame::MakeAll()> for documents, // which are created with version prior SO8/OOo 2.0 // // SO8pp4 diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx index 14c9c3662eff..6dede18820ec 100644 --- a/sw/source/core/inc/SwPortionHandler.hxx +++ b/sw/source/core/inc/SwPortionHandler.hxx @@ -37,7 +37,7 @@ class SwFont; * held by the corresponding SwTextNode. * * The SwPortionHandler can be used with the - * SwTextFrm::VisitPortions(...) method. + * SwTextFrame::VisitPortions(...) method. */ class SwPortionHandler { diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index f9e7a3c90eb5..8192d325e901 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -154,12 +154,12 @@ class SwUndoInsertLabel : public SwUndo { union { struct { - // for NoTextFrms + // for NoTextFrames SwUndoInsLayFormat* pUndoFly; SwUndoFormatAttr* pUndoAttr; } OBJECT; struct { - // for tables or TextFrms + // for tables or TextFrames SwUndoDelete* pUndoInsNd; sal_uLong nNode; } NODE; diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index 79755d3eb510..b04df8c49917 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -46,7 +46,7 @@ public: class SwAutoCorrDoc : public SvxAutoCorrDoc { SwEditShell& rEditSh; - SwPaM& rCrsr; + SwPaM& rCursor; SwNodeIndex* pIdx; int m_nEndUndoCounter; bool bUndoIdInitialized; diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 21f55e28e886..5547e3cfe051 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -24,8 +24,8 @@ #include <frame.hxx> class SdrObject; -class SwFrm; -class SwFlyFrm; +class SwFrame; +class SwFlyFrame; class SwContact; class SwFrameFormat; class SwRect; @@ -49,7 +49,7 @@ namespace objectpositioning // #i26791# - anchored object the object belongs to; SwAnchoredObject* mpAnchoredObj; // frame the object is anchored at - SwFrm* mpAnchorFrm; + SwFrame* mpAnchorFrame; // contact object SwContact* mpContact; // frame format @@ -62,7 +62,7 @@ namespace objectpositioning /** determine information about object - member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrm>, <mpContact> + member <mbIsObjFly>, <mpAnchoredObj>, <mpAnchorFrame>, <mpContact> and <mpFrameFormat> are set */ void _GetInfoAboutObj(); @@ -72,11 +72,11 @@ namespace objectpositioning SwTwips _ImplAdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, const bool bVertL2R, - const SwFrm& rPageAlignLayFrm, + const SwFrame& rPageAlignLayFrame, const SwTwips nProposedRelPosY, const bool bFollowTextFlow, const bool bCheckBottom = true ) const; - SwTwips _ImplAdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, + SwTwips _ImplAdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, const SwTwips _nProposedRelPosX ) const; protected: @@ -96,9 +96,9 @@ namespace objectpositioning { return *mpAnchoredObj; } - inline SwFrm& GetAnchorFrm() const + inline SwFrame& GetAnchorFrame() const { - return *mpAnchorFrm; + return *mpAnchorFrame; } inline SwContact& GetContact() const { @@ -116,7 +116,7 @@ namespace objectpositioning // virtual methods providing data for to character anchored objects. virtual bool IsAnchoredToChar() const; - virtual const SwFrm* ToCharOrientFrm() const; + virtual const SwFrame* ToCharOrientFrame() const; virtual const SwRect* ToCharRect() const; // #i22341# virtual SwTwips ToCharTopOfLine() const; @@ -126,25 +126,25 @@ namespace objectpositioning #i11860# */ - static SwTwips _GetTopForObjPos( const SwFrm& _rFrm, + static SwTwips _GetTopForObjPos( const SwFrame& _rFrame, const SwRectFn& _fnRect, const bool _bVert ); - void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm, - const SwFrm& _rPageAlignLayFrm, + void _GetVertAlignmentValues( const SwFrame& _rVertOrientFrame, + const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eRelOrient, SwTwips& _orAlignAreaHeight, SwTwips& _orAlignAreaOffset ) const; - // #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos> - SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm, - const SwFrm& _rPageAlignLayFrm, + // #i26791# - add output parameter <_roVertOffsetToFrameAnchorPos> + SwTwips _GetVertRelPos( const SwFrame& _rVertOrientFrame, + const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eVertOrient, const sal_Int16 _eRelOrient, const SwTwips _nVertPos, const SvxLRSpaceItem& _rLRSpacing, const SvxULSpaceItem& _rULSpacing, - SwTwips& _roVertOffsetToFrmAnchorPos ) const; + SwTwips& _roVertOffsetToFrameAnchorPos ) const; /** adjust calculated vertical in order to keep object inside 'page' alignment layout frame. @@ -168,7 +168,7 @@ namespace objectpositioning input parameter - boolean, indicating, if object is in mongolian layout (vertical left-to-right layout). - @param rPageAlignLayFrm + @param rPageAlignLayFrame input parameter - layout frame, which determines the 'page area' the object has to be vertical positioned in. @@ -188,14 +188,14 @@ namespace objectpositioning inline SwTwips _AdjustVertRelPos( const SwTwips nTopOfAnch, const bool bVert, const bool bVertL2R, - const SwFrm& rPageAlignLayFrm, + const SwFrame& rPageAlignLayFrame, const SwTwips nProposedRelPosY, const bool bFollowTextFlow, const bool bCheckBottom = true ) const { return !mbDoNotCaptureAnchoredObj ? _ImplAdjustVertRelPos( nTopOfAnch, bVert, bVertL2R, - rPageAlignLayFrm, + rPageAlignLayFrame, nProposedRelPosY, bFollowTextFlow, bCheckBottom ) @@ -205,9 +205,9 @@ namespace objectpositioning /** calculate relative horizontal position #i26791# - add output parameter - <_roHoriOffsetToFrmAnchorPos> + <_roHoriOffsetToFrameAnchorPos> - @param _rHoriOrientFrm + @param _rHoriOrientFrame input parameter - frame the horizontal position of the object is oriented at. @@ -232,20 +232,20 @@ namespace objectpositioning @param _nRelPosY input parameter - relative vertical position - @param _roHoriOffsetToFrmAnchorPos + @param _roHoriOffsetToFrameAnchorPos output parameter - 'horizontal' offset to frame anchor position according to the alignment @return relative horizontal position in SwTwips */ - SwTwips _CalcRelPosX( const SwFrm& _rHoriOrientFrm, + SwTwips _CalcRelPosX( const SwFrame& _rHoriOrientFrame, const SwEnvironmentOfAnchoredObject& _rEnvOfObj, const SwFormatHoriOrient& _rHoriOrient, const SvxLRSpaceItem& _rLRSpacing, const SvxULSpaceItem& _rULSpacing, const bool _bObjWrapThrough, const SwTwips _nRelPosY, - SwTwips& _roHoriOffsetToFrmAnchorPos + SwTwips& _roHoriOffsetToFrameAnchorPos ) const; /** adjust calculated horizontal in order to keep object inside @@ -255,7 +255,7 @@ namespace objectpositioning to private method <_ImplAdjustHoriRelPos>, which is only called, if <mbDoNotCaptureAnchoredObj> not set. - @param _rPageAlignLayFrm + @param _rPageAlignLayFrame input parameter - layout frame, which determines the 'page area' the object has to be horizontal positioned in. @@ -265,11 +265,11 @@ namespace objectpositioning @return adjusted relative horizontal position in SwTwips. */ - inline SwTwips _AdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, + inline SwTwips _AdjustHoriRelPos( const SwFrame& _rPageAlignLayFrame, const SwTwips _nProposedRelPosX ) const { return !mbDoNotCaptureAnchoredObj - ? _ImplAdjustHoriRelPos( _rPageAlignLayFrm, _nProposedRelPosX ) + ? _ImplAdjustHoriRelPos( _rPageAlignLayFrame, _nProposedRelPosX ) : _nProposedRelPosX; } @@ -294,11 +294,11 @@ namespace objectpositioning /** determine alignment values for horizontal position of object - @param _rHoriOrientFrm + @param _rHoriOrientFrame input parameter - frame the horizontal position of the object is oriented at. - @param _rPageAlignLayFrm + @param _rPageAlignLayFrame input parameter - layout frame, which determines the 'page area' the object has to be horizontal positioned in. @@ -313,7 +313,7 @@ namespace objectpositioning @param _bObjWrapThrough input parameter - boolean indicating, if object has wrap mode 'wrap through'. - important note: value is only relevant, if _rHoriOrientFrm is + important note: value is only relevant, if _rHoriOrientFrame is a text frame. @param _orAlignAreaWidth @@ -329,8 +329,8 @@ namespace objectpositioning output parameter - boolean indicating, that object is aligned to 'page area'. */ - void _GetHoriAlignmentValues( const SwFrm& _rHoriOrientFrm, - const SwFrm& _rPageAlignLayFrm, + void _GetHoriAlignmentValues( const SwFrame& _rHoriOrientFrame, + const SwFrame& _rPageAlignLayFrame, const sal_Int16 _eRelOrient, const bool _bObjWrapThrough, SwTwips& _orAlignAreaWidth, @@ -340,7 +340,7 @@ namespace objectpositioning /** adjust calculated horizontal position in order to draw object aside other objects with same positioning - @param _rHoriOrientFrm + @param _rHoriOrientFrame input parameter - frame the horizontal position of the object is oriented at. @@ -368,7 +368,7 @@ namespace objectpositioning @return adjusted relative horizontal position in SwTwips */ - SwTwips _AdjustHoriRelPosForDrawAside( const SwFrm& _rHoriOrientFrm, + SwTwips _AdjustHoriRelPosForDrawAside( const SwFrame& _rHoriOrientFrame, const SwTwips _nProposedRelPosX, const SwTwips _nRelPosY, const sal_Int16 _eHoriOrient, @@ -406,9 +406,9 @@ namespace objectpositioning @return boolean indicating, if object has to be drawn aside given fly frame. */ - bool _DrawAsideFly( const SwFlyFrm* _pFly, + bool _DrawAsideFly( const SwFlyFrame* _pFly, const SwRect& _rObjRect, - const SwFrm* _pObjContext, + const SwFrame* _pObjContext, const sal_uLong _nObjIndex, const bool _bEvenPage, const sal_Int16 _eHoriOrient, diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index b346908ab86d..1a2fb9e70bef 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -25,7 +25,7 @@ #include <swtypes.hxx> #include <swrect.hxx> -class SwTextFrm; +class SwTextFrame; class SwFormatVertOrient; namespace objectpositioning @@ -69,8 +69,8 @@ namespace objectpositioning // 0 - no line alignment, 1 - at top, 2 - at center, 3 - at bottom sal_uInt8 mnLineAlignment; - // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> - const SwTextFrm& GetAnchorTextFrm() const; + // method to cast <SwAnchoredObjectPosition::GetAnchorFrame()> + const SwTextFrame& GetAnchorTextFrame() const; /** determine the relative position to base line for object position diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index 6324679224e1..d9beba2cb693 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -21,8 +21,8 @@ #define INCLUDED_SW_SOURCE_CORE_INC_BLINK_HXX class SwLinePortion; -class SwRootFrm; -class SwTextFrm; +class SwRootFrame; +class SwTextFrame; #include <vcl/timer.hxx> #include <tools/gen.hxx> @@ -35,27 +35,27 @@ class SwBlinkPortion { Point aPos; const SwLinePortion *pPor; - const SwRootFrm *pFrm; + const SwRootFrame *pFrame; sal_uInt16 nDir; public: SwBlinkPortion(const SwLinePortion* pPortion, sal_uInt16 nDirection) : pPor(pPortion) - , pFrm(nullptr) + , pFrame(nullptr) , nDir(nDirection) { } SwBlinkPortion(const SwBlinkPortion* pBlink, const SwLinePortion* pPort) : aPos(pBlink->aPos) , pPor(pPort) - , pFrm(pBlink->pFrm) + , pFrame(pBlink->pFrame) , nDir(pBlink->nDir) { } void SetPos( const Point& aNew ){ aPos = aNew; } const Point& GetPos() const{ return aPos; } - void SetRootFrm( const SwRootFrm* pNew ){ pFrm = pNew; } - const SwRootFrm* GetRootFrm() const{ return pFrm; } + void SetRootFrame( const SwRootFrame* pNew ){ pFrame = pNew; } + const SwRootFrame* GetRootFrame() const{ return pFrame; } const SwLinePortion *GetPortion() const{ return pPor; } sal_uInt16 GetDirection() const { return nDir; } bool operator<( const SwBlinkPortion& rBlinkPortion ) const @@ -80,10 +80,10 @@ public: DECL_LINK_TYPED( Blinker, Timer *, void ); void Insert( const Point& rPoint, const SwLinePortion* pPor, - const SwTextFrm *pTextFrm, sal_uInt16 nDir ); + const SwTextFrame *pTextFrame, sal_uInt16 nDir ); void Replace( const SwLinePortion* pOld, const SwLinePortion* pNew ); void Delete( const SwLinePortion* pPor ); - void FrmDelete( const SwRootFrm* pRoot ); + void FrameDelete( const SwRootFrame* pRoot ); bool IsVisible() const { return bVisible ; } }; diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx index 6d887e43d15d..1fa48fd66e12 100644 --- a/sw/source/core/inc/bodyfrm.hxx +++ b/sw/source/core/inc/bodyfrm.hxx @@ -24,17 +24,17 @@ class SwBorderAttrs; -class SwBodyFrm: public SwLayoutFrm +class SwBodyFrame: public SwLayoutFrame { protected: virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; public: - SwBodyFrm( SwFrameFormat*, SwFrm* ); + SwBodyFrame( SwFrameFormat*, SwFrame* ); - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; - DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwBodyFrame) }; #endif diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index a6d4dc975525..d33ea5582c8e 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -24,25 +24,25 @@ #include "layfrm.hxx" class SwTableBox; -struct SwCrsrMoveState; +struct SwCursorMoveState; class SwBorderAttrs; -/// SwCellFrm is one table cell in the document layout. -class SwCellFrm: public SwLayoutFrm +/// SwCellFrame is one table cell in the document layout. +class SwCellFrame: public SwLayoutFrame { const SwTableBox* m_pTabBox; virtual void DestroyImpl() override; - virtual ~SwCellFrm(); + virtual ~SwCellFrame(); protected: virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: - SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true ); + SwCellFrame( const SwTableBox &, SwFrame*, bool bInsertContent = true ); - virtual bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = nullptr, bool bTestBackground = false ) const override; + virtual bool GetCursorOfst( SwPosition *, Point&, SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual void CheckDirection( bool bVert ) override; @@ -53,14 +53,14 @@ public: const SwTableBox *GetTabBox() const { return m_pTabBox; } // used for breaking table rows: - SwCellFrm* GetFollowCell() const; - SwCellFrm* GetPreviousCell() const; + SwCellFrame* GetFollowCell() const; + SwCellFrame* GetPreviousCell() const; // used for rowspan stuff: - const SwCellFrm& FindStartEndOfRowSpanCell( bool bStart, bool bCurrentTab ) const; + const SwCellFrame& FindStartEndOfRowSpanCell( bool bStart, bool bCurrentTab ) const; long GetLayoutRowSpan() const; - DECL_FIXEDMEMPOOL_NEWDEL(SwCellFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwCellFrame) }; #endif diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index e534b4d05f93..3f9af9402362 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -25,23 +25,23 @@ #include "cshtyp.hxx" #include "node.hxx" -class SwLayoutFrm; +class SwLayoutFrame; class SwContentNode; class SwBorderAttrs; class SwAttrSetChg; -class SwTextFrm; +class SwTextFrame; // implemented in cntfrm.cxx, used in cntfrm.cxx and crsrsh.cxx -extern bool GetFrmInPage( const SwContentFrm*, SwWhichPage, SwPosPage, SwPaM* ); +extern bool GetFrameInPage( const SwContentFrame*, SwWhichPage, SwPosPage, SwPaM* ); -class SwContentFrm: public SwFrm, public SwFlowFrm +class SwContentFrame: public SwFrame, public SwFlowFrame { - friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); // calls MakePrtArea + friend void MakeNxt( SwFrame *pFrame, SwFrame *pNxt ); // calls MakePrtArea // parameter <bObjsInNewUpper> indicates that objects exist in remaining // area of new upper bool _WouldFit( SwTwips nSpace, - SwLayoutFrm *pNewUpper, + SwLayoutFrame *pNewUpper, bool bTstMove, const bool bObjsInNewUpper ); @@ -50,34 +50,34 @@ class SwContentFrm: public SwFrm, public SwFlowFrm void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& ) override; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool& ) override; - const SwContentFrm* ImplGetNextContentFrm( bool bFwd ) const; + const SwContentFrame* ImplGetNextContentFrame( bool bFwd ) const; protected: bool MakePrtArea( const SwBorderAttrs & ); virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; - SwContentFrm( SwContentNode * const, SwFrm* ); + SwContentFrame( SwContentNode * const, SwFrame* ); virtual void DestroyImpl() override; - virtual ~SwContentFrm(); + virtual ~SwContentFrame(); public: virtual void Cut() override; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; inline const SwContentNode *GetNode() const; inline SwContentNode *GetNode(); - inline const SwContentFrm *GetFollow() const; - inline SwContentFrm *GetFollow(); - inline const SwContentFrm *GetPrecede() const; - SwTextFrm* FindMaster() const; + inline const SwContentFrame *GetFollow() const; + inline SwContentFrame *GetFollow(); + inline const SwContentFrame *GetPrecede() const; + SwTextFrame* FindMaster() const; // layout dependent cursor travelling virtual bool LeftMargin( SwPaM * ) const; @@ -92,51 +92,51 @@ public: // bTst indicates that we are currently doing a test formatting virtual bool WouldFit( SwTwips &nMaxHeight, bool &bSplit, bool bTst ); - bool MoveFootnoteCntFwd( bool, SwFootnoteBossFrm* ); // called by MoveFwd if content + bool MoveFootnoteCntFwd( bool, SwFootnoteBossFrame* ); // called by MoveFwd if content - inline SwContentFrm* GetNextContentFrm() const; - inline SwContentFrm* GetPrevContentFrm() const; - static bool CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave, long nBottom, bool bSkipRowSpanCells ); + inline SwContentFrame* GetNextContentFrame() const; + inline SwContentFrame* GetPrevContentFrame() const; + static bool CalcLowers( SwLayoutFrame* pLay, const SwLayoutFrame* pDontLeave, long nBottom, bool bSkipRowSpanCells ); void RegisterToNode( SwContentNode& ); }; -inline SwContentFrm* SwContentFrm::GetNextContentFrm() const +inline SwContentFrame* SwContentFrame::GetNextContentFrame() const { - if ( GetNext() && GetNext()->IsContentFrm() ) - return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetNext())); + if ( GetNext() && GetNext()->IsContentFrame() ) + return const_cast<SwContentFrame*>(static_cast<const SwContentFrame*>(GetNext())); else - return const_cast<SwContentFrm*>(ImplGetNextContentFrm( true )); + return const_cast<SwContentFrame*>(ImplGetNextContentFrame( true )); } -inline SwContentFrm* SwContentFrm::GetPrevContentFrm() const +inline SwContentFrame* SwContentFrame::GetPrevContentFrame() const { - if ( GetPrev() && GetPrev()->IsContentFrm() ) - return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(GetPrev())); + if ( GetPrev() && GetPrev()->IsContentFrame() ) + return const_cast<SwContentFrame*>(static_cast<const SwContentFrame*>(GetPrev())); else - return const_cast<SwContentFrm*>(ImplGetNextContentFrm( false )); + return const_cast<SwContentFrame*>(ImplGetNextContentFrame( false )); } -inline SwContentNode *SwContentFrm::GetNode() +inline SwContentNode *SwContentFrame::GetNode() { return static_cast< SwContentNode* >( GetDep() ); } -inline const SwContentNode *SwContentFrm::GetNode() const +inline const SwContentNode *SwContentFrame::GetNode() const { return static_cast< const SwContentNode* >( GetDep() ); } -inline const SwContentFrm *SwContentFrm::GetFollow() const +inline const SwContentFrame *SwContentFrame::GetFollow() const { - return static_cast<const SwContentFrm*>(SwFlowFrm::GetFollow()); + return static_cast<const SwContentFrame*>(SwFlowFrame::GetFollow()); } -inline SwContentFrm *SwContentFrm::GetFollow() +inline SwContentFrame *SwContentFrame::GetFollow() { - return static_cast<SwContentFrm*>(SwFlowFrm::GetFollow()); + return static_cast<SwContentFrame*>(SwFlowFrame::GetFollow()); } -inline const SwContentFrm *SwContentFrm::GetPrecede() const +inline const SwContentFrame *SwContentFrame::GetPrecede() const { - return static_cast<const SwContentFrm*>(SwFlowFrm::GetPrecede()); + return static_cast<const SwContentFrame*>(SwFlowFrame::GetPrecede()); } #endif diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index 66e4e387be59..e54e6b9b757a 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -23,19 +23,19 @@ #include <tools/mempool.hxx> #include "ftnboss.hxx" -class SwColumnFrm: public SwFootnoteBossFrm +class SwColumnFrame: public SwFootnoteBossFrame { private: virtual void DestroyImpl() override; - virtual ~SwColumnFrm(); + virtual ~SwColumnFrame(); public: - SwColumnFrm( SwFrameFormat*, SwFrm* ); + SwColumnFrame( SwFrameFormat*, SwFrame* ); virtual void PaintBreak() const override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; - DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrame) }; #endif // INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index 0febbf8f9a07..04bf1e6f3ee9 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -58,7 +58,7 @@ #include "swtypes.hxx" class SwImplProtocol; -class SwFrm; +class SwFrame; class SwImplEnterLeave; class SwProtocol @@ -71,7 +71,7 @@ public: static sal_uLong Record() { return nRecord; } static void SetRecord( sal_uLong nNew ) { nRecord = nNew; } static bool Record( sal_uLong nFunc ) { return 0 != (( nFunc | PROT_INIT ) & nRecord); } - static void Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAction, void* pParam ); + static void Record( const SwFrame* pFrame, sal_uLong nFunction, sal_uLong nAction, void* pParam ); static void Init(); static void Stop(); }; @@ -79,14 +79,14 @@ public: class SwEnterLeave { SwImplEnterLeave* pImpl; - void Ctor( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar ); + void Ctor( const SwFrame* pFrame, sal_uLong nFunc, sal_uLong nAct, void* pPar ); void Dtor(); public: - SwEnterLeave( const SwFrm* pFrm, sal_uLong nFunc, sal_uLong nAct, void* pPar ) + SwEnterLeave( const SwFrame* pFrame, sal_uLong nFunc, sal_uLong nAct, void* pPar ) { if( SwProtocol::Record( nFunc ) ) - Ctor( pFrm, nFunc, nAct, pPar ); + Ctor( pFrame, nFunc, nAct, pPar ); else pImpl = nullptr; } @@ -97,18 +97,18 @@ public: } }; -#define PROTOCOL( pFrm, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\ - SwProtocol::Record( pFrm, nFunc, nAct, pPar ); } +#define PROTOCOL( pFrame, nFunc, nAct, pPar ) { if( SwProtocol::Record( nFunc ) )\ + SwProtocol::Record( pFrame, nFunc, nAct, pPar ); } #define PROTOCOL_INIT SwProtocol::Init(); #define PROTOCOL_STOP SwProtocol::Stop(); -#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) SwEnterLeave aEnter( pFrm, nFunc, nAct, pPar ); +#define PROTOCOL_ENTER( pFrame, nFunc, nAct, pPar ) SwEnterLeave aEnter( pFrame, nFunc, nAct, pPar ); #else -#define PROTOCOL( pFrm, nFunc, nAct, pPar ) +#define PROTOCOL( pFrame, nFunc, nAct, pPar ) #define PROTOCOL_INIT #define PROTOCOL_STOP -#define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) +#define PROTOCOL_ENTER( pFrame, nFunc, nAct, pPar ) #endif diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 40eba1957acb..4a8274db6a28 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/svdovirt.hxx> -class SwFlyFrm; +class SwFlyFrame; class SwFrameFormat; class SdrObjMacroHitRec; @@ -60,7 +60,7 @@ public: class SwVirtFlyDrawObj : public SdrVirtObj { private: - SwFlyFrm *m_pFlyFrm; + SwFlyFrame *m_pFlyFrame; protected: // AW: Need own sdr::contact::ViewContact since AnchorPos from parent is @@ -78,7 +78,7 @@ public: basegfx::B2DRange getInnerBound() const; - SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly); + SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrame* pFly); virtual ~SwVirtFlyDrawObj(); // override method of base class SdrVirtObj @@ -110,8 +110,8 @@ public: SwFrameFormat *GetFormat(); // methods to get pointers for the Fly - SwFlyFrm* GetFlyFrm() { return m_pFlyFrm; } - const SwFlyFrm* GetFlyFrm() const { return m_pFlyFrm; } + SwFlyFrame* GetFlyFrame() { return m_pFlyFrame; } + const SwFlyFrame* GetFlyFrame() const { return m_pFlyFrame; } void SetRect() const; diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index bec2ad9ddbd0..47531e223514 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -28,7 +28,7 @@ class SwTextField; class SwIndex; class SwNodeIndex; -class SwContentFrm; +class SwContentFrame; class SwSectionNode; class SwSection; class SwTextTOXMark; @@ -100,7 +100,7 @@ public: const SwNode* GetNodeFromContent() const; sal_Int32 GetCntPosFromContent() const; - void SetBodyPos( const SwContentFrm& rFrm ); + void SetBodyPos( const SwContentFrame& rFrame ); }; class _SetGetExpFields : public o3tl::sorted_vector<_SetGetExpField*, o3tl::less_ptr_to<_SetGetExpField> > diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index a8852e164cbc..d5cc3daafda2 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -25,7 +25,7 @@ #include <vcl/vclptr.hxx> #include <vcl/outdev.hxx> -class SwTextFrm; +class SwTextFrame; class SwViewShell; class SwScriptInfo; class Point; @@ -42,7 +42,7 @@ class SwUnderlineFont; // encapsulates information for drawing text class SW_DLLPUBLIC SwDrawTextInfo { - const SwTextFrm* m_pFrm; + const SwTextFrame* m_pFrame; VclPtr<OutputDevice> m_pOut; SwViewShell const * m_pSh; const SwScriptInfo* m_pScriptInfo; @@ -79,8 +79,8 @@ class SW_DLLPUBLIC SwDrawTextInfo bool m_bSpaceStop : 1; bool m_bSnapToGrid : 1; // Does paragraph snap to grid? // Paint text as if text has LTR direction, used for line numbering - bool m_bIgnoreFrmRTL : 1; - // GetCrsrOfst should not return the next position if screen position is + bool m_bIgnoreFrameRTL : 1; + // GetCursorOfst should not return the next position if screen position is // inside second half of bound rect, used for Accessibility bool m_bPosMatchesBounds :1; @@ -114,7 +114,7 @@ public: vcl::TextLayoutCache const*const pCachedVclData = nullptr) : m_pCachedVclData(pCachedVclData) { - m_pFrm = nullptr; + m_pFrame = nullptr; m_pSh = pSh; m_pOut = &rOut; m_pScriptInfo = pSI; @@ -131,7 +131,7 @@ public: m_bGreyWave = false; m_bSpaceStop = false; m_bSnapToGrid = false; - m_bIgnoreFrmRTL = false; + m_bIgnoreFrameRTL = false; m_bPosMatchesBounds = false; // These values are initialized but have to be set explicitly via their @@ -162,14 +162,14 @@ public: #endif } - const SwTextFrm* GetFrm() const + const SwTextFrame* GetFrame() const { - return m_pFrm; + return m_pFrame; } - void SetFrm( const SwTextFrm* pNewFrm ) + void SetFrame( const SwTextFrame* pNewFrame ) { - m_pFrm = pNewFrm; + m_pFrame = pNewFrame; } SwViewShell const *GetShell() const @@ -379,9 +379,9 @@ public: return m_bSnapToGrid; } - bool IsIgnoreFrmRTL() const + bool IsIgnoreFrameRTL() const { - return m_bIgnoreFrmRTL; + return m_bIgnoreFrameRTL; } bool IsPosMatchesBounds() const @@ -590,9 +590,9 @@ public: m_bSnapToGrid = bNew; } - void SetIgnoreFrmRTL( bool bNew ) + void SetIgnoreFrameRTL( bool bNew ) { - m_bIgnoreFrmRTL = bNew; + m_bIgnoreFrameRTL = bNew; } void SetPosMatchesBounds( bool bNew ) diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index dad1fe298a39..9bf76c1ede5e 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -23,8 +23,8 @@ class OutputDevice; class SwViewShellImp; -class SwFrm; -class SwFlyFrm; +class SwFrame; +class SwFlyFrame; class SwAnchoredObject; class SdrUndoManager; @@ -33,7 +33,7 @@ class SwDrawView : public FmFormView Point aAnchorPoint; // anchor position SwViewShellImp &rImp; // a view is always part of a shell - const SwFrm *CalcAnchor(); + const SwFrame *CalcAnchor(); /** determine maximal order number for a 'child' object of given 'parent' object @@ -50,7 +50,7 @@ class SwDrawView : public FmFormView optional input parameter - 'child' object, which will not be considered on the calculation of the maximal order number */ - static sal_uInt32 _GetMaxChildOrdNum( const SwFlyFrm& _rParentObj, + static sal_uInt32 _GetMaxChildOrdNum( const SwFlyFrame& _rParentObj, const SdrObject* _pExclChildObj = nullptr ); /** method to move 'repeated' objects of the given moved object to the diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx index 462dfbd87ab9..13415589191e 100644 --- a/sw/source/core/inc/environmentofanchoredobject.hxx +++ b/sw/source/core/inc/environmentofanchoredobject.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SW_SOURCE_CORE_INC_ENVIRONMENTOFANCHOREDOBJECT_HXX #define INCLUDED_SW_SOURCE_CORE_INC_ENVIRONMENTOFANCHOREDOBJECT_HXX -class SwFrm; -class SwLayoutFrm; +class SwFrame; +class SwLayoutFrame; namespace objectpositioning { @@ -56,7 +56,7 @@ namespace objectpositioning - no exception any more. Thus remove parameter <_bForPageAlignment> - @param _rHoriOrientFrm + @param _rHoriOrientFrame input parameter - frame, at which the horizontal position is oriented at (typically it's the anchor frame). starting point for the search of the layout frame. @@ -64,7 +64,7 @@ namespace objectpositioning @return reference to the layout frame, which determines the the horizontal environment the object has to be positioned in. */ - const SwLayoutFrm& GetHoriEnvironmentLayoutFrm( const SwFrm& _rHoriOrientFrm ) const; + const SwLayoutFrame& GetHoriEnvironmentLayoutFrame( const SwFrame& _rHoriOrientFrame ) const; /** determine environment layout frame for possible vertical object positions respectively for alignments to 'page areas' @@ -81,7 +81,7 @@ namespace objectpositioning - no exception any more. Thus remove parameter <_bForPageAlignment> - @param _rVertOrientFrm + @param _rVertOrientFrame input parameter - frame, at which the vertical position is oriented at (typically it's the anchor frame). starting point for the search of the layout frame. @@ -89,7 +89,7 @@ namespace objectpositioning @return reference to the layout frame, which determines the the vertical environment the object has to be positioned in. */ - const SwLayoutFrm& GetVertEnvironmentLayoutFrm( const SwFrm& _rVertOrientFrm ) const; + const SwLayoutFrame& GetVertEnvironmentLayoutFrame( const SwFrame& _rVertOrientFrame ) const; }; } diff --git a/sw/source/core/inc/fefly.hxx b/sw/source/core/inc/fefly.hxx index 6ab335a436d7..b030b47f16af 100644 --- a/sw/source/core/inc/fefly.hxx +++ b/sw/source/core/inc/fefly.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_CORE_INC_FEFLY_HXX #define INCLUDED_SW_SOURCE_CORE_INC_FEFLY_HXX -bool sw_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ); +bool sw_ChkAndSetNewAnchor( const SwFlyFrame& rFly, SfxItemSet& rSet ); #endif diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index d94bd5e9fda5..86771b5bc56f 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -22,66 +22,66 @@ #include "frmtool.hxx" -class SwPageFrm; +class SwPageFrame; class SwRect; class SwBorderAttrs; class SwDoc; class SwNodeIndex; // #i44049# -class SwObjectFormatterTextFrm; +class SwObjectFormatterTextFrame; /** Base class that provides the general functionalities for frames that are allowed at page breaks (flow) and shall continue on the next page (can be - split), e.g. paragraphs (ContentFrm) or tables (TabFrm). + split), e.g. paragraphs (ContentFrame) or tables (TabFrame). - Some parts of these functionalities are implemented in FlowFrm while the - specific ones are done in the corresponding Frm classes. The FlowFrm has to - be seen as a base class. As such it is no Frm by itself and thus no direct - instances of FlowFrm can exist. + Some parts of these functionalities are implemented in FlowFrame while the + specific ones are done in the corresponding Frame classes. The FlowFrame has to + be seen as a base class. As such it is no Frame by itself and thus no direct + instances of FlowFrame can exist. - Actually it is not even a real Frm. The obvious implementation would be a - FlowFrm that is virtually inherited from SwFrm and that works with its own - member data. Further classes would need to inherit from FlowFrm and (via + Actually it is not even a real Frame. The obvious implementation would be a + FlowFrame that is virtually inherited from SwFrame and that works with its own + member data. Further classes would need to inherit from FlowFrame and (via multiple base classes since the class tree splits exactly at the branch - from SwFrm to SwContentFrm and SwLayoutFrm) also virtually from SwFrm as + from SwFrame to SwContentFrame and SwLayoutFrame) also virtually from SwFrame as well. Unfortunately, this leads - besides problems with compilers and debugging programs - to high additional costs, that we IMHO are not able to afford nowadays. - Hence, we use another technique: A FlowFrm keeps a reference to a SwFrm + Hence, we use another technique: A FlowFrame keeps a reference to a SwFrame - which it is actually itself - and they are friends. As a result, the - FlowFrm can work with the reference to the SwFrm instead of working with + FlowFrame can work with the reference to the SwFrame instead of working with its own this-pointer. */ -class SwFlowFrm +class SwFlowFrame { // PrepareMake is allowed to lock/unlock (robustness) - friend inline void PrepareLock ( SwFlowFrm * ); - friend inline void PrepareUnlock( SwFlowFrm * ); - friend inline void TableSplitRecalcLock( SwFlowFrm * ); - friend inline void TableSplitRecalcUnlock( SwFlowFrm * ); + friend inline void PrepareLock ( SwFlowFrame * ); + friend inline void PrepareUnlock( SwFlowFrame * ); + friend inline void TableSplitRecalcLock( SwFlowFrame * ); + friend inline void TableSplitRecalcUnlock( SwFlowFrame * ); // #i44049# - friend class SwObjectFormatterTextFrm; - friend class FlowFrmJoinLockGuard; + friend class SwObjectFormatterTextFrame; + friend class FlowFrameJoinLockGuard; // TableSel is allowed to reset the follow-bit - friend inline void UnsetFollow( SwFlowFrm *pFlow ); + friend inline void UnsetFollow( SwFlowFrame *pFlow ); - friend void MakeFrms( SwDoc *, const SwNodeIndex &, const SwNodeIndex & ); + friend void MakeFrames( SwDoc *, const SwNodeIndex &, const SwNodeIndex & ); friend class SwNode2LayImpl; - SwFrm& m_rThis; + SwFrame& m_rThis; // helper methods for MoveSubTree() - static SwLayoutFrm *CutTree( SwFrm* ); - static bool PasteTree( SwFrm *, SwLayoutFrm *, SwFrm *, SwFrm* ); + static SwLayoutFrame *CutTree( SwFrame* ); + static bool PasteTree( SwFrame *, SwLayoutFrame *, SwFrame *, SwFrame* ); /** indicates that a backward move was done over multiple pages Needed for the interaction of _GetPrevxxx and MoveBwd so that multiple pages can be skipped at the same time. In addition, it is evaluated by - the MoveBwd() method in TabFrm. + the MoveBwd() method in TabFrame. */ static bool m_bMoveBwdJump; @@ -90,18 +90,18 @@ class SwFlowFrm #i11860# - @param _pProposedPrevFrm + @param _pProposedPrevFrame optional input parameter - pointer to frame, which should be used instead of the direct previous frame. */ - const SwFrm* _GetPrevFrmForUpperSpaceCalc( const SwFrm* _pProposedPrevFrm = nullptr ) const; + const SwFrame* _GetPrevFrameForUpperSpaceCalc( const SwFrame* _pProposedPrevFrame = nullptr ) const; /** method to detemine the upper space amount, which is considered for the previous frame #i11860# */ - SwTwips _GetUpperSpaceAmountConsideredForPrevFrm() const; + SwTwips _GetUpperSpaceAmountConsideredForPrevFrame() const; /** method to detemine the upper space amount, which is considered for the page grid @@ -112,8 +112,8 @@ class SwFlowFrm const SwTwips _nUpperSpaceWithoutGrid ) const; protected: - SwFlowFrm *m_pFollow; - SwFlowFrm *m_pPrecede; + SwFlowFrame *m_pFollow; + SwFlowFrame *m_pPrecede; bool m_bLockJoin :1; // if true than joins (and thus deletes) are prohibited! bool m_bUndersized:1; // I am smaller than needed @@ -122,17 +122,17 @@ protected: // checks if forward flow makes sense to prevent infinite moves inline bool IsFwdMoveAllowed(); // #i44049# - method <CalcContent(..)> has to check this property. - friend void CalcContent( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow ); + friend void CalcContent( SwLayoutFrame *pLay, bool bNoColl, bool bNoCalcFollow ); bool IsKeepFwdMoveAllowed(); // like above, forward flow for Keep. /** method to determine overlapping of an object that requests floating 0: no overlapping - 1: objects that are anchored at the FlowFrm overlap + 1: objects that are anchored at the FlowFrame overlap 2: objects that are anchored somewhere else overlap 3: both types of objects overlap */ - sal_uInt8 BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect ); + sal_uInt8 BwdMoveNecessary( const SwPageFrame *pPage, const SwRect &rRect ); void LockJoin() { m_bLockJoin = true; } void UnlockJoin() { m_bLockJoin = false; } @@ -140,14 +140,14 @@ protected: bool CheckMoveFwd( bool& rbMakePage, bool bKeep, bool bMovedBwd ); bool MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways = false ); bool MoveBwd( bool &rbReformat ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat )=0; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool bHead, bool &rReformat )=0; public: - SwFlowFrm( SwFrm &rFrm ); - virtual ~SwFlowFrm(); + SwFlowFrame( SwFrame &rFrame ); + virtual ~SwFlowFrame(); - const SwFrm& GetFrm() const { return m_rThis; } - SwFrm& GetFrm() { return m_rThis; } + const SwFrame& GetFrame() const { return m_rThis; } + SwFrame& GetFrame() { return m_rThis; } static bool IsMoveBwdJump() { return m_bMoveBwdJump; } static void SetMoveBwdJump( bool bNew ){ m_bMoveBwdJump = bNew; } @@ -158,17 +158,17 @@ public: bool IsPrevObjMove() const; /** hook tree onto new parent with minimal operations and notifications */ - void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = nullptr ); + void MoveSubTree( SwLayoutFrame* pParent, SwFrame* pSibling = nullptr ); bool HasFollow() const { return m_pFollow != nullptr; } bool IsFollow() const { return nullptr != m_pPrecede; } - bool IsAnFollow( const SwFlowFrm *pFlow ) const; - const SwFlowFrm *GetFollow() const { return m_pFollow; } - SwFlowFrm *GetFollow() { return m_pFollow; } - void SetFollow(SwFlowFrm *const pFollow); + bool IsAnFollow( const SwFlowFrame *pFlow ) const; + const SwFlowFrame *GetFollow() const { return m_pFollow; } + SwFlowFrame *GetFollow() { return m_pFollow; } + void SetFollow(SwFlowFrame *const pFollow); - const SwFlowFrm *GetPrecede() const { return m_pPrecede; } - SwFlowFrm *GetPrecede() { return m_pPrecede; } + const SwFlowFrame *GetPrecede() const { return m_pPrecede; } + SwFlowFrame *GetPrecede() { return m_pPrecede; } bool IsJoinLocked() const { return m_bLockJoin; } bool IsAnyJoinLocked() const { return m_bLockJoin || HasLockedFollow(); } @@ -191,7 +191,7 @@ public: optional input parameter - consider the page grid while calculating? */ SwTwips CalcUpperSpace( const SwBorderAttrs *pAttrs = nullptr, - const SwFrm* pPr = nullptr, + const SwFrame* pPr = nullptr, const bool _bConsiderGrid = true ) const; /** method to determine the upper space amount, which is considered for @@ -200,7 +200,7 @@ public: #i11860# */ - SwTwips GetUpperSpaceAmountConsideredForPrevFrmAndPageGrid() const; + SwTwips GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid() const; /** calculation of lower space */ SwTwips CalcLowerSpace( const SwBorderAttrs* _pAttrs = nullptr ) const; @@ -225,31 +225,31 @@ public: void SetFlyLock( bool bNew ){ m_bFlyLock = bNew; } bool IsFlyLock() const { return m_bFlyLock; } - // Casting of a Frm into a FlowFrm (if it is one, otherwise 0) + // Casting of a Frame into a FlowFrame (if it is one, otherwise 0) // These methods need to be customized in subclasses! - static SwFlowFrm *CastFlowFrm( SwFrm *pFrm ); - static const SwFlowFrm *CastFlowFrm( const SwFrm *pFrm ); + static SwFlowFrame *CastFlowFrame( SwFrame *pFrame ); + static const SwFlowFrame *CastFlowFrame( const SwFrame *pFrame ); }; -inline bool SwFlowFrm::IsFwdMoveAllowed() +inline bool SwFlowFrame::IsFwdMoveAllowed() { return m_rThis.GetIndPrev() != nullptr; } -//use this to protect a SwLayoutFrm for a given scope from getting merged with +//use this to protect a SwLayoutFrame for a given scope from getting merged with //its neighbour and thus deleted -class FlowFrmJoinLockGuard +class FlowFrameJoinLockGuard { private: - SwFlowFrm *m_pFlow; + SwFlowFrame *m_pFlow; bool m_bOldJoinLocked; public: //JoinLock pParent for the lifetime of the Cut/Paste call, etc. to avoid - //SwSectionFrm::MergeNext removing the pParent we're trying to reparent + //SwSectionFrame::MergeNext removing the pParent we're trying to reparent //into - FlowFrmJoinLockGuard(SwLayoutFrm* pFrm) + FlowFrameJoinLockGuard(SwLayoutFrame* pFrame) { - m_pFlow = SwFlowFrm::CastFlowFrm(pFrm); + m_pFlow = SwFlowFrame::CastFlowFrame(pFrame); if (m_pFlow) { m_bOldJoinLocked = m_pFlow->IsJoinLocked(); @@ -261,7 +261,7 @@ public: } } - ~FlowFrmJoinLockGuard() + ~FlowFrameJoinLockGuard() { if (m_pFlow && !m_bOldJoinLocked) m_pFlow->UnlockJoin(); diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index dbe0e03812b3..22c766066d69 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -24,9 +24,9 @@ #include <list> #include "frmfmt.hxx" -class SwPageFrm; -class SwFormatFrmSize; -struct SwCrsrMoveState; +class SwPageFrame; +class SwFormatFrameSize; +struct SwCursorMoveState; class SwBorderAttrs; class SwVirtFlyDrawObj; class SwFrameFormats; @@ -44,7 +44,7 @@ class SwFormat; implemented in layout/flycnt.cxx */ -const SwContentFrm *FindAnchor( const SwFrm *pOldAnch, const Point &rNew, +const SwContentFrame *FindAnchor( const SwFrame *pOldAnch, const Point &rNew, const bool bBody = false ); /** calculate rectangle in that the object can be moved or rather be resized */ @@ -52,13 +52,13 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, bool bMove = true ); /** general base class for all free-flowing frames - #i26791# - inherit also from <SwAnchoredFlyFrm> + #i26791# - inherit also from <SwAnchoredFlyFrame> */ -class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject +class SwFlyFrame : public SwLayoutFrame, public SwAnchoredObject { // is allowed to lock, implemented in frmtool.cxx - friend void AppendObjs ( const SwFrameFormats *, sal_uLong, SwFrm *, SwPageFrm *, SwDoc* ); - friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld, + friend void AppendObjs ( const SwFrameFormats *, sal_uLong, SwFrame *, SwPageFrame *, SwDoc* ); + friend void Notify( SwFlyFrame *, SwPageFrame *pOld, const SwRect &rOld, const SwRect* pOldPrt ); void InitDrawObj( bool bNotify ); // these to methods are called in the @@ -67,14 +67,14 @@ class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); - using SwLayoutFrm::CalcRel; + using SwLayoutFrame::CalcRel; sal_uInt32 _GetOrdNumForNewRef( const SwFlyDrawContact* ); SwVirtFlyDrawObj* CreateNewRef( SwFlyDrawContact* ); protected: // Predecessor/Successor for chaining with text flow - SwFlyFrm *m_pPrevLink, *m_pNextLink; + SwFlyFrame *m_pPrevLink, *m_pNextLink; private: // It must be possible to block Content-bound flys so that they will be not @@ -116,9 +116,9 @@ protected: // is moved to an invisible layer. bool m_bLockDeleteContent :1; - friend class SwNoTextFrm; // is allowed to call NotifyBackground + friend class SwNoTextFrame; // is allowed to call NotifyBackground - Point m_aContentPos; // content area's position relatively to Frm + Point m_aContentPos; // content area's position relatively to Frame bool m_bValidContentPos; virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; @@ -128,13 +128,13 @@ protected: void Lock() { m_bLocked = true; } void Unlock() { m_bLocked = false; } - Size CalcRel( const SwFormatFrmSize &rSz ) const; + Size CalcRel( const SwFormatFrameSize &rSz ) const; SwTwips CalcAutoWidth() const; - SwFlyFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); + SwFlyFrame( SwFlyFrameFormat*, SwFrame*, SwFrame *pAnchor ); virtual void DestroyImpl() override; - virtual ~SwFlyFrm(); + virtual ~SwFlyFrame(); /** method to assure that anchored object is registered at the correct page frame @@ -159,28 +159,28 @@ public: virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual Size ChgSize( const Size& aNewSize ) override; - virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = nullptr, bool bTestBackground = false ) const override; + virtual bool GetCursorOfst( SwPosition *, Point&, + SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; virtual void CheckDirection( bool bVert ) override; virtual void Cut() override; #ifdef DBG_UTIL - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; #endif SwTwips _Shrink( SwTwips, bool bTst ); SwTwips _Grow ( SwTwips, bool bTst ); - void _Invalidate( SwPageFrm *pPage = nullptr ); + void _Invalidate( SwPageFrame *pPage = nullptr ); - bool FrmSizeChg( const SwFormatFrmSize & ); + bool FrameSizeChg( const SwFormatFrameSize & ); - SwFlyFrm *GetPrevLink() const { return m_pPrevLink; } - SwFlyFrm *GetNextLink() const { return m_pNextLink; } + SwFlyFrame *GetPrevLink() const { return m_pPrevLink; } + SwFlyFrame *GetNextLink() const { return m_pNextLink; } - static void ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ); - static void UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ); + static void ChainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ); + static void UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow ); - SwFlyFrm *FindChainNeighbour( SwFrameFormat &rFormat, SwFrm *pAnch = nullptr ); + SwFlyFrame *FindChainNeighbour( SwFrameFormat &rFormat, SwFrame *pAnch = nullptr ); // #i26791# const SwVirtFlyDrawObj* GetVirtDrawObj() const; @@ -189,16 +189,16 @@ public: void ChgRelPos( const Point &rAbsPos ); bool IsInvalid() const { return m_bInvalid; } - void Invalidate() const { const_cast<SwFlyFrm*>(this)->m_bInvalid = true; } - void Validate() const { const_cast<SwFlyFrm*>(this)->m_bInvalid = false; } + void Invalidate() const { const_cast<SwFlyFrame*>(this)->m_bInvalid = true; } + void Validate() const { const_cast<SwFlyFrame*>(this)->m_bInvalid = false; } bool IsMinHeight() const { return m_bMinHeight; } bool IsLocked() const { return m_bLocked; } bool IsAutoPos() const { return m_bAutoPosition; } - bool IsFlyInCntFrm() const { return m_bInCnt; } - bool IsFlyFreeFrm() const { return m_bAtCnt || m_bLayout; } - bool IsFlyLayFrm() const { return m_bLayout; } - bool IsFlyAtCntFrm() const { return m_bAtCnt; } + bool IsFlyInContentFrame() const { return m_bInCnt; } + bool IsFlyFreeFrame() const { return m_bAtCnt || m_bLayout; } + bool IsFlyLayFrame() const { return m_bLayout; } + bool IsFlyAtContentFrame() const { return m_bAtCnt; } bool IsNotifyBack() const { return m_bNotifyBack; } void SetNotifyBack() { m_bNotifyBack = true; } @@ -209,13 +209,13 @@ public: bool IsClipped() const { return m_bHeightClipped || m_bWidthClipped; } bool IsHeightClipped() const { return m_bHeightClipped; } - bool IsLowerOf( const SwLayoutFrm* pUpper ) const; - inline bool IsUpperOf( const SwFlyFrm& _rLower ) const + bool IsLowerOf( const SwLayoutFrame* pUpper ) const; + inline bool IsUpperOf( const SwFlyFrame& _rLower ) const { return _rLower.IsLowerOf( this ); } - SwFrm *FindLastLower(); + SwFrame *FindLastLower(); // #i13147# - add parameter <_bForPaint> to avoid load of // the graphic during paint. Default value: false @@ -225,7 +225,7 @@ public: // Paint on this shell (consider Preview, print flag, etc. recursively)? static bool IsPaint( SdrObject *pObj, const SwViewShell *pSh ); - /** SwFlyFrm::IsBackgroundTransparent + /** SwFlyFrame::IsBackgroundTransparent determines if background of fly frame has to be drawn transparently @@ -236,7 +236,7 @@ public: */ bool IsBackgroundTransparent() const; - void Chain( SwFrm* _pAnchor ); + void Chain( SwFrame* _pAnchor ); void Unchain(); void InsertCnt(); void DeleteCnt(); @@ -261,13 +261,13 @@ public: virtual bool IsFormatPossible() const override; static void GetAnchoredObjects( std::list<SwAnchoredObject*>&, const SwFormat& rFormat ); - // overwriting "SwFrameFormat *SwLayoutFrm::GetFormat" to provide the correct derived return type. + // overwriting "SwFrameFormat *SwLayoutFrame::GetFormat" to provide the correct derived return type. // (This is in order to skip on the otherwise necessary casting of the result to // 'SwFlyFrameFormat *' after calls to this function. The casting is now done in this function.) virtual const SwFlyFrameFormat *GetFormat() const override; virtual SwFlyFrameFormat *GetFormat() override; - virtual void dumpAsXml( xmlTextWriterPtr writer ) const override { SwLayoutFrm::dumpAsXml( writer ); }; + virtual void dumpAsXml( xmlTextWriterPtr writer ) const override { SwLayoutFrame::dumpAsXml( writer ); }; virtual void Calc(vcl::RenderContext* pRenderContext) const override; diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index 115f25e8fd71..a887f46af6b8 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -24,11 +24,11 @@ #include "flyfrm.hxx" // #i28701# -class SwFlyAtCntFrm; +class SwFlyAtContentFrame; // Base class for those Flys that can "move freely" or better that are not // bound in Content. -class SwFlyFreeFrm : public SwFlyFrm +class SwFlyFreeFrame : public SwFlyFrame { // #i34753# - flag for at-page anchored Writer fly frames // to prevent a positioning - call of method <MakeObjPos()> -, if Writer @@ -38,9 +38,9 @@ class SwFlyFreeFrm : public SwFlyFrm // #i37068# - flag to prevent move in method <CheckClip(..)> bool mbNoMoveOnCheckClip; - SwRect maUnclippedFrm; + SwRect maUnclippedFrame; - void CheckClip( const SwFormatFrmSize &rSz ); //'Emergency' Clipping. + void CheckClip( const SwFormatFrameSize &rSz ); //'Emergency' Clipping. /** determines, if direct environment of fly frame has 'auto' size @@ -58,12 +58,12 @@ protected: // #i28701# - new friend class <SwFlyNotify> for access to // method <NotifyBackground> friend class SwFlyNotify; - virtual void NotifyBackground( SwPageFrm *pPage, + virtual void NotifyBackground( SwPageFrame *pPage, const SwRect& rRect, PrepareHint eHint) override; - SwFlyFreeFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); + SwFlyFreeFrame( SwFlyFrameFormat*, SwFrame*, SwFrame *pAnchor ); virtual void DestroyImpl() override; - virtual ~SwFlyFreeFrm(); + virtual ~SwFlyFreeFrame(); public: // #i28701# @@ -82,14 +82,14 @@ public: // #i34753# - accessors for member <mbNoMakePos> inline void SetNoMakePos( const bool _bNoMakePos ) { - if ( IsFlyLayFrm() ) + if ( IsFlyLayFrame() ) { mbNoMakePos = _bNoMakePos; } } inline bool IsNoMakePos() const { - if ( IsFlyLayFrm() ) + if ( IsFlyLayFrame() ) { return mbNoMakePos; } @@ -99,39 +99,39 @@ public: } } - inline const SwRect& GetUnclippedFrm( ) const + inline const SwRect& GetUnclippedFrame( ) const { - if ( maUnclippedFrm.HasArea( ) ) - return maUnclippedFrm; + if ( maUnclippedFrame.HasArea( ) ) + return maUnclippedFrame; else - return Frm(); + return Frame(); } /** method to determine, if a format on the Writer fly frame is possible #i28701# refine 'IsFormatPossible'-conditions of method - <SwFlyFrm::IsFormatPossible()> by: + <SwFlyFrame::IsFormatPossible()> by: format isn't possible, if Writer fly frame isn't registered at a page frame and its anchor frame isn't inside another Writer fly frame. */ virtual bool IsFormatPossible() const override; }; -// Flys that are bound to LayoutFrms and not to Content -class SwFlyLayFrm : public SwFlyFreeFrm +// Flys that are bound to LayoutFrames and not to Content +class SwFlyLayFrame : public SwFlyFreeFrame { public: // #i28701# - SwFlyLayFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); + SwFlyLayFrame( SwFlyFrameFormat*, SwFrame*, SwFrame *pAnchor ); protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; }; // Flys that are bound to Content but not in Content -class SwFlyAtCntFrm : public SwFlyFreeFrm +class SwFlyAtContentFrame : public SwFlyFreeFrame { protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; @@ -150,7 +150,7 @@ protected: public: // #i28701# - SwFlyAtCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); + SwFlyAtContentFrame( SwFlyFrameFormat*, SwFrame*, SwFrame *pAnchor ); void SetAbsPos( const Point &rNew ); @@ -161,14 +161,14 @@ public: #i28701# refine 'IsFormatPossible'-conditions of method - <SwFlyFreeFrm::IsFormatPossible()> by: + <SwFlyFreeFrame::IsFormatPossible()> by: format isn't possible, if method <MakeAll()> is already in progress. */ virtual bool IsFormatPossible() const override; }; // Flys that are bound to a character in Content -class SwFlyInCntFrm : public SwFlyFrm +class SwFlyInContentFrame : public SwFlyFrame { Point aRef; // relative to this point AbsPos is being calculated @@ -176,10 +176,10 @@ class SwFlyInCntFrm : public SwFlyFrm bool bInvalidContent :1; virtual void DestroyImpl() override; - virtual ~SwFlyInCntFrm(); + virtual ~SwFlyInContentFrame(); protected: - virtual void NotifyBackground( SwPageFrm *pPage, + virtual void NotifyBackground( SwPageFrame *pPage, const SwRect& rRect, PrepareHint eHint) override; virtual void MakeAll(vcl::RenderContext* pRenderContext) override; virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; @@ -187,7 +187,7 @@ protected: public: // #i28701# - SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor ); + SwFlyInContentFrame( SwFlyFrameFormat*, SwFrame*, SwFrame *pAnchor ); virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; @@ -218,13 +218,13 @@ public: virtual void _ActionOnInvalidation( const InvalidationType _nInvalid ) override; }; -inline void SwFlyInCntFrm::InvalidateLayout() const +inline void SwFlyInContentFrame::InvalidateLayout() const { - const_cast<SwFlyInCntFrm*>(this)->bInvalidLayout = true; + const_cast<SwFlyInContentFrame*>(this)->bInvalidLayout = true; } -inline void SwFlyInCntFrm::InvalidateContent() const +inline void SwFlyInContentFrame::InvalidateContent() const { - const_cast<SwFlyInCntFrm*>(this)->bInvalidContent = true; + const_cast<SwFlyInContentFrame*>(this)->bInvalidContent = true; } diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 1a70f1f6e358..ed634e5d43b7 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -110,7 +110,7 @@ public: void DrawText( SwDrawTextInfo &rInf ); /// determine the TextSize (of the printer) Size GetTextSize( SwDrawTextInfo &rInf ); - sal_Int32 GetCrsrOfst( SwDrawTextInfo &rInf ); + sal_Int32 GetCursorOfst( SwDrawTextInfo &rInf ); void CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ); void CreatePrtFont( const OutputDevice& rOut ); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 9fcc0a9c9870..1a51e14c9da2 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -32,17 +32,17 @@ #include <com/sun/star/style/TabStop.hpp> -class SwLayoutFrm; -class SwRootFrm; -class SwPageFrm; -class SwFlyFrm; -class SwSectionFrm; -class SwFootnoteFrm; -class SwFootnoteBossFrm; -class SwTabFrm; -class SwRowFrm; -class SwFlowFrm; -class SwContentFrm; +class SwLayoutFrame; +class SwRootFrame; +class SwPageFrame; +class SwFlyFrame; +class SwSectionFrame; +class SwFootnoteFrame; +class SwFootnoteBossFrame; +class SwTabFrame; +class SwRowFrame; +class SwFlowFrame; +class SwContentFrame; class SfxPoolItem; class SwAttrSet; class SwViewShell; @@ -54,16 +54,16 @@ class XFillStyleItem; class XFillGradientItem; class SwSelectionList; struct SwPosition; -struct SwCrsrMoveState; +struct SwCursorMoveState; class SwFormat; class SwPrintData; class SwSortedObjs; class SwAnchoredObject; typedef struct _xmlTextWriter *xmlTextWriterPtr; -// Each FrmType is represented here as a bit. +// Each FrameType is represented here as a bit. // The bits must be set in a way that it can be determined with masking of -// which kind of FrmType an instance is _and_ from what classes it was derived. +// which kind of FrameType an instance is _and_ from what classes it was derived. // Each frame has in its base class a member that must be set by the // constructors accordingly. #define FRM_ROOT 0x0001 @@ -94,12 +94,12 @@ typedef struct _xmlTextWriter *xmlTextWriterPtr; #define FRM_HEADFOOT 0x0018 #define FRM_BODYFTNC 0x00a0 -class SwFrm; -typedef long (SwFrm:: *SwFrmGet)() const; -typedef bool (SwFrm:: *SwFrmMax)( long ); -typedef void (SwFrm:: *SwFrmMakePos)( const SwFrm*, const SwFrm*, bool ); +class SwFrame; +typedef long (SwFrame:: *SwFrameGet)() const; +typedef bool (SwFrame:: *SwFrameMax)( long ); +typedef void (SwFrame:: *SwFrameMakePos)( const SwFrame*, const SwFrame*, bool ); typedef long (*SwOperator)( long, long ); -typedef void (SwFrm:: *SwFrmSet)( long, long ); +typedef void (SwFrame:: *SwFrameSet)( long, long ); struct SwRectFnCollection { @@ -129,25 +129,25 @@ struct SwRectFnCollection SwRectSet fnSetPosX; SwRectSet fnSetPosY; - SwFrmGet fnGetTopMargin; - SwFrmGet fnGetBottomMargin; - SwFrmGet fnGetLeftMargin; - SwFrmGet fnGetRightMargin; - SwFrmSet fnSetXMargins; - SwFrmSet fnSetYMargins; - SwFrmGet fnGetPrtTop; - SwFrmGet fnGetPrtBottom; - SwFrmGet fnGetPrtLeft; - SwFrmGet fnGetPrtRight; + SwFrameGet fnGetTopMargin; + SwFrameGet fnGetBottomMargin; + SwFrameGet fnGetLeftMargin; + SwFrameGet fnGetRightMargin; + SwFrameSet fnSetXMargins; + SwFrameSet fnSetYMargins; + SwFrameGet fnGetPrtTop; + SwFrameGet fnGetPrtBottom; + SwFrameGet fnGetPrtLeft; + SwFrameGet fnGetPrtRight; SwRectDist fnTopDist; SwRectDist fnBottomDist; SwRectDist fnLeftDist; SwRectDist fnRightDist; - SwFrmMax fnSetLimit; + SwFrameMax fnSetLimit; SwRectMax fnOverStep; SwRectSetPos fnSetPos; - SwFrmMakePos fnMakePos; + SwFrameMakePos fnMakePos; SwOperator fnXDiff; SwOperator fnYDiff; SwOperator fnXInc; @@ -160,35 +160,35 @@ struct SwRectFnCollection typedef SwRectFnCollection* SwRectFn; extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R; -#define SWRECTFN( pFrm ) bool bVert = pFrm->IsVertical(); \ - bool bRev = pFrm->IsReverse(); \ - bool bVertL2R = pFrm->IsVertLR(); \ +#define SWRECTFN( pFrame ) bool bVert = pFrame->IsVertical(); \ + bool bRev = pFrame->IsReverse(); \ + bool bVertL2R = pFrame->IsVertLR(); \ SwRectFn fnRect = bVert ? \ ( bRev ? fnRectVL2R : ( bVertL2R ? fnRectVertL2R : fnRectVert ) ): \ ( bRev ? fnRectB2T : fnRectHori ); -#define SWRECTFNX( pFrm ) bool bVertX = pFrm->IsVertical(); \ - bool bRevX = pFrm->IsReverse(); \ - bool bVertL2RX = pFrm->IsVertLR(); \ +#define SWRECTFNX( pFrame ) bool bVertX = pFrame->IsVertical(); \ + bool bRevX = pFrame->IsReverse(); \ + bool bVertL2RX = pFrame->IsVertLR(); \ SwRectFn fnRectX = bVertX ? \ ( bRevX ? fnRectVL2R : ( bVertL2RX ? fnRectVertL2R : fnRectVert ) ): \ ( bRevX ? fnRectB2T : fnRectHori ); -#define SWREFRESHFN( pFrm ) { if( bVert != pFrm->IsVertical() || \ - bRev != pFrm->IsReverse() ) \ - bVert = pFrm->IsVertical(); \ - bRev = pFrm->IsReverse(); \ - bVertL2R = pFrm->IsVertLR(); \ +#define SWREFRESHFN( pFrame ) { if( bVert != pFrame->IsVertical() || \ + bRev != pFrame->IsReverse() ) \ + bVert = pFrame->IsVertical(); \ + bRev = pFrame->IsReverse(); \ + bVertL2R = pFrame->IsVertLR(); \ fnRect = bVert ? \ ( bRev ? fnRectVL2R : ( bVertL2R ? fnRectVertL2R : fnRectVert ) ): \ ( bRev ? fnRectB2T : fnRectHori ); } -#define SWRECTFN2( pFrm ) bool bVert = pFrm->IsVertical(); \ - bool bVertL2R = pFrm->IsVertLR(); \ - bool bNeighb = pFrm->IsNeighbourFrm(); \ +#define SWRECTFN2( pFrame ) bool bVert = pFrame->IsVertical(); \ + bool bVertL2R = pFrame->IsVertLR(); \ + bool bNeighb = pFrame->IsNeighbourFrame(); \ SwRectFn fnRect = bVert == bNeighb ? \ fnRectHori : ( bVertL2R ? fnRectVertL2R : fnRectVert ); -#define POS_DIFF( aFrm1, aFrm2 ) \ - ( (aFrm1.*fnRect->fnGetTop)() != (aFrm2.*fnRect->fnGetTop)() || \ - (aFrm1.*fnRect->fnGetLeft)() != (aFrm2.*fnRect->fnGetLeft)() ) +#define POS_DIFF( aFrame1, aFrame2 ) \ + ( (aFrame1.*fnRect->fnGetTop)() != (aFrame2.*fnRect->fnGetTop)() || \ + (aFrame1.*fnRect->fnGetLeft)() != (aFrame2.*fnRect->fnGetLeft)() ) // for GetNextLeaf/GetPrevLeaf. enum MakePageType @@ -213,23 +213,23 @@ namespace drawinglayer { namespace attribute { * level: pages, headers, footers, etc. (Inside a paragraph SwLinePortion * instances are used.) */ -class SW_DLLPUBLIC SwFrm: public SwClient, public SfxBroadcaster +class SW_DLLPUBLIC SwFrame: public SwClient, public SfxBroadcaster { - // the hidden Frm - friend class SwFlowFrm; - friend class SwLayoutFrm; + // the hidden Frame + friend class SwFlowFrame; + friend class SwLayoutFrame; friend class SwLooping; // voids lower during creation of a column - friend SwFrm *SaveContent( SwLayoutFrm *, SwFrm* pStart ); - friend void RestoreContent( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow ); + friend SwFrame *SaveContent( SwLayoutFrame *, SwFrame* pStart ); + friend void RestoreContent( SwFrame *, SwLayoutFrame *, SwFrame *pSibling, bool bGrow ); - // for validating a mistakenly invalidated one in SwContentFrm::MakeAll - friend void ValidateSz( SwFrm *pFrm ); + // for validating a mistakenly invalidated one in SwContentFrame::MakeAll + friend void ValidateSz( SwFrame *pFrame ); // implemented in text/txtftn.cxx, prevents Footnote oscillation - friend void ValidateText( SwFrm *pFrm ); + friend void ValidateText( SwFrame *pFrame ); - friend void MakeNxt( SwFrm *pFrm, SwFrm *pNxt ); + friend void MakeNxt( SwFrame *pFrame, SwFrame *pNxt ); // cache for (border) attributes static SwCache *mpCache; @@ -239,16 +239,16 @@ class SW_DLLPUBLIC SwFrm: public SwClient, public SfxBroadcaster // #i65250# // frame ID is now in general available - used for layout loop control - static sal_uInt32 mnLastFrmId; - const sal_uInt32 mnFrmId; + static sal_uInt32 mnLastFrameId; + const sal_uInt32 mnFrameId; - SwRootFrm *mpRoot; - SwLayoutFrm *mpUpper; - SwFrm *mpNext; - SwFrm *mpPrev; + SwRootFrame *mpRoot; + SwLayoutFrame *mpUpper; + SwFrame *mpNext; + SwFrame *mpPrev; - SwFrm *_FindNext(); - SwFrm *_FindPrev(); + SwFrame *_FindNext(); + SwFrame *_FindPrev(); /** method to determine next content frame in the same environment for a flow frame (content frame, table frame, section frame) @@ -274,10 +274,10 @@ class SW_DLLPUBLIC SwFrm: public SwClient, public SfxBroadcaster frame has to be in the same footnote frame. This parameter is only relevant for flow frames in footnotes. - @return SwContentFrm* + @return SwContentFrame* pointer to the found next content frame. It's NULL, if none exists. */ - SwContentFrm* _FindNextCnt( const bool _bInSameFootnote = false ); + SwContentFrame* _FindNextCnt( const bool _bInSameFootnote = false ); /** method to determine previous content frame in the same environment for a flow frame (content frame, table frame, section frame) @@ -303,26 +303,26 @@ class SW_DLLPUBLIC SwFrm: public SwClient, public SfxBroadcaster frame has to be in the same footnote frame. This parameter is only relevant for flow frames in footnotes. - @return SwContentFrm* + @return SwContentFrame* pointer to the found previous content frame. It's NULL, if none exists. */ - SwContentFrm* _FindPrevCnt( const bool _bInSameFootnote = false ); + SwContentFrame* _FindPrevCnt( const bool _bInSameFootnote = false ); - void _UpdateAttrFrm( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & ); - SwFrm* _GetIndNext(); + void _UpdateAttrFrame( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & ); + SwFrame* _GetIndNext(); void SetDirFlags( bool bVert ); - const SwLayoutFrm* ImplGetNextLayoutLeaf( bool bFwd ) const; + const SwLayoutFrame* ImplGetNextLayoutLeaf( bool bFwd ) const; - SwPageFrm* ImplFindPageFrm(); + SwPageFrame* ImplFindPageFrame(); protected: SwSortedObjs* mpDrawObjs; // draw objects, can be 0 - SwRect maFrm; // absolute position in document and size of the Frm - SwRect maPrt; // position relatively to Frm and size of PrtArea + SwRect maFrame; // absolute position in document and size of the Frame + SwRect maPrt; // position relatively to Frame and size of PrtArea - sal_uInt16 mnFrmType; //Who am I? + sal_uInt16 mnFrameType; //Who am I? bool mbReverse : 1; // Next line above/at the right side instead // under/at the left side of the previous line @@ -341,17 +341,17 @@ protected: bool mbValidLineNum : 1; bool mbFixSize : 1; // if true, frame will be painted completely even content was changed - // only partially. For ContentFrms a border (from Action) will exclusively + // only partially. For ContentFrames a border (from Action) will exclusively // painted if <mbCompletePaint> is true. bool mbCompletePaint : 1; bool mbRetouche : 1; // frame is responsible for retouching bool mbInfInvalid : 1; // InfoFlags are invalid - bool mbInfBody : 1; // Frm is in document body - bool mbInfTab : 1; // Frm is in a table - bool mbInfFly : 1; // Frm is in a Fly - bool mbInfFootnote : 1; // Frm is in a footnote - bool mbInfSct : 1; // Frm is in a section + bool mbInfBody : 1; // Frame is in document body + bool mbInfTab : 1; // Frame is in a table + bool mbInfFly : 1; // Frame is in a Fly + bool mbInfFootnote : 1; // Frame is in a footnote + bool mbInfSct : 1; // Frame is in a section bool mbColLocked : 1; // lock Grow/Shrink for column-wise section // or fly frames, will be set in Format bool m_isInDestroy : 1; @@ -361,32 +361,32 @@ protected: void ColUnlock() { mbColLocked = false; } virtual void DestroyImpl(); - virtual ~SwFrm(); + virtual ~SwFrame(); - // Only used by SwRootFrm Ctor to get 'this' into mpRoot... - void setRootFrm( SwRootFrm* pRoot ) { mpRoot = pRoot; } + // Only used by SwRootFrame Ctor to get 'this' into mpRoot... + void setRootFrame( SwRootFrame* pRoot ) { mpRoot = pRoot; } - SwPageFrm *InsertPage( SwPageFrm *pSibling, bool bFootnote ); + SwPageFrame *InsertPage( SwPageFrame *pSibling, bool bFootnote ); void PrepareMake(vcl::RenderContext* pRenderContext); void OptPrepareMake(); void MakePos(); // Format next frame of table frame to assure keeping attributes. - // In case of nested tables method <SwFrm::MakeAll()> is called to + // In case of nested tables method <SwFrame::MakeAll()> is called to // avoid formatting of superior table frame. - friend SwFrm* sw_FormatNextContentForKeep( SwTabFrm* pTabFrm ); + friend SwFrame* sw_FormatNextContentForKeep( SwTabFrame* pTabFrame ); virtual void MakeAll(vcl::RenderContext* pRenderContext) = 0; // adjust frames of a page SwTwips AdjustNeighbourhood( SwTwips nDiff, bool bTst = false ); // change only frame size not the size of PrtArea - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) = 0; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) = 0; + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) = 0; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) = 0; SwModify *GetDep() { return GetRegisteredInNonConst(); } const SwModify *GetDep() const { return GetRegisteredIn(); } - SwFrm( SwModify*, SwFrm* ); + SwFrame( SwModify*, SwFrame* ); void CheckDir( sal_uInt16 nDir, bool bVert, bool bOnlyBiDi, bool bBrowse ); @@ -424,67 +424,67 @@ public: } - sal_uInt16 GetType() const { return mnFrmType; } + sal_uInt16 GetType() const { return mnFrameType; } static SwCache &GetCache() { return *mpCache; } static SwCache *GetCachePtr() { return mpCache; } static void SetCache( SwCache *pNew ) { mpCache = pNew; } - // change PrtArea size and FrmSize + // change PrtArea size and FrameSize SwTwips Shrink( SwTwips, bool bTst = false, bool bInfo = false ); SwTwips Grow ( SwTwips, bool bTst = false, bool bInfo = false ); // different methods for inserting in layout tree (for performance reasons) // insert before pBehind or at the end of the chain below mpUpper - void InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind ); + void InsertBefore( SwLayoutFrame* pParent, SwFrame* pBehind ); // insert after pBefore or at the beginning of the chain below mpUpper - void InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore ); + void InsertBehind( SwLayoutFrame *pParent, SwFrame *pBefore ); // insert before pBehind or at the end of the chain while considering // the siblings of pSct - bool InsertGroupBefore( SwFrm* pParent, SwFrm* pWhere, SwFrm* pSct ); + bool InsertGroupBefore( SwFrame* pParent, SwFrame* pWhere, SwFrame* pSct ); void RemoveFromLayout(); // For internal use only - who ignores this will be put in a sack and has // to stay there for two days // Does special treatment for _Get[Next|Prev]Leaf() (for tables). - SwLayoutFrm *GetLeaf( MakePageType eMakePage, bool bFwd ); - SwLayoutFrm *GetNextLeaf ( MakePageType eMakePage ); - SwLayoutFrm *GetNextFootnoteLeaf( MakePageType eMakePage ); - SwLayoutFrm *GetNextSctLeaf( MakePageType eMakePage ); - SwLayoutFrm *GetNextCellLeaf( MakePageType eMakePage ); - SwLayoutFrm *GetPrevLeaf ( MakePageType eMakeFootnote = MAKEPAGE_FTN ); - SwLayoutFrm *GetPrevFootnoteLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); - SwLayoutFrm *GetPrevSctLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); - SwLayoutFrm *GetPrevCellLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); - const SwLayoutFrm *GetLeaf ( MakePageType eMakePage, bool bFwd, - const SwFrm *pAnch ) const; - - bool WrongPageDesc( SwPageFrm* pNew ); + SwLayoutFrame *GetLeaf( MakePageType eMakePage, bool bFwd ); + SwLayoutFrame *GetNextLeaf ( MakePageType eMakePage ); + SwLayoutFrame *GetNextFootnoteLeaf( MakePageType eMakePage ); + SwLayoutFrame *GetNextSctLeaf( MakePageType eMakePage ); + SwLayoutFrame *GetNextCellLeaf( MakePageType eMakePage ); + SwLayoutFrame *GetPrevLeaf ( MakePageType eMakeFootnote = MAKEPAGE_FTN ); + SwLayoutFrame *GetPrevFootnoteLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); + SwLayoutFrame *GetPrevSctLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); + SwLayoutFrame *GetPrevCellLeaf( MakePageType eMakeFootnote = MAKEPAGE_FTN ); + const SwLayoutFrame *GetLeaf ( MakePageType eMakePage, bool bFwd, + const SwFrame *pAnch ) const; + + bool WrongPageDesc( SwPageFrame* pNew ); //#i28701# - new methods to append/remove drawing objects void AppendDrawObj( SwAnchoredObject& _rNewObj ); void RemoveDrawObj( SwAnchoredObject& _rToRemoveObj ); - // work with chain of FlyFrms - void AppendFly( SwFlyFrm *pNew ); - void RemoveFly( SwFlyFrm *pToRemove ); + // work with chain of FlyFrames + void AppendFly( SwFlyFrame *pNew ); + void RemoveFly( SwFlyFrame *pToRemove ); const SwSortedObjs *GetDrawObjs() const { return mpDrawObjs; } SwSortedObjs *GetDrawObjs() { return mpDrawObjs; } // #i28701# - change purpose of method and adjust its name void InvalidateObjs( const bool _bInvaPosOnly, const bool _bNoInvaOfAsCharAnchoredObjs = true ); - virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage, + virtual void PaintBorder( const SwRect&, const SwPageFrame *pPage, const SwBorderAttrs & ) const; - void PaintBaBo( const SwRect&, const SwPageFrm *pPage = nullptr, + void PaintBaBo( const SwRect&, const SwPageFrame *pPage = nullptr, const bool bLowerBorder = false, const bool bOnlyTextBackground = false ) const; - void PaintBackground( const SwRect&, const SwPageFrm *pPage, + void PaintBackground( const SwRect&, const SwPageFrame *pPage, const SwBorderAttrs &, const bool bLowerMode = false, const bool bLowerBorder = false, const bool bOnlyTextBackground = false ) const; - void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*, + void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrame*, const Color *pColor, const editeng::SvxBorderStyle = css::table::BorderLineStyle::SOLID ) const; @@ -493,7 +493,7 @@ public: // FIXME: EasyHack (refactoring): rename method name in all files // retouch, not in the area of the given Rect! - void Retouche( const SwPageFrm *pPage, const SwRect &rRect ) const; + void Retouche( const SwPageFrame *pPage, const SwRect &rRect ) const; bool GetBackgroundBrush( drawinglayer::attribute::SdrAllFillAttributesHelperPtr& rFillAttributes, @@ -520,11 +520,11 @@ public: // If frame is inside a split table row, this function returns // the corresponding row frame in the follow table. - const SwRowFrm* IsInSplitTableRow() const; + const SwRowFrame* IsInSplitTableRow() const; // If frame is inside a follow flow row, this function returns // the corresponding row frame master table - const SwRowFrm* IsInFollowFlowRow() const; + const SwRowFrame* IsInFollowFlowRow() const; bool IsInBalancedSection() const; @@ -544,24 +544,24 @@ public: void CheckDirChange(); // returns upper left frame position for LTR and // upper right frame position for Asian / RTL frames - Point GetFrmAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const; + Point GetFrameAnchorPos( bool bIgnoreFlysAnchoredAtThisFrame ) const; /** determine, if frame is moveable in given environment method replaced 'old' method <bool IsMoveable() const>. Determines, if frame is moveable in given environment. if no environment - is given (parameter _pLayoutFrm == 0L), the movability in the actual + is given (parameter _pLayoutFrame == 0L), the movability in the actual environment (<this->GetUpper()) is checked. - @param _pLayoutFrm + @param _pLayoutFrame input parameter - given environment (layout frame), in which the movability will be checked. If not set ( == 0L ), actual environment is taken. @return boolean, indicating, if frame is moveable in given environment */ - bool IsMoveable( const SwLayoutFrm* _pLayoutFrm = nullptr ) const; + bool IsMoveable( const SwLayoutFrame* _pLayoutFrame = nullptr ) const; - // Is it permitted for the (Text)Frm to add a footnote in the current + // Is it permitted for the (Text)Frame to add a footnote in the current // environment (not e.g. for repeating table headlines) bool IsFootnoteAllowed() const; @@ -569,68 +569,68 @@ public: virtual void CheckDirection( bool bVert ); - void ReinitializeFrmSizeAttrFlags(); + void ReinitializeFrameSizeAttrFlags(); const SwAttrSet *GetAttrSet() const; inline bool HasFixSize() const { return mbFixSize; } // check all pages (starting from the given) and correct them if needed - static void CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields = true, SwPageFrm** ppPrev = nullptr); + static void CheckPageDescs( SwPageFrame *pStart, bool bNotifyFields = true, SwPageFrame** ppPrev = nullptr); // might return 0, with and without const - SwFrm *GetNext() { return mpNext; } - SwFrm *GetPrev() { return mpPrev; } - SwLayoutFrm *GetUpper() { return mpUpper; } - SwRootFrm *getRootFrm(){ return mpRoot; } - SwPageFrm *FindPageFrm() { return IsPageFrm() ? reinterpret_cast<SwPageFrm*>(this) : ImplFindPageFrm(); } - SwFrm *FindColFrm(); - SwRowFrm *FindRowFrm(); - SwFootnoteBossFrm *FindFootnoteBossFrm( bool bFootnotes = false ); - SwTabFrm *ImplFindTabFrm(); - SwFootnoteFrm *ImplFindFootnoteFrm(); - SwFlyFrm *ImplFindFlyFrm(); - SwSectionFrm *ImplFindSctFrm(); - SwFrm *FindFooterOrHeader(); - SwFrm *GetLower(); - const SwFrm *GetNext() const { return mpNext; } - const SwFrm *GetPrev() const { return mpPrev; } - const SwLayoutFrm *GetUpper() const { return mpUpper; } - const SwRootFrm *getRootFrm() const { return mpRoot; } - inline SwTabFrm *FindTabFrm(); - inline SwFootnoteFrm *FindFootnoteFrm(); - inline SwFlyFrm *FindFlyFrm(); - inline SwSectionFrm *FindSctFrm(); - inline SwFrm *FindNext(); + SwFrame *GetNext() { return mpNext; } + SwFrame *GetPrev() { return mpPrev; } + SwLayoutFrame *GetUpper() { return mpUpper; } + SwRootFrame *getRootFrame(){ return mpRoot; } + SwPageFrame *FindPageFrame() { return IsPageFrame() ? reinterpret_cast<SwPageFrame*>(this) : ImplFindPageFrame(); } + SwFrame *FindColFrame(); + SwRowFrame *FindRowFrame(); + SwFootnoteBossFrame *FindFootnoteBossFrame( bool bFootnotes = false ); + SwTabFrame *ImplFindTabFrame(); + SwFootnoteFrame *ImplFindFootnoteFrame(); + SwFlyFrame *ImplFindFlyFrame(); + SwSectionFrame *ImplFindSctFrame(); + SwFrame *FindFooterOrHeader(); + SwFrame *GetLower(); + const SwFrame *GetNext() const { return mpNext; } + const SwFrame *GetPrev() const { return mpPrev; } + const SwLayoutFrame *GetUpper() const { return mpUpper; } + const SwRootFrame *getRootFrame() const { return mpRoot; } + inline SwTabFrame *FindTabFrame(); + inline SwFootnoteFrame *FindFootnoteFrame(); + inline SwFlyFrame *FindFlyFrame(); + inline SwSectionFrame *FindSctFrame(); + inline SwFrame *FindNext(); // #i27138# - add parameter <_bInSameFootnote> - SwContentFrm* FindNextCnt( const bool _bInSameFootnote = false ); - inline SwFrm *FindPrev(); - inline const SwPageFrm *FindPageFrm() const; - inline const SwFootnoteBossFrm *FindFootnoteBossFrm( bool bFootnote = false ) const; - inline const SwFrm *FindColFrm() const; - inline const SwFrm *FindFooterOrHeader() const; - inline const SwTabFrm *FindTabFrm() const; - inline const SwFootnoteFrm *FindFootnoteFrm() const; - inline const SwFlyFrm *FindFlyFrm() const; - inline const SwSectionFrm *FindSctFrm() const; - inline const SwFrm *FindNext() const; + SwContentFrame* FindNextCnt( const bool _bInSameFootnote = false ); + inline SwFrame *FindPrev(); + inline const SwPageFrame *FindPageFrame() const; + inline const SwFootnoteBossFrame *FindFootnoteBossFrame( bool bFootnote = false ) const; + inline const SwFrame *FindColFrame() const; + inline const SwFrame *FindFooterOrHeader() const; + inline const SwTabFrame *FindTabFrame() const; + inline const SwFootnoteFrame *FindFootnoteFrame() const; + inline const SwFlyFrame *FindFlyFrame() const; + inline const SwSectionFrame *FindSctFrame() const; + inline const SwFrame *FindNext() const; // #i27138# - add parameter <_bInSameFootnote> - const SwContentFrm* FindNextCnt( const bool _bInSameFootnote = false ) const; - inline const SwFrm *FindPrev() const; - const SwFrm *GetLower() const; + const SwContentFrame* FindNextCnt( const bool _bInSameFootnote = false ) const; + inline const SwFrame *FindPrev() const; + const SwFrame *GetLower() const; - SwContentFrm* FindPrevCnt( const bool _bInSameFootnote = false ); + SwContentFrame* FindPrevCnt( const bool _bInSameFootnote = false ); - const SwContentFrm* FindPrevCnt( const bool _bInSameFootnote = false ) const; + const SwContentFrame* FindPrevCnt( const bool _bInSameFootnote = false ) const; // #i79774# - SwFrm* _GetIndPrev() const; - SwFrm* GetIndPrev() const + SwFrame* _GetIndPrev() const; + SwFrame* GetIndPrev() const { return ( mpPrev || !IsInSct() ) ? mpPrev : _GetIndPrev(); } - SwFrm* GetIndNext() + SwFrame* GetIndNext() { return ( mpNext || !IsInSct() ) ? mpNext : _GetIndNext(); } - const SwFrm* GetIndNext() const { return const_cast<SwFrm*>(this)->GetIndNext(); } + const SwFrame* GetIndNext() const { return const_cast<SwFrame*>(this)->GetIndNext(); } sal_uInt16 GetPhyPageNum() const; // page number without offset sal_uInt16 GetVirtPageNum() const; // page number with offset @@ -638,31 +638,31 @@ public: bool WannaRightPage() const; bool OnFirstPage() const; - inline const SwLayoutFrm *GetPrevLayoutLeaf() const; - inline const SwLayoutFrm *GetNextLayoutLeaf() const; - inline SwLayoutFrm *GetPrevLayoutLeaf(); - inline SwLayoutFrm *GetNextLayoutLeaf(); + inline const SwLayoutFrame *GetPrevLayoutLeaf() const; + inline const SwLayoutFrame *GetNextLayoutLeaf() const; + inline SwLayoutFrame *GetPrevLayoutLeaf(); + inline SwLayoutFrame *GetNextLayoutLeaf(); virtual void Calc(vcl::RenderContext* pRenderContext) const; // here might be "formatted" inline void OptCalc() const; // here we assume (for optimization) that // the predecessors are already formatted Point GetRelPos() const; - const SwRect &Frm() const { return maFrm; } + const SwRect &Frame() const { return maFrame; } const SwRect &Prt() const { return maPrt; } // PaintArea is the area where content might be displayed. // The margin of a page or the space between columns belongs to it. const SwRect PaintArea() const; - // UnionFrm is the union of Frm- and PrtArea, normally identical - // to the FrmArea except in case of negative Prt margins. - const SwRect UnionFrm( bool bBorder = false ) const; + // UnionFrame is the union of Frame- and PrtArea, normally identical + // to the FrameArea except in case of negative Prt margins. + const SwRect UnionFrame( bool bBorder = false ) const; // HACK: Here we exceptionally allow direct access to members. // This should not delude into changing those value randomly; it is the // only option to circumvent compiler problems (same method with public // and protected). - SwRect &Frm() { return maFrm; } + SwRect &Frame() { return maFrame; } SwRect &Prt() { return maPrt; } virtual Size ChgSize( const Size& aNewSize ); @@ -670,7 +670,7 @@ public: virtual void Cut() = 0; //Add a method to change the acc table dispose state. void SetAccTableDispose(bool bDispose) { mbIfAccTableShouldDisposing = bDispose;} - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) = 0; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) = 0; void ValidateLineNum() { mbValidLineNum = true; } @@ -680,7 +680,7 @@ public: bool GetValidLineNumFlag()const { return mbValidLineNum; } bool IsValid() const { return mbValidPos && mbValidSize && mbValidPrtArea; } - // Only invalidate Frm + // Only invalidate Frame // #i28701# - add call to method <_ActionOnInvalidation(..)> // for all invalidation methods. // #i28701# - use method <_InvalidationAllowed(..)> to @@ -747,14 +747,14 @@ public: */ void InvalidateNextPrtArea(); - void InvalidatePage( const SwPageFrm *pPage = nullptr ) const; + void InvalidatePage( const SwPageFrame *pPage = nullptr ) const; virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const; - virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = nullptr, bool bTestBackground = false ) const; + virtual bool GetCursorOfst( SwPosition *, Point&, + SwCursorMoveState* = nullptr, bool bTestBackground = false ) const; virtual bool GetCharRect( SwRect &, const SwPosition&, - SwCrsrMoveState* = nullptr ) const; + SwCursorMoveState* = nullptr ) const; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const; @@ -765,45 +765,45 @@ public: const void *pVoid = nullptr, bool bNotify = true ); // true if it is the correct class, false otherwise - inline bool IsLayoutFrm() const; - inline bool IsRootFrm() const; - inline bool IsPageFrm() const; - inline bool IsColumnFrm() const; - inline bool IsFootnoteBossFrm() const; // footnote bosses might be PageFrms or ColumnFrms - inline bool IsHeaderFrm() const; - inline bool IsFooterFrm() const; - inline bool IsFootnoteContFrm() const; - inline bool IsFootnoteFrm() const; - inline bool IsBodyFrm() const; - inline bool IsColBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above ColumnFrm - inline bool IsPageBodyFrm() const; // implemented in layfrm.hxx, BodyFrm above PageFrm - inline bool IsFlyFrm() const; - inline bool IsSctFrm() const; - inline bool IsTabFrm() const; - inline bool IsRowFrm() const; - inline bool IsCellFrm() const; - inline bool IsContentFrm() const; - inline bool IsTextFrm() const; - inline bool IsNoTextFrm() const; - // Frms where its PrtArea depends on their neighbors and that are + inline bool IsLayoutFrame() const; + inline bool IsRootFrame() const; + inline bool IsPageFrame() const; + inline bool IsColumnFrame() const; + inline bool IsFootnoteBossFrame() const; // footnote bosses might be PageFrames or ColumnFrames + inline bool IsHeaderFrame() const; + inline bool IsFooterFrame() const; + inline bool IsFootnoteContFrame() const; + inline bool IsFootnoteFrame() const; + inline bool IsBodyFrame() const; + inline bool IsColBodyFrame() const; // implemented in layfrm.hxx, BodyFrame above ColumnFrame + inline bool IsPageBodyFrame() const; // implemented in layfrm.hxx, BodyFrame above PageFrame + inline bool IsFlyFrame() const; + inline bool IsSctFrame() const; + inline bool IsTabFrame() const; + inline bool IsRowFrame() const; + inline bool IsCellFrame() const; + inline bool IsContentFrame() const; + inline bool IsTextFrame() const; + inline bool IsNoTextFrame() const; + // Frames where its PrtArea depends on their neighbors and that are // positioned in the content flow - inline bool IsFlowFrm() const; - // Frms that are capable of retouching or that might need to retouch behind + inline bool IsFlowFrame() const; + // Frames that are capable of retouching or that might need to retouch behind // themselves - inline bool IsRetoucheFrm() const; - inline bool IsAccessibleFrm() const; + inline bool IsRetoucheFrame() const; + inline bool IsAccessibleFrame() const; - void PrepareCrsr(); // CrsrShell is allowed to call this + void PrepareCursor(); // CursorShell is allowed to call this - // Is the Frm (or the section containing it) protected? Same for Fly in + // Is the Frame (or the section containing it) protected? Same for Fly in // Fly in ... and footnotes bool IsProtected() const; bool IsColLocked() const { return mbColLocked; } bool IsDeleteForbidden() const { return mbForbidDelete; } - /// this is the only way to delete a SwFrm instance - static void DestroyFrm(SwFrm *const pFrm); + /// this is the only way to delete a SwFrame instance + static void DestroyFrame(SwFrame *const pFrame); bool IsInDtor() const { return mbInDtor; } @@ -824,15 +824,15 @@ public: bool SetMaxBottom( long ); bool SetMaxRight( long ); bool SetMinTop( long ); - void MakeBelowPos( const SwFrm*, const SwFrm*, bool ); - void MakeUpperPos( const SwFrm*, const SwFrm*, bool ); - void MakeLeftPos( const SwFrm*, const SwFrm*, bool ); - void MakeRightPos( const SwFrm*, const SwFrm*, bool ); - inline bool IsNeighbourFrm() const + void MakeBelowPos( const SwFrame*, const SwFrame*, bool ); + void MakeUpperPos( const SwFrame*, const SwFrame*, bool ); + void MakeLeftPos( const SwFrame*, const SwFrame*, bool ); + void MakeRightPos( const SwFrame*, const SwFrame*, bool ); + inline bool IsNeighbourFrame() const { return (GetType() & FRM_NEIGHBOUR) != 0; } // #i65250# - inline sal_uInt32 GetFrmId() const { return mnFrmId; } + inline sal_uInt32 GetFrameId() const { return mnFrameId; } // NEW TABLES // Some functions for covered/covering table cells. This way unnecessary @@ -862,109 +862,109 @@ public: bool IsCollapse() const; }; -inline bool SwFrm::IsInDocBody() const +inline bool SwFrame::IsInDocBody() const { if ( mbInfInvalid ) - const_cast<SwFrm*>(this)->SetInfFlags(); + const_cast<SwFrame*>(this)->SetInfFlags(); return mbInfBody; } -inline bool SwFrm::IsInFootnote() const +inline bool SwFrame::IsInFootnote() const { if ( mbInfInvalid ) - const_cast<SwFrm*>(this)->SetInfFlags(); + const_cast<SwFrame*>(this)->SetInfFlags(); return mbInfFootnote; } -inline bool SwFrm::IsInTab() const +inline bool SwFrame::IsInTab() const { if ( mbInfInvalid ) - const_cast<SwFrm*>(this)->SetInfFlags(); + const_cast<SwFrame*>(this)->SetInfFlags(); return mbInfTab; } -inline bool SwFrm::IsInFly() const +inline bool SwFrame::IsInFly() const { if ( mbInfInvalid ) - const_cast<SwFrm*>(this)->SetInfFlags(); + const_cast<SwFrame*>(this)->SetInfFlags(); return mbInfFly; } -inline bool SwFrm::IsInSct() const +inline bool SwFrame::IsInSct() const { if ( mbInfInvalid ) - const_cast<SwFrm*>(this)->SetInfFlags(); + const_cast<SwFrame*>(this)->SetInfFlags(); return mbInfSct; } -bool SwFrm::IsVertical() const +bool SwFrame::IsVertical() const { if( mbInvalidVert ) - const_cast<SwFrm*>(this)->SetDirFlags( true ); + const_cast<SwFrame*>(this)->SetDirFlags( true ); return mbVertical; } -inline bool SwFrm::IsVertLR() const +inline bool SwFrame::IsVertLR() const { return mbVertLR; } -inline bool SwFrm::IsRightToLeft() const +inline bool SwFrame::IsRightToLeft() const { if( mbInvalidR2L ) - const_cast<SwFrm*>(this)->SetDirFlags( false ); + const_cast<SwFrame*>(this)->SetDirFlags( false ); return mbRightToLeft; } -inline void SwFrm::SetCompletePaint() const +inline void SwFrame::SetCompletePaint() const { - const_cast<SwFrm*>(this)->mbCompletePaint = true; + const_cast<SwFrame*>(this)->mbCompletePaint = true; } -inline void SwFrm::ResetCompletePaint() const +inline void SwFrame::ResetCompletePaint() const { - const_cast<SwFrm*>(this)->mbCompletePaint = false; + const_cast<SwFrame*>(this)->mbCompletePaint = false; } -inline void SwFrm::SetRetouche() const +inline void SwFrame::SetRetouche() const { - const_cast<SwFrm*>(this)->mbRetouche = true; + const_cast<SwFrame*>(this)->mbRetouche = true; } -inline void SwFrm::ResetRetouche() const +inline void SwFrame::ResetRetouche() const { - const_cast<SwFrm*>(this)->mbRetouche = false; + const_cast<SwFrame*>(this)->mbRetouche = false; } -inline SwLayoutFrm *SwFrm::GetNextLayoutLeaf() +inline SwLayoutFrame *SwFrame::GetNextLayoutLeaf() { - return const_cast<SwLayoutFrm*>(static_cast<const SwFrm*>(this)->GetNextLayoutLeaf()); + return const_cast<SwLayoutFrame*>(static_cast<const SwFrame*>(this)->GetNextLayoutLeaf()); } -inline SwLayoutFrm *SwFrm::GetPrevLayoutLeaf() +inline SwLayoutFrame *SwFrame::GetPrevLayoutLeaf() { - return const_cast<SwLayoutFrm*>(static_cast<const SwFrm*>(this)->GetPrevLayoutLeaf()); + return const_cast<SwLayoutFrame*>(static_cast<const SwFrame*>(this)->GetPrevLayoutLeaf()); } -inline const SwLayoutFrm *SwFrm::GetNextLayoutLeaf() const +inline const SwLayoutFrame *SwFrame::GetNextLayoutLeaf() const { return ImplGetNextLayoutLeaf( true ); } -inline const SwLayoutFrm *SwFrm::GetPrevLayoutLeaf() const +inline const SwLayoutFrame *SwFrame::GetPrevLayoutLeaf() const { return ImplGetNextLayoutLeaf( false ); } -inline void SwFrm::InvalidateSize() +inline void SwFrame::InvalidateSize() { if ( mbValidSize ) ImplInvalidateSize(); } -inline void SwFrm::InvalidatePrt() +inline void SwFrame::InvalidatePrt() { if ( mbValidPrtArea ) ImplInvalidatePrt(); } -inline void SwFrm::InvalidatePos() +inline void SwFrame::InvalidatePos() { if ( mbValidPos ) ImplInvalidatePos(); } -inline void SwFrm::InvalidateLineNum() +inline void SwFrame::InvalidateLineNum() { if ( mbValidLineNum ) ImplInvalidateLineNum(); } -inline void SwFrm::InvalidateAll() +inline void SwFrame::InvalidateAll() { if ( _InvalidationAllowed( INVALID_ALL ) ) { @@ -976,204 +976,204 @@ inline void SwFrm::InvalidateAll() _ActionOnInvalidation( INVALID_ALL ); } } -inline void SwFrm::InvalidateNextPos( bool bNoFootnote ) +inline void SwFrame::InvalidateNextPos( bool bNoFootnote ) { - if ( mpNext && !mpNext->IsSctFrm() ) + if ( mpNext && !mpNext->IsSctFrame() ) mpNext->InvalidatePos(); else ImplInvalidateNextPos( bNoFootnote ); } -inline void SwFrm::OptCalc() const +inline void SwFrame::OptCalc() const { if ( !mbValidPos || !mbValidPrtArea || !mbValidSize ) - const_cast<SwFrm*>(this)->OptPrepareMake(); + const_cast<SwFrame*>(this)->OptPrepareMake(); } -inline const SwPageFrm *SwFrm::FindPageFrm() const +inline const SwPageFrame *SwFrame::FindPageFrame() const { - return const_cast<SwFrm*>(this)->FindPageFrm(); + return const_cast<SwFrame*>(this)->FindPageFrame(); } -inline const SwFrm *SwFrm::FindColFrm() const +inline const SwFrame *SwFrame::FindColFrame() const { - return const_cast<SwFrm*>(this)->FindColFrm(); + return const_cast<SwFrame*>(this)->FindColFrame(); } -inline const SwFrm *SwFrm::FindFooterOrHeader() const +inline const SwFrame *SwFrame::FindFooterOrHeader() const { - return const_cast<SwFrm*>(this)->FindFooterOrHeader(); + return const_cast<SwFrame*>(this)->FindFooterOrHeader(); } -inline SwTabFrm *SwFrm::FindTabFrm() +inline SwTabFrame *SwFrame::FindTabFrame() { - return IsInTab() ? ImplFindTabFrm() : nullptr; + return IsInTab() ? ImplFindTabFrame() : nullptr; } -inline const SwFootnoteBossFrm *SwFrm::FindFootnoteBossFrm( bool bFootnote ) const +inline const SwFootnoteBossFrame *SwFrame::FindFootnoteBossFrame( bool bFootnote ) const { - return const_cast<SwFrm*>(this)->FindFootnoteBossFrm( bFootnote ); + return const_cast<SwFrame*>(this)->FindFootnoteBossFrame( bFootnote ); } -inline SwFootnoteFrm *SwFrm::FindFootnoteFrm() +inline SwFootnoteFrame *SwFrame::FindFootnoteFrame() { - return IsInFootnote() ? ImplFindFootnoteFrm() : nullptr; + return IsInFootnote() ? ImplFindFootnoteFrame() : nullptr; } -inline SwFlyFrm *SwFrm::FindFlyFrm() +inline SwFlyFrame *SwFrame::FindFlyFrame() { - return IsInFly() ? ImplFindFlyFrm() : nullptr; + return IsInFly() ? ImplFindFlyFrame() : nullptr; } -inline SwSectionFrm *SwFrm::FindSctFrm() +inline SwSectionFrame *SwFrame::FindSctFrame() { - return IsInSct() ? ImplFindSctFrm() : nullptr; + return IsInSct() ? ImplFindSctFrame() : nullptr; } -inline const SwTabFrm *SwFrm::FindTabFrm() const +inline const SwTabFrame *SwFrame::FindTabFrame() const { - return IsInTab() ? const_cast<SwFrm*>(this)->ImplFindTabFrm() : nullptr; + return IsInTab() ? const_cast<SwFrame*>(this)->ImplFindTabFrame() : nullptr; } -inline const SwFootnoteFrm *SwFrm::FindFootnoteFrm() const +inline const SwFootnoteFrame *SwFrame::FindFootnoteFrame() const { - return IsInFootnote() ? const_cast<SwFrm*>(this)->ImplFindFootnoteFrm() : nullptr; + return IsInFootnote() ? const_cast<SwFrame*>(this)->ImplFindFootnoteFrame() : nullptr; } -inline const SwFlyFrm *SwFrm::FindFlyFrm() const +inline const SwFlyFrame *SwFrame::FindFlyFrame() const { - return IsInFly() ? const_cast<SwFrm*>(this)->ImplFindFlyFrm() : nullptr; + return IsInFly() ? const_cast<SwFrame*>(this)->ImplFindFlyFrame() : nullptr; } -inline const SwSectionFrm *SwFrm::FindSctFrm() const +inline const SwSectionFrame *SwFrame::FindSctFrame() const { - return IsInSct() ? const_cast<SwFrm*>(this)->ImplFindSctFrm() : nullptr; + return IsInSct() ? const_cast<SwFrame*>(this)->ImplFindSctFrame() : nullptr; } -inline SwFrm *SwFrm::FindNext() +inline SwFrame *SwFrame::FindNext() { if ( mpNext ) return mpNext; else return _FindNext(); } -inline const SwFrm *SwFrm::FindNext() const +inline const SwFrame *SwFrame::FindNext() const { if ( mpNext ) return mpNext; else - return const_cast<SwFrm*>(this)->_FindNext(); + return const_cast<SwFrame*>(this)->_FindNext(); } -inline SwFrm *SwFrm::FindPrev() +inline SwFrame *SwFrame::FindPrev() { - if ( mpPrev && !mpPrev->IsSctFrm() ) + if ( mpPrev && !mpPrev->IsSctFrame() ) return mpPrev; else return _FindPrev(); } -inline const SwFrm *SwFrm::FindPrev() const +inline const SwFrame *SwFrame::FindPrev() const { - if ( mpPrev && !mpPrev->IsSctFrm() ) + if ( mpPrev && !mpPrev->IsSctFrame() ) return mpPrev; else - return const_cast<SwFrm*>(this)->_FindPrev(); + return const_cast<SwFrame*>(this)->_FindPrev(); } -inline bool SwFrm::IsLayoutFrm() const +inline bool SwFrame::IsLayoutFrame() const { return (GetType() & FRM_LAYOUT) != 0; } -inline bool SwFrm::IsRootFrm() const +inline bool SwFrame::IsRootFrame() const { - return mnFrmType == FRM_ROOT; + return mnFrameType == FRM_ROOT; } -inline bool SwFrm::IsPageFrm() const +inline bool SwFrame::IsPageFrame() const { - return mnFrmType == FRM_PAGE; + return mnFrameType == FRM_PAGE; } -inline bool SwFrm::IsColumnFrm() const +inline bool SwFrame::IsColumnFrame() const { - return mnFrmType == FRM_COLUMN; + return mnFrameType == FRM_COLUMN; } -inline bool SwFrm::IsFootnoteBossFrm() const +inline bool SwFrame::IsFootnoteBossFrame() const { return (GetType() & FRM_FTNBOSS) != 0; } -inline bool SwFrm::IsHeaderFrm() const +inline bool SwFrame::IsHeaderFrame() const { - return mnFrmType == FRM_HEADER; + return mnFrameType == FRM_HEADER; } -inline bool SwFrm::IsFooterFrm() const +inline bool SwFrame::IsFooterFrame() const { - return mnFrmType == FRM_FOOTER; + return mnFrameType == FRM_FOOTER; } -inline bool SwFrm::IsFootnoteContFrm() const +inline bool SwFrame::IsFootnoteContFrame() const { - return mnFrmType == FRM_FTNCONT; + return mnFrameType == FRM_FTNCONT; } -inline bool SwFrm::IsFootnoteFrm() const +inline bool SwFrame::IsFootnoteFrame() const { - return mnFrmType == FRM_FTN; + return mnFrameType == FRM_FTN; } -inline bool SwFrm::IsBodyFrm() const +inline bool SwFrame::IsBodyFrame() const { - return mnFrmType == FRM_BODY; + return mnFrameType == FRM_BODY; } -inline bool SwFrm::IsFlyFrm() const +inline bool SwFrame::IsFlyFrame() const { - return mnFrmType == FRM_FLY; + return mnFrameType == FRM_FLY; } -inline bool SwFrm::IsSctFrm() const +inline bool SwFrame::IsSctFrame() const { - return mnFrmType == FRM_SECTION; + return mnFrameType == FRM_SECTION; } -inline bool SwFrm::IsTabFrm() const +inline bool SwFrame::IsTabFrame() const { - return mnFrmType == FRM_TAB; + return mnFrameType == FRM_TAB; } -inline bool SwFrm::IsRowFrm() const +inline bool SwFrame::IsRowFrame() const { - return mnFrmType == FRM_ROW; + return mnFrameType == FRM_ROW; } -inline bool SwFrm::IsCellFrm() const +inline bool SwFrame::IsCellFrame() const { - return mnFrmType == FRM_CELL; + return mnFrameType == FRM_CELL; } -inline bool SwFrm::IsContentFrm() const +inline bool SwFrame::IsContentFrame() const { return (GetType() & FRM_CNTNT) != 0; } -inline bool SwFrm::IsTextFrm() const +inline bool SwFrame::IsTextFrame() const { - return mnFrmType == FRM_TXT; + return mnFrameType == FRM_TXT; } -inline bool SwFrm::IsNoTextFrm() const +inline bool SwFrame::IsNoTextFrame() const { - return mnFrmType == FRM_NOTXT; + return mnFrameType == FRM_NOTXT; } -inline bool SwFrm::IsFlowFrm() const +inline bool SwFrame::IsFlowFrame() const { return (GetType() & (FRM_CNTNT|FRM_TAB|FRM_SECTION)) != 0; } -inline bool SwFrm::IsRetoucheFrm() const +inline bool SwFrame::IsRetoucheFrame() const { return (GetType() & (FRM_CNTNT|FRM_TAB|FRM_SECTION|FRM_FTN)) != 0; } -inline bool SwFrm::IsAccessibleFrm() const +inline bool SwFrame::IsAccessibleFrame() const { return (GetType() & FRM_ACCESSIBLE) != 0; } -//use this to protect a SwFrm for a given scope from getting deleted -class SwFrmDeleteGuard +//use this to protect a SwFrame for a given scope from getting deleted +class SwFrameDeleteGuard { private: - SwFrm *m_pFrm; + SwFrame *m_pFrame; bool m_bOldDeleteAllowed; public: - //Flag pFrm for SwFrmDeleteGuard lifetime that we shouldn't delete - //it in e.g. SwSectionFrm::MergeNext etc because we will need it - //again after the SwFrmDeleteGuard dtor - explicit SwFrmDeleteGuard(SwFrm* pFrm) - : m_pFrm(pFrm) + //Flag pFrame for SwFrameDeleteGuard lifetime that we shouldn't delete + //it in e.g. SwSectionFrame::MergeNext etc because we will need it + //again after the SwFrameDeleteGuard dtor + explicit SwFrameDeleteGuard(SwFrame* pFrame) + : m_pFrame(pFrame) { - m_bOldDeleteAllowed = m_pFrm && !m_pFrm->IsDeleteForbidden(); + m_bOldDeleteAllowed = m_pFrame && !m_pFrame->IsDeleteForbidden(); if (m_bOldDeleteAllowed) - m_pFrm->ForbidDelete(); + m_pFrame->ForbidDelete(); } - ~SwFrmDeleteGuard() + ~SwFrameDeleteGuard() { if (m_bOldDeleteAllowed) - m_pFrm->AllowDelete(); + m_pFrame->AllowDelete(); } }; diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx index ae613d3bdcf5..c4d30f01e375 100644 --- a/sw/source/core/inc/frminf.hxx +++ b/sw/source/core/inc/frminf.hxx @@ -22,19 +22,19 @@ #include "swtypes.hxx" -class SwTextFrm; +class SwTextFrame; class SwPaM; class SwTextCursor; -class SwTextFrmInfo +class SwTextFrameInfo { - const SwTextFrm *pFrm; + const SwTextFrame *pFrame; // Where does the text (w/o whitespaces) start (document is global!)? static SwTwips GetLineStart( const SwTextCursor &rLine ); public: - inline SwTextFrmInfo( const SwTextFrm *pTextFrm ) : pFrm(pTextFrm) { } + inline SwTextFrameInfo( const SwTextFrame *pTextFrame ) : pFrame(pTextFrame) { } // Does the paragraph fit into a single line? bool IsOneLine() const; @@ -57,13 +57,13 @@ public: // determine intentation for first line SwTwips GetFirstIndent() const; - const SwTextFrm* GetFrm() const { return pFrm; } - SwTextFrmInfo& SetFrm( const SwTextFrm* pNew ) - { pFrm = pNew; return *this; } + const SwTextFrame* GetFrame() const { return pFrame; } + SwTextFrameInfo& SetFrame( const SwTextFrame* pNew ) + { pFrame = pNew; return *this; } // Is it a comparison? Returns position in frame. sal_Int32 GetBigIndent( sal_Int32& rFndPos, - const SwTextFrm *pNextFrm = nullptr ) const; + const SwTextFrame *pNextFrame = nullptr ) const; }; #endif diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index fe82b38c8e6f..8c984def8720 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -28,10 +28,10 @@ #include <swfont.hxx> #include <flyfrm.hxx> -class SwPageFrm; -class SwFlyFrm; -class SwContentFrm; -class SwRootFrm; +class SwPageFrame; +class SwFlyFrame; +class SwContentFrame; +class SwRootFrame; class SwDoc; class SwAttrSet; class SdrObject; @@ -54,7 +54,7 @@ class SwRegionRects; #define GRFNUM_REPLACE 2 void AppendObjs( const SwFrameFormats *pTable, sal_uLong nIndex, - SwFrm *pFrm, SwPageFrm *pPage, SwDoc* doc ); + SwFrame *pFrame, SwPageFrame *pPage, SwDoc* doc ); // draw background with brush or graphics // The 6th parameter indicates that the method should consider background @@ -100,81 +100,81 @@ void PaintCharacterBorder( // get Fly, if no List is given use the current shell // Implementation in feshview.cxx -SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, SwViewShell *pSh ); +SwFlyFrame *GetFlyFromMarked( const SdrMarkList *pLst, SwViewShell *pSh ); -SwFrm *SaveContent( SwLayoutFrm *pLay, SwFrm *pStart = nullptr ); -void RestoreContent( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow ); +SwFrame *SaveContent( SwLayoutFrame *pLay, SwFrame *pStart = nullptr ); +void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling, bool bGrow ); -// Get ContentNodes, create ContentFrms, and add them to LayFrm. -void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, sal_uLong nIndex, +// Get ContentNodes, create ContentFrames, and add them to LayFrame. +void _InsertCnt( SwLayoutFrame *pLay, SwDoc *pDoc, sal_uLong nIndex, bool bPages = false, sal_uLong nEndIndex = 0, - SwFrm *pPrv = nullptr ); + SwFrame *pPrv = nullptr ); // Creation of frames for a specific section (uses _InsertCnt) -void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, +void MakeFrames( SwDoc *pDoc, const SwNodeIndex &rSttIdx, const SwNodeIndex &rEndIdx ); // prevent creation of Flys in _InsertCnt, e.g. for table headlines extern bool bDontCreateObjects; -// for FlyCnts, see SwFlyAtCntFrm::MakeAll() +// for FlyCnts, see SwFlyAtContentFrame::MakeAll() extern bool bSetCompletePaintOnInvalidate; // for table settings via keyboard -long CalcRowRstHeight( SwLayoutFrm *pRow ); -long CalcHeightWithFlys( const SwFrm *pFrm ); +long CalcRowRstHeight( SwLayoutFrame *pRow ); +long CalcHeightWithFlys( const SwFrame *pFrame ); -SwPageFrm *InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, +SwPageFrame *InsertNewPage( SwPageDesc &rDesc, SwFrame *pUpper, bool bOdd, bool bFirst, bool bInsertEmpty, bool bFootnote, - SwFrm *pSibling ); + SwFrame *pSibling ); // connect Flys with page -void RegistFlys( SwPageFrm*, const SwLayoutFrm* ); +void RegistFlys( SwPageFrame*, const SwLayoutFrame* ); // notification of Fly's background if needed -void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld, +void Notify( SwFlyFrame *pFly, SwPageFrame *pOld, const SwRect &rOld, const SwRect* pOldRect = nullptr ); void Notify_Background( const SdrObject* pObj, - SwPageFrm* pPage, + SwPageFrame* pPage, const SwRect& rRect, const PrepareHint eHint, const bool bInva ); -const SwFrm* GetVirtualUpper( const SwFrm* pFrm, const Point& rPos ); +const SwFrame* GetVirtualUpper( const SwFrame* pFrame, const Point& rPos ); -bool Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj ); +bool Is_Lower_Of( const SwFrame *pCurrFrame, const SdrObject* pObj ); // FIXME: EasyHack (refactoring): rename method and parameter name in all files -const SwFrm *FindKontext( const SwFrm *pFrm, sal_uInt16 nAdditionalKontextTyp ); +const SwFrame *FindKontext( const SwFrame *pFrame, sal_uInt16 nAdditionalKontextTyp ); -bool IsFrmInSameKontext( const SwFrm *pInnerFrm, const SwFrm *pFrm ); +bool IsFrameInSameKontext( const SwFrame *pInnerFrame, const SwFrame *pFrame ); -const SwFrm * FindPage( const SwRect &rRect, const SwFrm *pPage ); +const SwFrame * FindPage( const SwRect &rRect, const SwFrame *pPage ); -// used by SwContentNode::GetFrm and SwFlyFrm::GetFrm -SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, +// used by SwContentNode::GetFrame and SwFlyFrame::GetFrame +SwFrame* GetFrameOfModify( const SwRootFrame* pLayout, SwModify const&, - sal_uInt16 const nFrmType, + sal_uInt16 const nFrameType, const Point* = nullptr, const SwPosition *pPos = nullptr, - const bool bCalcFrm = false ); + const bool bCalcFrame = false ); // Should extra data (redline stroke, line numbers) be painted? bool IsExtraData( const SwDoc *pDoc ); // #i11760# - method declaration <CalcContent(..)> -void CalcContent( SwLayoutFrm *pLay, +void CalcContent( SwLayoutFrame *pLay, bool bNoColl = false, bool bNoCalcFollow = false ); // Notify classes memorize the current sizes in their constructor and do // the necessary notifications in their destructor if needed -class SwFrmNotify +class SwFrameNotify { protected: - SwFrm *mpFrm; - const SwRect maFrm; + SwFrame *mpFrame; + const SwRect maFrame; const SwRect maPrt; SwTwips mnFlyAnchorOfst; SwTwips mnFlyAnchorOfstNoWrap; @@ -182,24 +182,24 @@ protected: bool mbInvaKeep; bool mbValidSize; // #i49383# - bool mbFrmDeleted; + bool mbFrameDeleted; public: - SwFrmNotify( SwFrm *pFrm ); - ~SwFrmNotify(); + SwFrameNotify( SwFrame *pFrame ); + ~SwFrameNotify(); - const SwRect &Frm() const { return maFrm; } + const SwRect &Frame() const { return maFrame; } void SetInvaKeep() { mbInvaKeep = true; } }; -class SwLayNotify : public SwFrmNotify +class SwLayNotify : public SwFrameNotify { bool bLowersComplete; - SwLayoutFrm *GetLay() { return static_cast<SwLayoutFrm*>(mpFrm); } + SwLayoutFrame *GetLay() { return static_cast<SwLayoutFrame*>(mpFrame); } public: - SwLayNotify( SwLayoutFrm *pLayFrm ); + SwLayNotify( SwLayoutFrame *pLayFrame ); ~SwLayNotify(); void SetLowersComplete( bool b ) { bLowersComplete = b; } @@ -208,16 +208,16 @@ public: class SwFlyNotify : public SwLayNotify { - SwPageFrm *pOldPage; - const SwRect aFrmAndSpace; - SwFlyFrm *GetFly() { return static_cast<SwFlyFrm*>(mpFrm); } + SwPageFrame *pOldPage; + const SwRect aFrameAndSpace; + SwFlyFrame *GetFly() { return static_cast<SwFlyFrame*>(mpFrame); } public: - SwFlyNotify( SwFlyFrm *pFlyFrm ); + SwFlyNotify( SwFlyFrame *pFlyFrame ); ~SwFlyNotify(); }; -class SwContentNotify : public SwFrmNotify +class SwContentNotify : public SwFrameNotify { private: // #i11859# @@ -228,10 +228,10 @@ private: bool mbInvalidatePrevPrtArea; bool mbBordersJoinedWithPrev; - SwContentFrm *GetCnt(); + SwContentFrame *GetCnt(); public: - SwContentNotify( SwContentFrm *pCntFrm ); + SwContentNotify( SwContentFrame *pContentFrame ); ~SwContentNotify(); // #i25029# @@ -310,32 +310,32 @@ class SwBorderAttrs : public SwCacheObj void _IsLine(); - // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if + // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. - void _GetTopLine ( const SwFrm& _rFrm, - const SwFrm* _pPrevFrm = nullptr ); - void _GetBottomLine( const SwFrm& _rFrm ); + void _GetTopLine ( const SwFrame& _rFrame, + const SwFrame* _pPrevFrame = nullptr ); + void _GetBottomLine( const SwFrame& _rFrame ); // calculate cached values <m_bJoinedWithPrev> and <m_bJoinedWithNext> - // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if + // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. - void _CalcJoinedWithPrev( const SwFrm& _rFrm, - const SwFrm* _pPrevFrm = nullptr ); - void _CalcJoinedWithNext( const SwFrm& _rFrm ); + void _CalcJoinedWithPrev( const SwFrame& _rFrame, + const SwFrame* _pPrevFrame = nullptr ); + void _CalcJoinedWithNext( const SwFrame& _rFrame ); // internal helper method for _CalcJoinedWithPrev and _CalcJoinedWithNext - bool _JoinWithCmp( const SwFrm& _rCallerFrm, - const SwFrm& _rCmpFrm ) const; + bool _JoinWithCmp( const SwFrame& _rCallerFrame, + const SwFrame& _rCmpFrame ) const; // Are the left and right line and the LRSpace equal? bool CmpLeftRight( const SwBorderAttrs &rCmpAttrs, - const SwFrm *pCaller, - const SwFrm *pCmp ) const; + const SwFrame *pCaller, + const SwFrame *pCmp ) const; public: DECL_FIXEDMEMPOOL_NEWDEL(SwBorderAttrs) - SwBorderAttrs( const SwModify *pOwner, const SwFrm *pConstructor ); + SwBorderAttrs( const SwModify *pOwner, const SwFrame *pConstructor ); virtual ~SwBorderAttrs(); inline const SwAttrSet &GetAttrSet() const { return m_rAttrSet; } @@ -349,8 +349,8 @@ public: inline sal_uInt16 CalcRightLine() const; inline sal_uInt16 CalcTop() const; inline sal_uInt16 CalcBottom() const; - long CalcLeft( const SwFrm *pCaller ) const; - long CalcRight( const SwFrm *pCaller ) const; + long CalcLeft( const SwFrame *pCaller ) const; + long CalcRight( const SwFrame *pCaller ) const; inline bool IsLine() const; @@ -359,30 +359,30 @@ public: inline bool IsBorderDist() const { return m_bBorderDist; } // Should upper (or lower) border be evaluated for this frame? - // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if + // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. - inline sal_uInt16 GetTopLine ( const SwFrm& _rFrm, - const SwFrm* _pPrevFrm = nullptr ) const; - inline sal_uInt16 GetBottomLine( const SwFrm& _rFrm ) const; + inline sal_uInt16 GetTopLine ( const SwFrame& _rFrame, + const SwFrame* _pPrevFrame = nullptr ) const; + inline sal_uInt16 GetBottomLine( const SwFrame& _rFrame ) const; inline void SetGetCacheLine( bool bNew ) const; // Accessors for cached values <m_bJoinedWithPrev> and <m_bJoinedWithNext> - // #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if + // #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. - bool JoinedWithPrev( const SwFrm& _rFrm, - const SwFrm* _pPrevFrm = nullptr ) const; - bool JoinedWithNext( const SwFrm& _rFrm ) const; + bool JoinedWithPrev( const SwFrame& _rFrame, + const SwFrame* _pPrevFrame = nullptr ) const; + bool JoinedWithNext( const SwFrame& _rFrame ) const; }; class SwBorderAttrAccess : public SwCacheAccess { - const SwFrm *pConstructor; //opt: for passing on to SwBorderAttrs + const SwFrame *pConstructor; //opt: for passing on to SwBorderAttrs protected: virtual SwCacheObj *NewObj() override; public: - SwBorderAttrAccess( SwCache &rCache, const SwFrm *pOwner ); + SwBorderAttrAccess( SwCache &rCache, const SwFrame *pOwner ); SwBorderAttrs *Get(); }; @@ -392,12 +392,12 @@ public: // SortArray needs to be traversed. class SwOrderIter { - const SwPageFrm *m_pPage; + const SwPageFrame *m_pPage; const SdrObject *m_pCurrent; const bool m_bFlysOnly; public: - SwOrderIter( const SwPageFrm *pPage, bool bFlysOnly = true ); + SwOrderIter( const SwPageFrame *pPage, bool bFlysOnly = true ); void Current( const SdrObject *pNew ) { m_pCurrent = pNew; } const SdrObject *operator()() const { return m_pCurrent; } @@ -429,21 +429,21 @@ public: }; // Should upper (or lower) border be evaluated for this frame? -// #i25029# - If <_pPrevFrm> is set, its value is taken for testing, if +// #i25029# - If <_pPrevFrame> is set, its value is taken for testing, if // borders/shadow have to be joined with previous frame. -inline sal_uInt16 SwBorderAttrs::GetTopLine ( const SwFrm& _rFrm, - const SwFrm* _pPrevFrm ) const +inline sal_uInt16 SwBorderAttrs::GetTopLine ( const SwFrame& _rFrame, + const SwFrame* _pPrevFrame ) const { - if ( !m_bCachedGetTopLine || _pPrevFrm ) + if ( !m_bCachedGetTopLine || _pPrevFrame ) { - const_cast<SwBorderAttrs*>(this)->_GetTopLine( _rFrm, _pPrevFrm ); + const_cast<SwBorderAttrs*>(this)->_GetTopLine( _rFrame, _pPrevFrame ); } return m_nGetTopLine; } -inline sal_uInt16 SwBorderAttrs::GetBottomLine( const SwFrm& _rFrm ) const +inline sal_uInt16 SwBorderAttrs::GetBottomLine( const SwFrame& _rFrame ) const { if ( !m_bCachedGetBottomLine ) - const_cast<SwBorderAttrs*>(this)->_GetBottomLine( _rFrm ); + const_cast<SwBorderAttrs*>(this)->_GetBottomLine( _rFrame ); return m_nGetBottomLine; } inline void SwBorderAttrs::SetGetCacheLine( bool bNew ) const @@ -507,7 +507,7 @@ inline bool SwBorderAttrs::IsLine() const #i102458# Add output parameter <obIsLineSpacingProportional> - @param rFrm + @param rFrame input parameter - frame, for which the spacing values are determined. @param onPrevLowerSpacing @@ -518,7 +518,7 @@ inline bool SwBorderAttrs::IsLine() const @param obIsLineSpacingProportional */ -void GetSpacingValuesOfFrm( const SwFrm& rFrm, +void GetSpacingValuesOfFrame( const SwFrame& rFrame, SwTwips& onLowerSpacing, SwTwips& onLineSpacing, bool& obIsLineSpacingProportional ); @@ -535,7 +535,7 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm, pointer to the found content frame or 0 */ -const SwContentFrm* GetCellContent( const SwLayoutFrm& rCell_ ); +const SwContentFrame* GetCellContent( const SwLayoutFrame& rCell_ ); /** helper class to check if a frame has been deleted during an operation * WARNING! This should only be used as a last and desperate means to make the @@ -545,19 +545,19 @@ const SwContentFrm* GetCellContent( const SwLayoutFrm& rCell_ ); class SwDeletionChecker { private: - const SwFrm* mpFrm; + const SwFrame* mpFrame; const SwModify* mpRegIn; public: - SwDeletionChecker( const SwFrm* pFrm ) - : mpFrm( pFrm ), - mpRegIn( pFrm ? const_cast<SwFrm*>(pFrm)->GetRegisteredIn() : nullptr ) + SwDeletionChecker( const SwFrame* pFrame ) + : mpFrame( pFrame ), + mpRegIn( pFrame ? const_cast<SwFrame*>(pFrame)->GetRegisteredIn() : nullptr ) { } /** * return - * true if mpFrm != 0 and mpFrm is not client of pRegIn + * true if mpFrame != 0 and mpFrame is not client of pRegIn * false otherwise */ bool HasBeenDeleted(); diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index 6d62c2e01754..2a61219801ce 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -22,20 +22,20 @@ #include "layfrm.hxx" -class SwFootnoteBossFrm; -class SwFootnoteContFrm; -class SwFootnoteFrm; +class SwFootnoteBossFrame; +class SwFootnoteContFrame; +class SwFootnoteFrame; class SwTextFootnote; // Set max. footnote area. // Restoration of the old value in DTor. Implementation in ftnfrm.cxx class SwSaveFootnoteHeight { - SwFootnoteBossFrm *pBoss; + SwFootnoteBossFrame *pBoss; const SwTwips nOldHeight; SwTwips nNewHeight; public: - SwSaveFootnoteHeight( SwFootnoteBossFrm *pBs, const SwTwips nDeadLine ); + SwSaveFootnoteHeight( SwFootnoteBossFrame *pBs, const SwTwips nDeadLine ); ~SwSaveFootnoteHeight(); }; @@ -44,47 +44,47 @@ public: #define NA_GROW_ADJUST 2 #define NA_ADJUST_GROW 3 -typedef std::vector<SwFootnoteFrm*> SwFootnoteFrms; +typedef std::vector<SwFootnoteFrame*> SwFootnoteFrames; -class SwFootnoteBossFrm: public SwLayoutFrm +class SwFootnoteBossFrame: public SwLayoutFrame { // for private footnote operations - friend class SwFrm; + friend class SwFrame; friend class SwSaveFootnoteHeight; - friend class SwPageFrm; // for setting of MaxFootnoteHeight + friend class SwPageFrame; // for setting of MaxFootnoteHeight // max. height of the footnote container on this page SwTwips nMaxFootnoteHeight; - SwFootnoteContFrm *MakeFootnoteCont(); - SwFootnoteFrm *FindFirstFootnote(); - sal_uInt8 _NeighbourhoodAdjustment( const SwFrm* pFrm ) const; + SwFootnoteContFrame *MakeFootnoteCont(); + SwFootnoteFrame *FindFirstFootnote(); + sal_uInt8 _NeighbourhoodAdjustment( const SwFrame* pFrame ) const; protected: - void InsertFootnote( SwFootnoteFrm * ); - static void ResetFootnote( const SwFootnoteFrm *pAssumed ); + void InsertFootnote( SwFootnoteFrame * ); + static void ResetFootnote( const SwFootnoteFrame *pAssumed ); public: - inline SwFootnoteBossFrm( SwFrameFormat* pFormat, SwFrm* pSib ) - : SwLayoutFrm( pFormat, pSib ) + inline SwFootnoteBossFrame( SwFrameFormat* pFormat, SwFrame* pSib ) + : SwLayoutFrame( pFormat, pSib ) , nMaxFootnoteHeight(0) {} - SwLayoutFrm *FindBodyCont(); - inline const SwLayoutFrm *FindBodyCont() const; + SwLayoutFrame *FindBodyCont(); + inline const SwLayoutFrame *FindBodyCont() const; inline void SetMaxFootnoteHeight( const SwTwips nNewMax ) { nMaxFootnoteHeight = nNewMax; } // footnote interface - void AppendFootnote( SwContentFrm *, SwTextFootnote * ); - void RemoveFootnote( const SwContentFrm *, const SwTextFootnote *, bool bPrep = true ); - static SwFootnoteFrm *FindFootnote( const SwContentFrm *, const SwTextFootnote * ); - SwFootnoteContFrm *FindFootnoteCont(); - inline const SwFootnoteContFrm *FindFootnoteCont() const; - const SwFootnoteFrm *FindFirstFootnote( SwContentFrm* ) const; - SwFootnoteContFrm *FindNearestFootnoteCont( bool bDontLeave = false ); - - static void ChangeFootnoteRef( const SwContentFrm *pOld, const SwTextFootnote *, - SwContentFrm *pNew ); + void AppendFootnote( SwContentFrame *, SwTextFootnote * ); + void RemoveFootnote( const SwContentFrame *, const SwTextFootnote *, bool bPrep = true ); + static SwFootnoteFrame *FindFootnote( const SwContentFrame *, const SwTextFootnote * ); + SwFootnoteContFrame *FindFootnoteCont(); + inline const SwFootnoteContFrame *FindFootnoteCont() const; + const SwFootnoteFrame *FindFirstFootnote( SwContentFrame* ) const; + SwFootnoteContFrame *FindNearestFootnoteCont( bool bDontLeave = false ); + + static void ChangeFootnoteRef( const SwContentFrame *pOld, const SwTextFootnote *, + SwContentFrame *pNew ); void RearrangeFootnotes( const SwTwips nDeadLine, const bool bLock = false, const SwTextFootnote *pAttr = nullptr ); @@ -97,40 +97,40 @@ public: SwTwips GetVarSpace() const; // methods needed for layouting - // The parameters <_bCollectOnlyPreviousFootnotes> and <_pRefFootnoteBossFrm> control + // The parameters <_bCollectOnlyPreviousFootnotes> and <_pRefFootnoteBossFrame> control // if only footnotes that are positioned before the given reference // footnote boss-frame have to be collected. // Note: if parameter <_bCollectOnlyPreviousFootnotes> is true, then parameter - // <_pRefFootnoteBossFrm> has to be referenced by an object. - static void _CollectFootnotes( const SwContentFrm* _pRef, - SwFootnoteFrm* _pFootnote, - SwFootnoteFrms& _rFootnoteArr, + // <_pRefFootnoteBossFrame> has to be referenced by an object. + static void _CollectFootnotes( const SwContentFrame* _pRef, + SwFootnoteFrame* _pFootnote, + SwFootnoteFrames& _rFootnoteArr, const bool _bCollectOnlyPreviousFootnotes = false, - const SwFootnoteBossFrm* _pRefFootnoteBossFrm = nullptr); + const SwFootnoteBossFrame* _pRefFootnoteBossFrame = nullptr); // The parameter <_bCollectOnlyPreviousFootnotes> controls if only footnotes // that are positioned before the footnote boss-frame <this> have to be // collected. - void CollectFootnotes( const SwContentFrm* _pRef, - SwFootnoteBossFrm* _pOld, - SwFootnoteFrms& _rFootnoteArr, + void CollectFootnotes( const SwContentFrame* _pRef, + SwFootnoteBossFrame* _pOld, + SwFootnoteFrames& _rFootnoteArr, const bool _bCollectOnlyPreviousFootnotes = false ); - void _MoveFootnotes( SwFootnoteFrms &rFootnoteArr, bool bCalc = false ); - void MoveFootnotes( const SwContentFrm *pSrc, SwContentFrm *pDest, + void _MoveFootnotes( SwFootnoteFrames &rFootnoteArr, bool bCalc = false ); + void MoveFootnotes( const SwContentFrame *pSrc, SwContentFrame *pDest, SwTextFootnote *pAttr ); // should AdjustNeighbourhood be called (or Grow/Shrink)? - sal_uInt8 NeighbourhoodAdjustment( const SwFrm* pFrm ) const - { return IsPageFrm() ? NA_ONLY_ADJUST : _NeighbourhoodAdjustment( pFrm ); } + sal_uInt8 NeighbourhoodAdjustment( const SwFrame* pFrame ) const + { return IsPageFrame() ? NA_ONLY_ADJUST : _NeighbourhoodAdjustment( pFrame ); } }; -inline const SwLayoutFrm *SwFootnoteBossFrm::FindBodyCont() const +inline const SwLayoutFrame *SwFootnoteBossFrame::FindBodyCont() const { - return const_cast<SwFootnoteBossFrm*>(this)->FindBodyCont(); + return const_cast<SwFootnoteBossFrame*>(this)->FindBodyCont(); } -inline const SwFootnoteContFrm *SwFootnoteBossFrm::FindFootnoteCont() const +inline const SwFootnoteContFrame *SwFootnoteBossFrame::FindFootnoteCont() const { - return const_cast<SwFootnoteBossFrm*>(this)->FindFootnoteCont(); + return const_cast<SwFootnoteBossFrame*>(this)->FindFootnoteCont(); } #endif diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index ab8f83d76ef9..974ad841783f 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -22,42 +22,42 @@ #include "layfrm.hxx" -class SwContentFrm; +class SwContentFrame; class SwTextFootnote; class SwBorderAttrs; -class SwFootnoteFrm; +class SwFootnoteFrame; -void sw_RemoveFootnotes( SwFootnoteBossFrm* pBoss, bool bPageOnly, bool bEndNotes ); +void sw_RemoveFootnotes( SwFootnoteBossFrame* pBoss, bool bPageOnly, bool bEndNotes ); // There exists a special section on a page for footnotes. It's called -// SwFootnoteContFrm. Each footnote is separated by a SwFootnoteFrm which contains -// the paragraphs of a footnote. SwFootnoteFrm can be splitted and will then +// SwFootnoteContFrame. Each footnote is separated by a SwFootnoteFrame which contains +// the paragraphs of a footnote. SwFootnoteFrame can be splitted and will then // continue on another page. -class SwFootnoteContFrm: public SwLayoutFrm +class SwFootnoteContFrame: public SwLayoutFrame { public: - SwFootnoteContFrm( SwFrameFormat*, SwFrm* ); + SwFootnoteContFrame( SwFrameFormat*, SwFrame* ); - const SwFootnoteFrm* FindFootNote() const; + const SwFootnoteFrame* FindFootNote() const; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; - virtual void PaintBorder( const SwRect &, const SwPageFrm *pPage, + virtual void PaintBorder( const SwRect &, const SwPageFrame *pPage, const SwBorderAttrs & ) const override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; - void PaintLine( const SwRect &, const SwPageFrm * ) const; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; + void PaintLine( const SwRect &, const SwPageFrame * ) const; }; -class SwFootnoteFrm: public SwLayoutFrm +class SwFootnoteFrame: public SwLayoutFrame { - // Pointer to FootnoteFrm in which the footnote will be continued: + // Pointer to FootnoteFrame in which the footnote will be continued: // - 0 no following existent // - this for the last one - // - otherwise the following FootnoteFrm - SwFootnoteFrm *pFollow; - SwFootnoteFrm *pMaster; // FootnoteFrm from which I am the following - SwContentFrm *pRef; // in this ContentFrm is the footnote reference + // - otherwise the following FootnoteFrame + SwFootnoteFrame *pFollow; + SwFootnoteFrame *pMaster; // FootnoteFrame from which I am the following + SwContentFrame *pRef; // in this ContentFrame is the footnote reference SwTextFootnote *pAttr; // footnote attribute (for recognition) // if true paragraphs in this footnote are NOT permitted to flow backwards @@ -66,50 +66,50 @@ class SwFootnoteFrm: public SwLayoutFrm bool mbUnlockPosOfLowerObjs : 1; #ifdef DBG_UTIL protected: - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; #endif public: - SwFootnoteFrm( SwFrameFormat*, SwFrm*, SwContentFrm*, SwTextFootnote* ); + SwFootnoteFrame( SwFrameFormat*, SwFrame*, SwContentFrame*, SwTextFootnote* ); virtual void Cut() override; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; bool operator<( const SwTextFootnote* pTextFootnote ) const; #ifdef DBG_UTIL - const SwContentFrm *GetRef() const; - SwContentFrm *GetRef(); + const SwContentFrame *GetRef() const; + SwContentFrame *GetRef(); #else - const SwContentFrm *GetRef() const { return pRef; } - SwContentFrm *GetRef() { return pRef; } + const SwContentFrame *GetRef() const { return pRef; } + SwContentFrame *GetRef() { return pRef; } #endif - const SwContentFrm *GetRefFromAttr() const; - SwContentFrm *GetRefFromAttr(); + const SwContentFrame *GetRefFromAttr() const; + SwContentFrame *GetRefFromAttr(); - const SwFootnoteFrm *GetFollow() const { return pFollow; } - SwFootnoteFrm *GetFollow() { return pFollow; } + const SwFootnoteFrame *GetFollow() const { return pFollow; } + SwFootnoteFrame *GetFollow() { return pFollow; } - const SwFootnoteFrm *GetMaster() const { return pMaster; } - SwFootnoteFrm *GetMaster() { return pMaster; } + const SwFootnoteFrame *GetMaster() const { return pMaster; } + SwFootnoteFrame *GetMaster() { return pMaster; } const SwTextFootnote *GetAttr() const { return pAttr; } SwTextFootnote *GetAttr() { return pAttr; } - void SetFollow( SwFootnoteFrm *pNew ) { pFollow = pNew; } - void SetMaster( SwFootnoteFrm *pNew ) { pMaster = pNew; } - void SetRef ( SwContentFrm *pNew ) { pRef = pNew; } + void SetFollow( SwFootnoteFrame *pNew ) { pFollow = pNew; } + void SetMaster( SwFootnoteFrame *pNew ) { pMaster = pNew; } + void SetRef ( SwContentFrame *pNew ) { pRef = pNew; } - void InvalidateNxtFootnoteCnts( SwPageFrm* pPage ); + void InvalidateNxtFootnoteCnts( SwPageFrame* pPage ); void LockBackMove() { bBackMoveLocked = true; } void UnlockBackMove() { bBackMoveLocked = false;} bool IsBackMoveLocked() { return bBackMoveLocked; } - // prevents that the last content deletes the SwFootnoteFrm as well (Cut()) + // prevents that the last content deletes the SwFootnoteFrame as well (Cut()) inline void ColLock() { mbColLocked = true; } inline void ColUnlock() { mbColLocked = false; } @@ -131,10 +131,10 @@ public: OD 2005-12-02 #i27138# - @return SwContentFrm* + @return SwContentFrame* pointer to found last content frame. NULL, if none is found. */ - SwContentFrm* FindLastContent(); + SwContentFrame* FindLastContent(); }; #endif diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index 273bda293568..9986df1e6846 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -23,7 +23,7 @@ #include <tools/mempool.hxx> #include "layfrm.hxx" -class SwHeadFootFrm : public SwLayoutFrm +class SwHeadFootFrame : public SwLayoutFrame { protected: void FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs); @@ -31,31 +31,31 @@ protected: inline bool GetEatSpacing() const; // in hffrm.cxx public: - SwHeadFootFrm(SwFrameFormat * pFrm, SwFrm*, sal_uInt16 aType); + SwHeadFootFrame(SwFrameFormat * pFrame, SwFrame*, sal_uInt16 aType); virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; - virtual SwTwips GrowFrm( SwTwips, + virtual SwTwips GrowFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips ShrinkFrm( SwTwips, + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; }; /// Header in the document layout, inside a page. -class SwHeaderFrm: public SwHeadFootFrm +class SwHeaderFrame: public SwHeadFootFrame { public: - SwHeaderFrm( SwFrameFormat* pFrm, SwFrm* pSib ) : SwHeadFootFrm(pFrm, pSib, FRM_HEADER) {}; + SwHeaderFrame( SwFrameFormat* pFrame, SwFrame* pSib ) : SwHeadFootFrame(pFrame, pSib, FRM_HEADER) {}; - DECL_FIXEDMEMPOOL_NEWDEL(SwHeaderFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwHeaderFrame) }; /// Footer in the document layout, inside a page. -class SwFooterFrm: public SwHeadFootFrm +class SwFooterFrame: public SwHeadFootFrame { public: - SwFooterFrm( SwFrameFormat* pFrm, SwFrm* pSib ) : SwHeadFootFrm(pFrm, pSib, FRM_FOOTER) {}; + SwFooterFrame( SwFrameFormat* pFrame, SwFrame* pSib ) : SwHeadFootFrame(pFrame, pSib, FRM_FOOTER) {}; - DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwFooterFrame) }; #endif diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 57259d8344ca..bcb1a0f7cfb2 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -26,12 +26,12 @@ #include "swtypes.hxx" #include "swrect.hxx" -class SwRootFrm; -class SwLayoutFrm; -class SwPageFrm; -class SwFlyFrm; -class SwContentFrm; -class SwTabFrm; +class SwRootFrame; +class SwLayoutFrame; +class SwPageFrame; +class SwFlyFrame; +class SwContentFrame; +class SwTabFrame; class SwViewShellImp; class SwContentNode; class SwWait; @@ -50,15 +50,15 @@ class SwWait; */ class SwLayAction { - SwRootFrm *m_pRoot; + SwRootFrame *m_pRoot; SwViewShellImp *m_pImp; // here the action logs in and off // For the sake of optimization, so that the tables stick a bit better to - // the Crsr when hitting return/backspace in front of one. - // The first TabFrm that paints itself (per page) adds itself to the pointer. - // The ContentFrms beneath the page do not need to deregister at the Shell for + // the Cursor when hitting return/backspace in front of one. + // The first TabFrame that paints itself (per page) adds itself to the pointer. + // The ContentFrames beneath the page do not need to deregister at the Shell for // painting. - const SwTabFrm *m_pOptTab; + const SwTabFrame *m_pOptTab; SwWait *m_pWait; @@ -68,7 +68,7 @@ class SwLayAction sal_uInt16 m_nPreInvaPage; std::clock_t m_nStartTicks; // The Action's starting time; if too much time passes the - // WaitCrsr can be enabled via CheckWaitCrsr() + // WaitCursor can be enabled via CheckWaitCursor() VclInputFlags m_nInputType; // Which input should terminate processing sal_uInt16 m_nEndPage; // StatBar control @@ -93,25 +93,25 @@ class SwLayAction // OD 14.04.2003 #106346# - new flag for content formatting on interrupt. bool mbFormatContentOnInterrupt; - void PaintContent( const SwContentFrm *, const SwPageFrm *, + void PaintContent( const SwContentFrame *, const SwPageFrame *, const SwRect &rOldRect, long nOldBottom ); - bool PaintWithoutFlys( const SwRect &, const SwContentFrm *, - const SwPageFrm * ); - inline bool _PaintContent( const SwContentFrm *, const SwPageFrm *, + bool PaintWithoutFlys( const SwRect &, const SwContentFrame *, + const SwPageFrame * ); + inline bool _PaintContent( const SwContentFrame *, const SwPageFrame *, const SwRect & ); - bool FormatLayout( OutputDevice* pRenderContext, SwLayoutFrm *, bool bAddRect = true ); - bool FormatLayoutTab( SwTabFrm *, bool bAddRect = true ); - bool FormatContent( const SwPageFrm* pPage ); - void _FormatContent( const SwContentFrm* pContent, - const SwPageFrm* pPage ); - bool IsShortCut( SwPageFrm *& ); + bool FormatLayout( OutputDevice* pRenderContext, SwLayoutFrame *, bool bAddRect = true ); + bool FormatLayoutTab( SwTabFrame *, bool bAddRect = true ); + bool FormatContent( const SwPageFrame* pPage ); + void _FormatContent( const SwContentFrame* pContent, + const SwPageFrame* pPage ); + bool IsShortCut( SwPageFrame *& ); bool TurboAction(); - bool _TurboAction( const SwContentFrm * ); + bool _TurboAction( const SwContentFrame * ); void InternalAction(OutputDevice* pRenderContext); - static SwPageFrm *CheckFirstVisPage( SwPageFrm *pPage ); + static SwPageFrame *CheckFirstVisPage( SwPageFrame *pPage ); bool RemoveEmptyBrowserPages(); @@ -119,7 +119,7 @@ class SwLayAction inline std::clock_t GetStartTicks() { return m_nStartTicks; } public: - SwLayAction( SwRootFrm *pRt, SwViewShellImp *pImp ); + SwLayAction( SwRootFrame *pRt, SwViewShellImp *pImp ); ~SwLayAction(); void SetIdle ( bool bNew ) { m_bIdle = bNew; } @@ -167,21 +167,21 @@ public: sal_uInt16 GetCheckPageNum() const { return m_nCheckPageNum; } - // others should be able to activate the WaitCrsr, too - void CheckWaitCrsr(); + // others should be able to activate the WaitCursor, too + void CheckWaitCursor(); // #i28701# - method is now public; // delete 2nd parameter, because its not used; - bool FormatLayoutFly( SwFlyFrm * ); + bool FormatLayoutFly( SwFlyFrame * ); // #i28701# - method is now public - bool _FormatFlyContent( const SwFlyFrm * ); + bool _FormatFlyContent( const SwFlyFrame * ); }; class SwLayIdle { - SwRootFrm *pRoot; + SwRootFrame *pRoot; SwViewShellImp *pImp; // The Idler registers and deregisters here SwContentNode *pContentNode; // The current cursor position is saved here sal_Int32 nTextPos; @@ -197,11 +197,11 @@ class SwLayIdle #endif enum IdleJobType{ ONLINE_SPELLING, AUTOCOMPLETE_WORDS, WORD_COUNT, SMART_TAGS }; - bool _DoIdleJob( const SwContentFrm*, IdleJobType ); + bool _DoIdleJob( const SwContentFrame*, IdleJobType ); bool DoIdleJob( IdleJobType, bool bVisAreaOnly ); public: - SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pImp ); + SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pImp ); ~SwLayIdle(); }; diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index 972c0daff1a8..566ca5490ee7 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -22,51 +22,51 @@ #include "frame.hxx" class SwAnchoredObject; -class SwContentFrm; -class SwFlowFrm; +class SwContentFrame; +class SwFlowFrame; class SwFormatCol; -struct SwCrsrMoveState; +struct SwCursorMoveState; class SwFrameFormat; class SwBorderAttrs; -class SwFormatFrmSize; -class SwCellFrm; +class SwFormatFrameSize; +class SwCellFrame; -class SwLayoutFrm: public SwFrm +class SwLayoutFrame: public SwFrame { - // The SwFrm in disguise - friend class SwFlowFrm; - friend class SwFrm; + // The SwFrame in disguise + friend class SwFlowFrame; + friend class SwFrame; // Releases the Lower while restructuring columns - friend SwFrm* SaveContent( SwLayoutFrm *, SwFrm * ); - friend void RestoreContent( SwFrm *, SwLayoutFrm *, SwFrm *pSibling, bool bGrow ); + friend SwFrame* SaveContent( SwLayoutFrame *, SwFrame * ); + friend void RestoreContent( SwFrame *, SwLayoutFrame *, SwFrame *pSibling, bool bGrow ); #ifdef DBG_UTIL - //removes empty SwSectionFrms from a chain - friend SwFrm* SwClearDummies( SwFrm* pFrm ); + //removes empty SwSectionFrames from a chain + friend SwFrame* SwClearDummies( SwFrame* pFrame ); #endif protected: virtual void DestroyImpl() override; - virtual ~SwLayoutFrm(); + virtual ~SwLayoutFrame(); virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; virtual void MakeAll(vcl::RenderContext* pRenderContext) override; - SwFrm * m_pLower; - std::vector<SwAnchoredObject*> m_VertPosOrientFrmsFor; + SwFrame * m_pLower; + std::vector<SwAnchoredObject*> m_VertPosOrientFramesFor; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; - long CalcRel( const SwFormatFrmSize &rSz, bool bWidth ) const; + long CalcRel( const SwFormatFrameSize &rSz, bool bWidth ) const; public: // --> #i28701# - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; - void RefreshLaySubsidiary( const SwPageFrm*, const SwRect& ) const; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const; + void RefreshLaySubsidiary( const SwPageFrame*, const SwRect& ) const; void RefreshExtraData( const SwRect & ) const; /// Change size of lowers proportionally @@ -79,36 +79,36 @@ public: /// Paints the column separation line for the inner columns void PaintColLines( const SwRect &, const SwFormatCol &, - const SwPageFrm * ) const; + const SwPageFrame * ) const; virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; - virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = nullptr, bool bTestBackground = false ) const override; + virtual bool GetCursorOfst( SwPosition *, Point&, + SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; virtual void Cut() override; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; /** * Finds the closest Content for the SPoint - * Is used for Pages, Flys and Cells if GetCrsrOfst failed + * Is used for Pages, Flys and Cells if GetCursorOfst failed */ - const SwContentFrm* GetContentPos( Point &rPoint, const bool bDontLeave, + const SwContentFrame* GetContentPos( Point &rPoint, const bool bDontLeave, const bool bBodyOnly = false, const bool bCalc = false, - const SwCrsrMoveState *pCMS = nullptr, + const SwCursorMoveState *pCMS = nullptr, const bool bDefaultExpand = true ) const; - SwLayoutFrm( SwFrameFormat*, SwFrm* ); + SwLayoutFrame( SwFrameFormat*, SwFrame* ); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; - const SwFrm *Lower() const { return m_pLower; } - SwFrm *Lower() { return m_pLower; } - const SwContentFrm *ContainsContent() const; - inline SwContentFrm *ContainsContent(); - const SwCellFrm *FirstCell() const; - inline SwCellFrm *FirstCell(); + const SwFrame *Lower() const { return m_pLower; } + SwFrame *Lower() { return m_pLower; } + const SwContentFrame *ContainsContent() const; + inline SwContentFrame *ContainsContent(); + const SwCellFrame *FirstCell() const; + inline SwCellFrame *FirstCell(); /** * Method <ContainsAny()> doesn't investigate content of footnotes by default. @@ -117,9 +117,9 @@ public: * It's default is <false>, still indicating that content of footnotes isn't * investigated for sections. */ - const SwFrm *ContainsAny( const bool _bInvestigateFootnoteForSections = false ) const; - inline SwFrm *ContainsAny( const bool _bInvestigateFootnoteForSections = false ); - bool IsAnLower( const SwFrm * ) const; + const SwFrame *ContainsAny( const bool _bInvestigateFootnoteForSections = false ) const; + inline SwFrame *ContainsAny( const bool _bInvestigateFootnoteForSections = false ); + bool IsAnLower( const SwFrame * ) const; virtual const SwFrameFormat *GetFormat() const; virtual SwFrameFormat *GetFormat(); @@ -131,8 +131,8 @@ public: * @returns true if at least one Footnote was moved * Calls the page number update if bFootnoteNums is set */ - bool MoveLowerFootnotes( SwContentFrm *pStart, SwFootnoteBossFrm *pOldBoss, - SwFootnoteBossFrm *pNewBoss, const bool bFootnoteNums ); + bool MoveLowerFootnotes( SwContentFrame *pStart, SwFootnoteBossFrame *pOldBoss, + SwFootnoteBossFrame *pNewBoss, const bool bFootnoteNums ); // --> #i28701# - change purpose of method and its name // --> #i44016# - add parameter <_bUnlockPosOfObjs> to @@ -162,30 +162,30 @@ public: refactoring of pseudo-local method <lcl_Apres(..)> in <txtftn.cxx> for #104840#. - @param _aCheckRefLayFrm - constant reference of an instance of class <SwLayoutFrm> which + @param _aCheckRefLayFrame + constant reference of an instance of class <SwLayoutFrame> which is used as the reference for the relative position check. @return true, if <this> is positioned before the layout frame <p> */ - bool IsBefore( const SwLayoutFrm* _pCheckRefLayFrm ) const; + bool IsBefore( const SwLayoutFrame* _pCheckRefLayFrame ) const; - const SwFrm* GetLastLower() const; - inline SwFrm* GetLastLower(); + const SwFrame* GetLastLower() const; + inline SwFrame* GetLastLower(); virtual void PaintBreak() const; - void SetVertPosOrientFrmFor(SwAnchoredObject *pObj) + void SetVertPosOrientFrameFor(SwAnchoredObject *pObj) { - m_VertPosOrientFrmsFor.push_back(pObj); + m_VertPosOrientFramesFor.push_back(pObj); } - void ClearVertPosOrientFrmFor(SwAnchoredObject *pObj) + void ClearVertPosOrientFrameFor(SwAnchoredObject *pObj) { - m_VertPosOrientFrmsFor.erase( - std::remove(m_VertPosOrientFrmsFor.begin(), - m_VertPosOrientFrmsFor.end(), pObj), - m_VertPosOrientFrmsFor.end()); + m_VertPosOrientFramesFor.erase( + std::remove(m_VertPosOrientFramesFor.begin(), + m_VertPosOrientFramesFor.end(), pObj), + m_VertPosOrientFramesFor.end()); } }; @@ -193,37 +193,37 @@ public: * In order to save us from duplicating implementations, we cast here * a little. */ -inline SwContentFrm* SwLayoutFrm::ContainsContent() +inline SwContentFrame* SwLayoutFrame::ContainsContent() { - return const_cast<SwContentFrm*>(static_cast<const SwLayoutFrm*>(this)->ContainsContent()); + return const_cast<SwContentFrame*>(static_cast<const SwLayoutFrame*>(this)->ContainsContent()); } -inline SwCellFrm* SwLayoutFrm::FirstCell() +inline SwCellFrame* SwLayoutFrame::FirstCell() { - return const_cast<SwCellFrm*>(static_cast<const SwLayoutFrm*>(this)->FirstCell()); + return const_cast<SwCellFrame*>(static_cast<const SwLayoutFrame*>(this)->FirstCell()); } -inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFootnoteForSections ) +inline SwFrame* SwLayoutFrame::ContainsAny( const bool _bInvestigateFootnoteForSections ) { - return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->ContainsAny( _bInvestigateFootnoteForSections )); + return const_cast<SwFrame*>(static_cast<const SwLayoutFrame*>(this)->ContainsAny( _bInvestigateFootnoteForSections )); } /** - * These SwFrm inlines are here, so that frame.hxx does not need to include layfrm.hxx + * These SwFrame inlines are here, so that frame.hxx does not need to include layfrm.hxx */ -inline bool SwFrm::IsColBodyFrm() const +inline bool SwFrame::IsColBodyFrame() const { - return mnFrmType == FRM_BODY && GetUpper()->IsColumnFrm(); + return mnFrameType == FRM_BODY && GetUpper()->IsColumnFrame(); } -inline bool SwFrm::IsPageBodyFrm() const +inline bool SwFrame::IsPageBodyFrame() const { - return mnFrmType == FRM_BODY && GetUpper()->IsPageFrm(); + return mnFrameType == FRM_BODY && GetUpper()->IsPageFrame(); } -inline SwFrm* SwLayoutFrm::GetLastLower() +inline SwFrame* SwLayoutFrame::GetLastLower() { - return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->GetLastLower()); + return const_cast<SwFrame*>(static_cast<const SwLayoutFrame*>(this)->GetLastLower()); } #endif // INCLUDED_SW_SOURCE_CORE_INC_LAYFRM_HXX diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx index 2c343b239374..bb4b8ed4e656 100644 --- a/sw/source/core/inc/layouter.hxx +++ b/sw/source/core/inc/layouter.hxx @@ -24,18 +24,18 @@ class SwEndnoter; class SwDoc; -class SwSectionFrm; -class SwFootnoteFrm; -class SwPageFrm; +class SwSectionFrame; +class SwFootnoteFrame; +class SwPageFrame; class SwLooping; -class SwMovedFwdFrmsByObjPos; -class SwTextFrm; -class SwRowFrm; +class SwMovedFwdFramesByObjPos; +class SwTextFrame; +class SwRowFrame; class SwObjsMarkedAsTmpConsiderWrapInfluence; class SwAnchoredObject; -class SwFlowFrm; -class SwLayoutFrm; +class SwFlowFrame; +class SwLayoutFrame; #define LOOP_PAGE 1 @@ -43,11 +43,11 @@ class SwLayouter { SwEndnoter* mpEndnoter; SwLooping* mpLooping; - void _CollectEndnotes( SwSectionFrm* pSect ); - bool StartLooping( SwPageFrm* pPage ); + void _CollectEndnotes( SwSectionFrame* pSect ); + bool StartLooping( SwPageFrame* pPage ); // --> #i28701# - SwMovedFwdFrmsByObjPos* mpMovedFwdFrms; + SwMovedFwdFramesByObjPos* mpMovedFwdFrames; // --> #i35911# SwObjsMarkedAsTmpConsiderWrapInfluence* mpObjsTmpConsiderWrapInfl; @@ -57,7 +57,7 @@ public: struct tMoveBwdLayoutInfoKey { // frame ID of flow frame - sal_uInt32 mnFrmId; + sal_uInt32 mnFrameId; // position of new upper frame SwTwips mnNewUpperPosX; SwTwips mnNewUpperPosY; @@ -73,7 +73,7 @@ private: { size_t operator()( const tMoveBwdLayoutInfoKey& p_key ) const { - return p_key.mnFrmId; + return p_key.mnFrameId; } }; struct fMoveBwdLayoutInfoKeyEq @@ -81,7 +81,7 @@ private: bool operator()( const tMoveBwdLayoutInfoKey& p_key1, const tMoveBwdLayoutInfoKey& p_key2 ) const { - return p_key1.mnFrmId == p_key2.mnFrmId && + return p_key1.mnFrameId == p_key2.mnFrameId && p_key1.mnNewUpperPosX == p_key2.mnNewUpperPosX && p_key1.mnNewUpperPosY == p_key2.mnNewUpperPosY && p_key1.mnNewUpperWidth == p_key2.mnNewUpperWidth && @@ -95,32 +95,32 @@ private: public: SwLayouter(); ~SwLayouter(); - void InsertEndnotes( SwSectionFrm* pSect ); - void CollectEndnote( SwFootnoteFrm* pFootnote ); + void InsertEndnotes( SwSectionFrame* pSect ); + void CollectEndnote( SwFootnoteFrame* pFootnote ); bool HasEndnotes() const; - void LoopControl( SwPageFrm* pPage, sal_uInt8 nLoop ); + void LoopControl( SwPageFrame* pPage, sal_uInt8 nLoop ); void EndLoopControl(); - void LoopingLouieLight( const SwDoc& rDoc, const SwTextFrm& rFrm ); + void LoopingLouieLight( const SwDoc& rDoc, const SwTextFrame& rFrame ); - static void CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect ); - static bool Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFootnoteFrm* pFootnote ); - static bool StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage ); + static void CollectEndnotes( SwDoc* pDoc, SwSectionFrame* pSect ); + static bool Collecting( SwDoc* pDoc, SwSectionFrame* pSect, SwFootnoteFrame* pFootnote ); + static bool StartLoopControl( SwDoc* pDoc, SwPageFrame *pPage ); // --> #i28701# - static void ClearMovedFwdFrms( const SwDoc& _rDoc ); - static void InsertMovedFwdFrm( const SwDoc& _rDoc, - const SwTextFrm& _rMovedFwdFrmByObjPos, + static void ClearMovedFwdFrames( const SwDoc& _rDoc ); + static void InsertMovedFwdFrame( const SwDoc& _rDoc, + const SwTextFrame& _rMovedFwdFrameByObjPos, const sal_uInt32 _nToPageNum ); - static bool FrmMovedFwdByObjPos( const SwDoc& _rDoc, - const SwTextFrm& _rTextFrm, + static bool FrameMovedFwdByObjPos( const SwDoc& _rDoc, + const SwTextFrame& _rTextFrame, sal_uInt32& _ornToPageNum ); // --> #i40155# - unmark given frame as to be moved forward. - static void RemoveMovedFwdFrm( const SwDoc& _rDoc, - const SwTextFrm& _rTextFrm ); + static void RemoveMovedFwdFrame( const SwDoc& _rDoc, + const SwTextFrame& _rTextFrame ); // --> #i26945# - static bool DoesRowContainMovedFwdFrm( const SwDoc& _rDoc, - const SwRowFrm& _rRowFrm ); + static bool DoesRowContainMovedFwdFrame( const SwDoc& _rDoc, + const SwRowFrame& _rRowFrame ); // --> #i35911# static void ClearObjsTmpConsiderWrapInfluence( const SwDoc& _rDoc ); @@ -129,12 +129,12 @@ public: SwAnchoredObject& _rAnchoredObj ); // --> #i65250# static bool MoveBwdSuppressed( const SwDoc& p_rDoc, - const SwFlowFrm& p_rFlowFrm, - const SwLayoutFrm& p_rNewUpperFrm ); + const SwFlowFrame& p_rFlowFrame, + const SwLayoutFrame& p_rNewUpperFrame ); static void ClearMoveBwdLayoutInfo( const SwDoc& p_rDoc ); }; -extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTextFrm& rTextFrm ); +extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTextFrame& rTextFrame ); #endif // INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx index 86b5afe70ced..aec68040cbea 100644 --- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx +++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx @@ -23,36 +23,36 @@ #include <sal/types.h> class SwTextNode; -class SwTextFrm; +class SwTextFrame; // --> #i26945# -class SwRowFrm; +class SwRowFrame; typedef std::map< const SwTextNode*, const sal_uInt32 > NodeMap; typedef std::map< const SwTextNode*, const sal_uInt32 >::const_iterator NodeMapIter; typedef NodeMap::value_type NodeMapEntry; -class SwMovedFwdFrmsByObjPos +class SwMovedFwdFramesByObjPos { private: - NodeMap maMovedFwdFrms; + NodeMap maMovedFwdFrames; public: - SwMovedFwdFrmsByObjPos(); - ~SwMovedFwdFrmsByObjPos(); + SwMovedFwdFramesByObjPos(); + ~SwMovedFwdFramesByObjPos(); - void Insert( const SwTextFrm& _rMovedFwdFrmByObjPos, + void Insert( const SwTextFrame& _rMovedFwdFrameByObjPos, const sal_uInt32 _nToPageNum ); // --> #i40155# - void Remove( const SwTextFrm& _rTextFrm ); + void Remove( const SwTextFrame& _rTextFrame ); - bool FrmMovedFwdByObjPos( const SwTextFrm& _rTextFrm, + bool FrameMovedFwdByObjPos( const SwTextFrame& _rTextFrame, sal_uInt32& _ornToPageNum ) const; // --> #i26945# - bool DoesRowContainMovedFwdFrm( const SwRowFrm& _rRowFrm ) const; + bool DoesRowContainMovedFwdFrame( const SwRowFrame& _rRowFrame ) const; - void Clear() { maMovedFwdFrms.clear(); }; + void Clear() { maMovedFwdFrames.clear(); }; }; #endif diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index b0bb4420c299..e6b94dedd318 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -130,8 +130,8 @@ public: }; /** - * Function declarations so that everything below the CrsrShell can - * move the Crsr once in a while. + * Function declarations so that everything below the CursorShell can + * move the Cursor once in a while. * These functions do not call the SwDoc::Corr methods! */ void PaMCorrAbs( const SwPaM& rRange, diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx index e424c4f79e27..292fd7b6fbca 100644 --- a/sw/source/core/inc/node2lay.hxx +++ b/sw/source/core/inc/node2lay.hxx @@ -30,23 +30,23 @@ * the relevant ones are returned. Repeated table headers are also taken * into account. * It's possible to iterate over SectionNodes that are either not directly - * assigned to a SectionFrm or to multiple ones due to nesting. + * assigned to a SectionFrame or to multiple ones due to nesting. * * This class is an interface between the method and a SwClientIter: it * chooses the right SwModify depending on the task, creates a SwClientIter * and filters its iterations depending on the task. * The task is determined by the choice of ctor. * - * 1. Collecting the UpperFrms (so that later on it becomes RestoreUpperFrms) - * is called by MakeFrms, if there's no PrevNext (before/after we can insert + * 1. Collecting the UpperFrames (so that later on it becomes RestoreUpperFrames) + * is called by MakeFrames, if there's no PrevNext (before/after we can insert * the Frames). * 2. Inserting the Frames before/after which the new Frames of a Node need to - * be inserted, is also called by MakeFrms. + * be inserted, is also called by MakeFrames. */ class SwNode2LayImpl; -class SwFrm; -class SwLayoutFrm; +class SwFrame; +class SwLayoutFrame; class SwNode; class SwNodes; class Point; @@ -56,20 +56,20 @@ class SwNode2Layout { std::unique_ptr<SwNode2LayImpl> pImpl; public: - /// Use this ctor for collecting the UpperFrms + /// Use this ctor for collecting the UpperFrames SwNode2Layout( const SwNode& rNd ); /// Use this ctor for inserting before/after rNd /// @param nIdx is the index of the to-be-inserted Node SwNode2Layout( const SwNode& rNd, sal_uLong nIdx ); ~SwNode2Layout(); - SwFrm* NextFrm(); - SwLayoutFrm* UpperFrm( SwFrm* &rpFrm, const SwNode& rNode ); - void RestoreUpperFrms( SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd ); + SwFrame* NextFrame(); + SwLayoutFrame* UpperFrame( SwFrame* &rpFrame, const SwNode& rNode ); + void RestoreUpperFrames( SwNodes& rNds, sal_uLong nStt, sal_uLong nEnd ); - SwFrm *GetFrm( const Point* pDocPos = nullptr, + SwFrame *GetFrame( const Point* pDocPos = nullptr, const SwPosition *pPos = nullptr, - const bool bCalcFrm = true ) const; + const bool bCalcFrame = true ) const; }; #endif diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index f82410698d86..ddd7ba9c81f8 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -24,11 +24,11 @@ class SwNoTextNode; class OutputDevice; class SwBorderAttrs; -struct SwCrsrMoveState; +struct SwCursorMoveState; -class SwNoTextFrm: public SwContentFrm +class SwNoTextFrame: public SwContentFrame { - friend void _FrmFinit(); + friend void _FrameFinit(); const Size& GetSize() const; @@ -38,20 +38,20 @@ class SwNoTextFrm: public SwContentFrm void PaintPicture( vcl::RenderContext*, const SwRect& ) const; virtual void DestroyImpl() override; - virtual ~SwNoTextFrm(); + virtual ~SwNoTextFrame(); protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: - SwNoTextFrm( SwNoTextNode * const, SwFrm* ); + SwNoTextFrame( SwNoTextNode * const, SwFrame* ); virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; virtual bool GetCharRect( SwRect &, const SwPosition&, - SwCrsrMoveState* = nullptr) const override; - virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint, - SwCrsrMoveState* = nullptr, bool bTestBackground = false) const override; + SwCursorMoveState* = nullptr) const override; + virtual bool GetCursorOfst(SwPosition* pPos, Point& aPoint, + SwCursorMoveState* = nullptr, bool bTestBackground = false) const override; void GetGrfArea( SwRect &rRect, SwRect * = nullptr, bool bMirror = true ) const; diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx index 90ec469a073f..b309ca1a195d 100644 --- a/sw/source/core/inc/objectformatter.hxx +++ b/sw/source/core/inc/objectformatter.hxx @@ -21,11 +21,11 @@ #include <sal/types.h> -class SwFrm; +class SwFrame; // #i26945# -class SwTextFrm; -class SwLayoutFrm; -class SwPageFrm; +class SwTextFrame; +class SwLayoutFrame; +class SwPageFrame; class SwAnchoredObject; class SwLayAction; // OD 2004-10-04 #i26945# @@ -39,7 +39,7 @@ class SwObjectFormatter { private: // page frame, at which the floating screen objects are registered. - const SwPageFrm& mrPageFrm; + const SwPageFrame& mrPageFrame; // boolean, indicating that only as-character anchored objects have to // be formatted. @@ -66,7 +66,7 @@ class SwObjectFormatter <SwLayAction::FormatLayout(..)>. Thus, its code for the formatting have to be synchronised. */ - void _FormatLayout( SwLayoutFrm& _rLayoutFrm ); + void _FormatLayout( SwLayoutFrame& _rLayoutFrame ); /** helper method for method <_FormatObj(..)> - performs the intrinsic format of the content of the given floating screen object. @@ -76,19 +76,19 @@ class SwObjectFormatter void _FormatObjContent( SwAnchoredObject& _rAnchoredObj ); protected: - SwObjectFormatter( const SwPageFrm& _rPageFrm, + SwObjectFormatter( const SwPageFrame& _rPageFrame, SwLayAction* _pLayAction = nullptr, const bool _bCollectPgNumOfAnchors = false ); - static SwObjectFormatter* CreateObjFormatter( SwFrm& _rAnchorFrm, - const SwPageFrm& _rPageFrm, + static SwObjectFormatter* CreateObjFormatter( SwFrame& _rAnchorFrame, + const SwPageFrame& _rPageFrame, SwLayAction* _pLayAction ); - virtual SwFrm& GetAnchorFrm() = 0; + virtual SwFrame& GetAnchorFrame() = 0; - inline const SwPageFrm& GetPageFrm() const + inline const SwPageFrame& GetPageFrame() const { - return mrPageFrm; + return mrPageFrame; } inline bool ConsiderWrapOnObjPos() const @@ -118,10 +118,10 @@ class SwObjectFormatter Thus, the objects, whose anchor character is inside the follow text frame can be formatted. - @param _pMasterTextFrm + @param _pMasterTextFrame input parameter - pointer to 'master' text frame. default value: NULL */ - bool _FormatObjsAtFrm( SwTextFrm* _pMasterTextFrm = nullptr ); + bool _FormatObjsAtFrame( SwTextFrame* _pMasterTextFrame = nullptr ); /** accessor to collected anchored object */ @@ -166,15 +166,15 @@ class SwObjectFormatter /** method to format all floating screen objects at the given anchor frame */ - static bool FormatObjsAtFrm( SwFrm& _rAnchorFrm, - const SwPageFrm& _rPageFrm, + static bool FormatObjsAtFrame( SwFrame& _rAnchorFrame, + const SwPageFrame& _rPageFrame, SwLayAction* _pLayAction = nullptr ); /** method to format a given floating screen object */ static bool FormatObj( SwAnchoredObject& _rAnchoredObj, - SwFrm* _pAnchorFrm = nullptr, - const SwPageFrm* _pPageFrm = nullptr, + SwFrame* _pAnchorFrame = nullptr, + const SwPageFrame* _pPageFrame = nullptr, SwLayAction* _pLayAction = nullptr ); }; diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 3e60e021b581..840c580ff382 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -25,12 +25,12 @@ #include <SidebarWindowsTypes.hxx> -class SwFlyFrm; +class SwFlyFrame; class SwFlyFrameFormat; class SwPageDesc; -class SwContentFrm; +class SwContentFrame; struct SwPosition; -struct SwCrsrMoveState; +struct SwCursorMoveState; class SwAttrSetChg; namespace vcl { class Font; } class SwSortedObjs; @@ -44,9 +44,9 @@ enum SwPageChg }; /// A page of the document layout. -class SwPageFrm: public SwFootnoteBossFrm +class SwPageFrame: public SwFootnoteBossFrame { - friend class SwFrm; + friend class SwFrame; SwSortedObjs *m_pSortedObjs; @@ -103,7 +103,7 @@ class SwPageFrm: public SwFootnoteBossFrm bool bRightSidebar ); virtual void DestroyImpl() override; - virtual ~SwPageFrm(); + virtual ~SwPageFrame(); protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; @@ -114,9 +114,9 @@ protected: size_t GetContentHeight(const long nTop, const long nBottom) const; public: - DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwPageFrame) - SwPageFrm( SwFrameFormat*, SwFrm*, SwPageDesc* ); + SwPageFrame( SwFrameFormat*, SwFrame*, SwPageDesc* ); /// Make this public, so that the SwViewShell can access it when switching from browse mode /// Add/remove header/footer @@ -129,19 +129,19 @@ public: void AppendDrawObjToPage( SwAnchoredObject& _rNewObj ); void RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj ); - void AppendFlyToPage( SwFlyFrm *pNew ); - void RemoveFlyFromPage( SwFlyFrm *pToRemove ); - void MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest ); // Optimized Remove/Append + void AppendFlyToPage( SwFlyFrame *pNew ); + void RemoveFlyFromPage( SwFlyFrame *pToRemove ); + void MoveFly( SwFlyFrame *pToMove, SwPageFrame *pDest ); // Optimized Remove/Append void SetPageDesc( SwPageDesc *, SwFrameFormat * ); SwPageDesc *GetPageDesc() { return m_pDesc; } const SwPageDesc *GetPageDesc() const { return m_pDesc; } SwPageDesc *FindPageDesc(); - SwContentFrm *FindLastBodyContent(); - inline SwContentFrm *FindFirstBodyContent(); - inline const SwContentFrm *FindFirstBodyContent() const; - inline const SwContentFrm *FindLastBodyContent() const; + SwContentFrame *FindLastBodyContent(); + inline SwContentFrame *FindFirstBodyContent(); + inline const SwContentFrame *FindFirstBodyContent() const; + inline const SwContentFrame *FindLastBodyContent() const; SwRect GetBoundRect(OutputDevice* pOutputDevice) const; @@ -160,27 +160,27 @@ public: void PrepareRegisterChg(); // Appends a fly frame - the given one or a new one - at the page frame. - // Needed for <Modify> and <MakeFrms> + // Needed for <Modify> and <MakeFrames> // - return value not needed any more // - second parameter is of type <SwFlyFrameFormat*> // - third parameter only needed for assertion, but calling method assures // this assertion. Thus, delete it. - void PlaceFly( SwFlyFrm* pFly, SwFlyFrameFormat* pFormat ); + void PlaceFly( SwFlyFrame* pFly, SwFlyFrameFormat* pFormat ); - virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = nullptr, bool bTestBackground = false ) const override; + virtual bool GetCursorOfst( SwPosition *, Point&, + SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; /// Get info from Client virtual bool GetInfo( SfxPoolItem& ) const override; virtual void Cut() override; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; virtual void CheckDirection( bool bVert ) override; void CheckGrid( bool bInvalidate ); void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const; bool HasGrid() const { return m_bHasGrid; } void PaintDecorators( ) const; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; virtual void PaintBreak() const override; /// Paint line number etc. @@ -234,7 +234,7 @@ public: bool IsInvalidAutoCompleteWords() const { return m_bInvalidAutoCmplWrds; } bool IsInvalidWordCount() const { return m_bInvalidWordCount; } - /** SwPageFrm::GetDrawBackgrdColor + /** SwPageFrame::GetDrawBackgrdColor determine the color, that is respectively will be drawn as background for the page frame. @@ -324,7 +324,7 @@ public: const SwRect PrtWithoutHeaderAndFooter() const; // in case this is am empty page, this function returns the 'reference' page - const SwPageFrm& GetFormatPage() const; + const SwPageFrame& GetFormatPage() const; /// If in header or footer area, it also indicates the exact area in rControl. /// Header or footer must be active, otherwise returns false. @@ -336,100 +336,100 @@ public: static SwTwips GetSidebarBorderWidth( const SwViewShell* ); }; -inline SwContentFrm *SwPageFrm::FindFirstBodyContent() +inline SwContentFrame *SwPageFrame::FindFirstBodyContent() { - SwLayoutFrm *pBody = FindBodyCont(); + SwLayoutFrame *pBody = FindBodyCont(); return pBody ? pBody->ContainsContent() : nullptr; } -inline const SwContentFrm *SwPageFrm::FindFirstBodyContent() const +inline const SwContentFrame *SwPageFrame::FindFirstBodyContent() const { - const SwLayoutFrm *pBody = FindBodyCont(); + const SwLayoutFrame *pBody = FindBodyCont(); return pBody ? pBody->ContainsContent() : nullptr; } -inline const SwContentFrm *SwPageFrm::FindLastBodyContent() const +inline const SwContentFrame *SwPageFrame::FindLastBodyContent() const { - return const_cast<SwPageFrm*>(this)->FindLastBodyContent(); + return const_cast<SwPageFrame*>(this)->FindLastBodyContent(); } -inline void SwPageFrm::InvalidateFlyLayout() const +inline void SwPageFrame::InvalidateFlyLayout() const { - const_cast<SwPageFrm*>(this)->m_bInvalidFlyLayout = true; + const_cast<SwPageFrame*>(this)->m_bInvalidFlyLayout = true; } -inline void SwPageFrm::InvalidateFlyContent() const +inline void SwPageFrame::InvalidateFlyContent() const { - const_cast<SwPageFrm*>(this)->m_bInvalidFlyContent = true; + const_cast<SwPageFrame*>(this)->m_bInvalidFlyContent = true; } -inline void SwPageFrm::InvalidateFlyInCnt() const +inline void SwPageFrame::InvalidateFlyInCnt() const { - const_cast<SwPageFrm*>(this)->m_bInvalidFlyInCnt = true; + const_cast<SwPageFrame*>(this)->m_bInvalidFlyInCnt = true; } -inline void SwPageFrm::InvalidateLayout() const +inline void SwPageFrame::InvalidateLayout() const { - const_cast<SwPageFrm*>(this)->m_bInvalidLayout = true; + const_cast<SwPageFrame*>(this)->m_bInvalidLayout = true; } -inline void SwPageFrm::InvalidateContent() const +inline void SwPageFrame::InvalidateContent() const { - const_cast<SwPageFrm*>(this)->m_bInvalidContent = true; + const_cast<SwPageFrame*>(this)->m_bInvalidContent = true; } -inline void SwPageFrm::InvalidateSpelling() const +inline void SwPageFrame::InvalidateSpelling() const { - const_cast<SwPageFrm*>(this)->m_bInvalidSpelling = true; + const_cast<SwPageFrame*>(this)->m_bInvalidSpelling = true; } -inline void SwPageFrm::InvalidateSmartTags() const +inline void SwPageFrame::InvalidateSmartTags() const { - const_cast<SwPageFrm*>(this)->m_bInvalidSmartTags = true; + const_cast<SwPageFrame*>(this)->m_bInvalidSmartTags = true; } -inline void SwPageFrm::InvalidateAutoCompleteWords() const +inline void SwPageFrame::InvalidateAutoCompleteWords() const { - const_cast<SwPageFrm*>(this)->m_bInvalidAutoCmplWrds = true; + const_cast<SwPageFrame*>(this)->m_bInvalidAutoCmplWrds = true; } -inline void SwPageFrm::InvalidateWordCount() const +inline void SwPageFrame::InvalidateWordCount() const { - const_cast<SwPageFrm*>(this)->m_bInvalidWordCount = true; + const_cast<SwPageFrame*>(this)->m_bInvalidWordCount = true; } -inline void SwPageFrm::ValidateFlyLayout() const +inline void SwPageFrame::ValidateFlyLayout() const { - const_cast<SwPageFrm*>(this)->m_bInvalidFlyLayout = false; + const_cast<SwPageFrame*>(this)->m_bInvalidFlyLayout = false; } -inline void SwPageFrm::ValidateFlyContent() const +inline void SwPageFrame::ValidateFlyContent() const { - const_cast<SwPageFrm*>(this)->m_bInvalidFlyContent = false; + const_cast<SwPageFrame*>(this)->m_bInvalidFlyContent = false; } -inline void SwPageFrm::ValidateFlyInCnt() const +inline void SwPageFrame::ValidateFlyInCnt() const { - const_cast<SwPageFrm*>(this)->m_bInvalidFlyInCnt = false; + const_cast<SwPageFrame*>(this)->m_bInvalidFlyInCnt = false; } -inline void SwPageFrm::ValidateLayout() const +inline void SwPageFrame::ValidateLayout() const { - const_cast<SwPageFrm*>(this)->m_bInvalidLayout = false; + const_cast<SwPageFrame*>(this)->m_bInvalidLayout = false; } -inline void SwPageFrm::ValidateContent() const +inline void SwPageFrame::ValidateContent() const { - const_cast<SwPageFrm*>(this)->m_bInvalidContent = false; + const_cast<SwPageFrame*>(this)->m_bInvalidContent = false; } -inline void SwPageFrm::ValidateSpelling() const +inline void SwPageFrame::ValidateSpelling() const { - const_cast<SwPageFrm*>(this)->m_bInvalidSpelling = false; + const_cast<SwPageFrame*>(this)->m_bInvalidSpelling = false; } -inline void SwPageFrm::ValidateSmartTags() const +inline void SwPageFrame::ValidateSmartTags() const { - const_cast<SwPageFrm*>(this)->m_bInvalidSmartTags = false; + const_cast<SwPageFrame*>(this)->m_bInvalidSmartTags = false; } -inline void SwPageFrm::ValidateAutoCompleteWords() const +inline void SwPageFrame::ValidateAutoCompleteWords() const { - const_cast<SwPageFrm*>(this)->m_bInvalidAutoCmplWrds = false; + const_cast<SwPageFrame*>(this)->m_bInvalidAutoCmplWrds = false; } -inline void SwPageFrm::ValidateWordCount() const +inline void SwPageFrame::ValidateWordCount() const { - const_cast<SwPageFrm*>(this)->m_bInvalidWordCount = false; + const_cast<SwPageFrame*>(this)->m_bInvalidWordCount = false; } -inline bool SwPageFrm::IsInvalid() const +inline bool SwPageFrame::IsInvalid() const { return (m_bInvalidContent || m_bInvalidLayout || m_bInvalidFlyInCnt); } -inline bool SwPageFrm::IsInvalidFly() const +inline bool SwPageFrame::IsInvalidFly() const { return m_bInvalidFlyLayout || m_bInvalidFlyContent; } @@ -437,7 +437,7 @@ inline bool SwPageFrm::IsInvalidFly() const class SwTextGridItem; -SwTextGridItem const* GetGridItem(SwPageFrm const*const); +SwTextGridItem const* GetGridItem(SwPageFrame const*const); sal_uInt16 GetGridWidth(SwTextGridItem const&, SwDoc const&); diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 6a6ffbddfe28..1bc4a0c6257c 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -49,7 +49,7 @@ bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode ); SW_DLLPUBLIC SwContentNode* GoNextNds( SwNodeIndex * pIdx, bool ); SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool ); -// Funktionsdefinitionen fuer die SwCrsrShell +// Funktionsdefinitionen fuer die SwCursorShell bool GoPrevPara( SwPaM&, SwPosPara); bool GoCurrPara( SwPaM&, SwPosPara); bool GoNextPara( SwPaM&, SwPosPara); diff --git a/sw/source/core/inc/prevwpage.hxx b/sw/source/core/inc/prevwpage.hxx index c426327c51e5..d9c8d1df0fb6 100644 --- a/sw/source/core/inc/prevwpage.hxx +++ b/sw/source/core/inc/prevwpage.hxx @@ -23,13 +23,13 @@ // classes <Point>, <Size> and <Rectangle> #include <tools/gen.hxx> -class SwPageFrm; +class SwPageFrame; /** data structure for a preview page in the current preview layout */ struct PreviewPage { - const SwPageFrm* pPage; + const SwPageFrame* pPage; bool bVisible; Size aPageSize; Point aPreviewWinPos; diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx index 311ed32e1f07..6c578989bfde 100644 --- a/sw/source/core/inc/ptqueue.hxx +++ b/sw/source/core/inc/ptqueue.hxx @@ -23,14 +23,14 @@ * Unfortunately we have some problems with processing more than one Paint() * at a time. This happens especially often during printing. * - * SwRootFrm::Paint() determines that it's called a second time and adds the + * SwRootFrame::Paint() determines that it's called a second time and adds the * rectangle and the corresponding Shell to the PaintCollector. * The call sites that are causing the double Paint() only need to process the * collected Paint()s at the right point in time. * Doing this during printing (after having printed one page) is very suitable * for doing that. * - * Invalidating windows directly from the RootFrm::Paint was not a successful + * Invalidating windows directly from the RootFrame::Paint was not a successful * approach, because the Paint()s arrive at a very unfavourable point in time. * Triggering an update for all windows after printing each page does not seem * appropriate either: on the one hand we don't have direct access to the edit diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 7feb3c6d984f..d30b8b160f81 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -24,13 +24,13 @@ #include <doc.hxx> #include <IDocumentTimerAccess.hxx> -class SwContentFrm; +class SwContentFrame; class SwViewShell; class SdrPage; class SwFrameFormat; class SwPaM; class SwCursor; -class SwShellCrsr; +class SwShellCursor; class SwTableCursor; class SwLayVout; class SwDestroyList; @@ -38,7 +38,7 @@ class SwCurrShells; class SwViewOption; class SwSelectionList; struct SwPosition; -struct SwCrsrMoveState; +struct SwCursorMoveState; #define INV_SIZE 1 #define INV_PRTAREA 2 @@ -51,17 +51,17 @@ struct SwCrsrMoveState; #include <vector> /// The root element of a Writer document layout. -class SwRootFrm: public SwLayoutFrm +class SwRootFrame: public SwLayoutFrame { // Needs to disable the Superfluous temporarily - friend void AdjustSizeChgNotify( SwRootFrm *pRoot ); + friend void AdjustSizeChgNotify( SwRootFrame *pRoot ); - // Maintains the mpLastPage (Cut() and Paste() of SwPageFrm - friend inline void SetLastPage( SwPageFrm* ); + // Maintains the mpLastPage (Cut() and Paste() of SwPageFrame + friend inline void SetLastPage( SwPageFrame* ); // For creating and destroying of the virtual output device manager - friend void _FrmInit(); // Creates s_pVout - friend void _FrmFinit(); // Destroys s_pVout + friend void _FrameInit(); // Creates s_pVout + friend void _FrameFinit(); // Destroys s_pVout std::vector<SwRect> maPageRects;// returns the current rectangle for each page frame // the rectangle is extended to the top/bottom/left/right @@ -96,11 +96,11 @@ class SwRootFrm: public SwLayoutFrm */ long mnBrowseWidth; - /// If we only have to format one ContentFrm, its in mpTurbo - const SwContentFrm *mpTurbo; + /// If we only have to format one ContentFrame, its in mpTurbo + const SwContentFrame *mpTurbo; /// We should not need to always struggle to find the last page, so store it here - SwPageFrm *mpLastPage; + SwPageFrame *mpLastPage; /** [ Comment from the original StarOffice checkin ]: * The root takes care of the shell access. Via the document @@ -126,7 +126,7 @@ class SwRootFrm: public SwLayoutFrm */ friend class CurrShell; friend void SetShell( SwViewShell *pSh ); - friend void InitCurrShells( SwRootFrm *pRoot ); + friend void InitCurrShells( SwRootFrame *pRoot ); SwViewShell *mpCurrShell; SwViewShell *mpWaitingCurrShell; SwCurrShells *mpCurrShells; @@ -142,11 +142,11 @@ class SwRootFrm: public SwLayoutFrm void ImplCalcBrowseWidth(); void ImplInvalidateBrowseWidth(); - void _DeleteEmptySct(); // Destroys the registered SectionFrms - void _RemoveFromList( SwSectionFrm* pSct ); // Removes SectionFrms from the Delete List + void _DeleteEmptySct(); // Destroys the registered SectionFrames + void _RemoveFromList( SwSectionFrame* pSct ); // Removes SectionFrames from the Delete List virtual void DestroyImpl() override; - virtual ~SwRootFrm(); + virtual ~SwRootFrame(); protected: @@ -169,7 +169,7 @@ public: /// Save Clipping if exactly the ClipRect is outputted static bool HasSameRect( const SwRect& rRect ); - SwRootFrm( SwFrameFormat*, SwViewShell* ); + SwRootFrame( SwFrameFormat*, SwViewShell* ); void Init(SwFrameFormat*); SwViewShell *GetCurrShell() const { return mpCurrShell; } @@ -179,7 +179,7 @@ public: * Set up Start-/EndAction for all Shells on a as high as possible * (Shell section) level. * For the StarONE binding, which does not know the Shells directly. - * The ChangeLinkd of the CrsrShell (UI notifications) is called + * The ChangeLinkd of the CursorShell (UI notifications) is called * automatically in the EndAllAction. */ void StartAllAction(); @@ -196,16 +196,16 @@ public: SdrPage* GetDrawPage() { return mpDrawPage; } void SetDrawPage( SdrPage* pNew ){ mpDrawPage = pNew; } - virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = nullptr, bool bTestBackground = false ) const override; + virtual bool GetCursorOfst( SwPosition *, Point&, + SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, SwPrintData const*const pPrintData = nullptr ) const override; - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; #ifdef DBG_UTIL virtual void Cut() override; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; #endif virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const override; @@ -251,7 +251,7 @@ public: * Makes sure that, starting from the passed Page, all page-bound Frames * are on the right Page (pagenumber). */ - static void AssertPageFlys( SwPageFrm * ); + static void AssertPageFlys( SwPageFrame * ); /// Invalidate all Content, Size or PrtArea void InvalidateAllContent( sal_uInt8 nInvalidate ); @@ -289,7 +289,7 @@ public: * bool bExtend: Extend each page to the left/right/top/botton up to the * next page margin */ - const SwPageFrm* GetPageAtPos( const Point& rPt, const Size* pSize = nullptr, bool bExtend = false ) const; + const SwPageFrame* GetPageAtPos( const Point& rPt, const Size* pSize = nullptr, bool bExtend = false ) const; /** * Point rPt: The point to test @@ -300,7 +300,7 @@ public: */ bool IsBetweenPages(const Point& rPt) const; - void CalcFrmRects( SwShellCrsr& ); + void CalcFrameRects( SwShellCursor& ); /** * Calculates the cells included from the current selection @@ -308,25 +308,25 @@ public: * @returns false: There was no result because of an invalid layout * @returns true: Everything worked fine. */ - bool MakeTableCrsrs( SwTableCursor& ); + bool MakeTableCursors( SwTableCursor& ); - void DisallowTurbo() const { const_cast<SwRootFrm*>(this)->mbTurboAllowed = false; } - void ResetTurboFlag() const { const_cast<SwRootFrm*>(this)->mbTurboAllowed = true; } + void DisallowTurbo() const { const_cast<SwRootFrame*>(this)->mbTurboAllowed = false; } + void ResetTurboFlag() const { const_cast<SwRootFrame*>(this)->mbTurboAllowed = true; } bool IsTurboAllowed() const { return mbTurboAllowed; } - void SetTurbo( const SwContentFrm *pContent ) { mpTurbo = pContent; } + void SetTurbo( const SwContentFrame *pContent ) { mpTurbo = pContent; } void ResetTurbo() { mpTurbo = nullptr; } - const SwContentFrm *GetTurbo() { return mpTurbo; } + const SwContentFrame *GetTurbo() { return mpTurbo; } /// Update the footernumbers of all Pages void UpdateFootnoteNums(); // Only for page by page numnbering! /// Remove all footnotes (but no references) - void RemoveFootnotes( SwPageFrm *pPage = nullptr, bool bPageOnly = false, + void RemoveFootnotes( SwPageFrame *pPage = nullptr, bool bPageOnly = false, bool bEndNotes = false ); void CheckFootnotePageDescs( bool bEndNote ); - const SwPageFrm *GetLastPage() const { return mpLastPage; } - SwPageFrm *GetLastPage() { return mpLastPage; } + const SwPageFrame *GetLastPage() const { return mpLastPage; } + SwPageFrame *GetLastPage() { return mpLastPage; } static bool IsInPaint() { return s_isInPaint; } @@ -339,14 +339,14 @@ public: void ResetNewLayout() { mbIsNewLayout = false;} /** - * Empty SwSectionFrms are registered here for deletion and + * Empty SwSectionFrames are registered here for deletion and * destroyed later on or deregistered. */ - void InsertEmptySct( SwSectionFrm* pDel ); + void InsertEmptySct( SwSectionFrame* pDel ); void DeleteEmptySct() { if( mpDestroy ) _DeleteEmptySct(); } - void RemoveFromList( SwSectionFrm* pSct ) { if( mpDestroy ) _RemoveFromList( pSct ); } + void RemoveFromList( SwSectionFrame* pSct ) { if( mpDestroy ) _RemoveFromList( pSct ); } #ifdef DBG_UTIL - bool IsInDelList( SwSectionFrm* pSct ) const; + bool IsInDelList( SwSectionFrame* pSct ) const; #endif void SetCallbackActionEnabled( bool b ) { mbCallbackActionEnabled = b; } @@ -368,7 +368,7 @@ public: * * @return pointer to the page frame with the given physical page number */ - SwPageFrm* GetPageByPageNum( sal_uInt16 _nPageNum ) const; + SwPageFrame* GetPageByPageNum( sal_uInt16 _nPageNum ) const; void CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVisArea ); bool IsLeftToRightViewLayout() const; @@ -379,22 +379,22 @@ public: void FreezeLayout( bool freeze ) { mbLayoutFreezed = freeze; } }; -inline long SwRootFrm::GetBrowseWidth() const +inline long SwRootFrame::GetBrowseWidth() const { if ( !mbBrowseWidthValid ) - const_cast<SwRootFrm*>(this)->ImplCalcBrowseWidth(); + const_cast<SwRootFrame*>(this)->ImplCalcBrowseWidth(); return mnBrowseWidth; } -inline void SwRootFrm::InvalidateBrowseWidth() +inline void SwRootFrame::InvalidateBrowseWidth() { if ( mbBrowseWidthValid ) ImplInvalidateBrowseWidth(); } -inline void SwRootFrm::SetVirtPageNum( const bool bOf) const +inline void SwRootFrame::SetVirtPageNum( const bool bOf) const { - const_cast<SwRootFrm*>(this)->mbIsVirtPageNum = bOf; + const_cast<SwRootFrame*>(this)->mbIsVirtPageNum = bOf; } #endif // INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index fdbfebfa0f7d..da689b48f0df 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -26,16 +26,16 @@ class SwTableLine; class SwBorderAttrs; -/// SwRowFrm is one table row in the document layout. -class SwRowFrm: public SwLayoutFrm +/// SwRowFrame is one table row in the document layout. +class SwRowFrame: public SwLayoutFrame { virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; /// Only change the Frame size, not the PrtArea SSize - virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) override; - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; const SwTableLine * m_pTabLine; - SwRowFrm * m_pFollowRow; + SwRowFrame * m_pFollowRow; // #i29550# sal_uInt16 mnTopMarginForLowers; sal_uInt16 mnBottomMarginForLowers; @@ -46,14 +46,14 @@ class SwRowFrm: public SwLayoutFrm bool m_bIsRowSpanLine; virtual void DestroyImpl() override; - virtual ~SwRowFrm(); + virtual ~SwRowFrame(); protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: - SwRowFrm( const SwTableLine &, SwFrm*, bool bInsertContent = true ); + SwRowFrame( const SwTableLine &, SwFrame*, bool bInsertContent = true ); virtual void Cut() override; @@ -63,7 +63,7 @@ public: * been created; the same holds true for the Page at which the Flys * are to be registered at. */ - void RegistFlys( SwPageFrm *pPage = nullptr ); + void RegistFlys( SwPageFrame *pPage = nullptr ); const SwTableLine *GetTabLine() const { return m_pTabLine; } @@ -73,8 +73,8 @@ public: */ void AdjustCells( const SwTwips nHeight, const bool bHeight ); - SwRowFrm* GetFollowRow() const { return m_pFollowRow; } - void SetFollowRow( SwRowFrm* pNew ) { m_pFollowRow = pNew; } + SwRowFrame* GetFollowRow() const { return m_pFollowRow; } + void SetFollowRow( SwRowFrame* pNew ) { m_pFollowRow = pNew; } // #i29550# sal_uInt16 GetTopMarginForLowers() const { return mnTopMarginForLowers; } @@ -101,7 +101,7 @@ public: bool IsRowSpanLine() const { return m_bIsRowSpanLine; } void SetRowSpanLine( bool bNew ) { m_bIsRowSpanLine = bNew; } - DECL_FIXEDMEMPOOL_NEWDEL(SwRowFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwRowFrame) }; #endif diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index b5ddcd9480d4..395f18ceb16f 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -27,14 +27,14 @@ class SwSection; class SwSectionFormat; class SwAttrSetChg; -class SwFootnoteContFrm; +class SwFootnoteContFrame; class SwLayouter; #define FINDMODE_ENDNOTE 1 #define FINDMODE_LASTCNT 2 #define FINDMODE_MYLAST 4 -class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm +class SwSectionFrame: public SwLayoutFrame, public SwFlowFrame { SwSection* m_pSection; bool m_bFootnoteAtEnd; // footnotes at the end of section @@ -55,33 +55,33 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm bool IsEndnoteAtMyEnd() const; virtual void DestroyImpl() override; - virtual ~SwSectionFrm(); + virtual ~SwSectionFrame(); protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) override; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool bHead, bool &rReformat ) override; virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; virtual void SwClientNotify( const SwModify&, const SfxHint& ) override; public: - SwSectionFrm( SwSection &, SwFrm* ); // Content is not created! - SwSectionFrm( SwSectionFrm &, bool bMaster ); // _ONLY_ for creating Master/Follows! + SwSectionFrame( SwSection &, SwFrame* ); // Content is not created! + SwSectionFrame( SwSectionFrame &, bool bMaster ); // _ONLY_ for creating Master/Follows! void Init(); virtual void CheckDirection( bool bVert ) override; - virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const override; + virtual void PaintSubsidiaryLines( const SwPageFrame*, const SwRect& ) const override; virtual void Cut() override; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; - inline const SwSectionFrm *GetFollow() const; - inline SwSectionFrm *GetFollow(); - SwSectionFrm* FindMaster() const; + inline const SwSectionFrame *GetFollow() const; + inline SwSectionFrame *GetFollow(); + SwSectionFrame* FindMaster() const; - SwContentFrm *FindLastContent( sal_uInt8 nMode = 0 ); - inline const SwContentFrm *FindLastContent( sal_uInt8 nMode = 0 ) const; + SwContentFrame *FindLastContent( sal_uInt8 nMode = 0 ); + inline const SwContentFrame *FindLastContent( sal_uInt8 nMode = 0 ) const; inline SwSection* GetSection() { return m_pSection; } inline const SwSection* GetSection() const { return m_pSection; } inline void ColLock() { mbColLocked = true; } @@ -90,16 +90,16 @@ public: void CalcFootnoteContent(); void SimpleFormat(); bool IsDescendantFrom( const SwSectionFormat* pSect ) const; - bool HasToBreak( const SwFrm* pFrm ) const; - void MergeNext( SwSectionFrm* pNxt ); + bool HasToBreak( const SwFrame* pFrame ) const; + void MergeNext( SwSectionFrame* pNxt ); /** - * Splits the SectionFrm surrounding the pFrm up in two parts: - * pFrm and the start of the 2nd part + * Splits the SectionFrame surrounding the pFrame up in two parts: + * pFrame and the start of the 2nd part */ - bool SplitSect( SwFrm* pFrm, bool bApres ); + bool SplitSect( SwFrame* pFrame, bool bApres ); void DelEmpty( bool bRemove ); // Like Cut(), except for that Follow chaining is maintained - SwFootnoteContFrm* ContainsFootnoteCont( const SwFootnoteContFrm* pCont = nullptr ) const; + SwFootnoteContFrame* ContainsFootnoteCont( const SwFootnoteContFrame* pCont = nullptr ) const; bool Growable() const; SwTwips _Shrink( SwTwips, bool bTst ); SwTwips _Grow ( SwTwips, bool bTst ); @@ -112,18 +112,18 @@ public: bool ToMaximize( bool bCheckFollow ) const; inline bool _ToMaximize() const { if( !m_pSection ) return false; return ToMaximize( false ); } - bool MoveAllowed( const SwFrm* ) const; + bool MoveAllowed( const SwFrame* ) const; bool CalcMinDiff( SwTwips& rMinDiff ) const; /** * Returns the size delta that the section would like to be - * greater if it has undersized TextFrms in it. + * greater if it has undersized TextFrames in it. * * If we don't pass a @param bOverSize or false, the return value * is > 0 for undersized Frames, or 0 otherwise. * If @param bOverSize == true, we can also get a negative return value, - * if the SectionFrm is not completely filled, which happens often for - * e.g. SectionFrms with Follows. + * if the SectionFrame is not completely filled, which happens often for + * e.g. SectionFrames with Follows. * * If necessary the undersized-flag is corrected. * We need this in the FormatWidthCols to "deflate" columns there. @@ -139,7 +139,7 @@ public: const SwSectionFormat* GetEndSectFormat() const { if( IsEndnAtEnd() ) return _GetEndSectFormat(); return nullptr; } - static void MoveContentAndDelete( SwSectionFrm* pDel, bool bSave ); + static void MoveContentAndDelete( SwSectionFrame* pDel, bool bSave ); bool IsBalancedSection() const; @@ -157,22 +157,22 @@ public: void SetFootnoteLock( bool bNew ) { m_bFootnoteLock = bNew; } bool IsFootnoteLock() const { return m_bFootnoteLock; } - DECL_FIXEDMEMPOOL_NEWDEL(SwSectionFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwSectionFrame) }; -class SwDestroyList : public std::set<SwSectionFrm*> {}; +class SwDestroyList : public std::set<SwSectionFrame*> {}; -inline const SwSectionFrm *SwSectionFrm::GetFollow() const +inline const SwSectionFrame *SwSectionFrame::GetFollow() const { - return static_cast<const SwSectionFrm*>(SwFlowFrm::GetFollow()); + return static_cast<const SwSectionFrame*>(SwFlowFrame::GetFollow()); } -inline SwSectionFrm *SwSectionFrm::GetFollow() +inline SwSectionFrame *SwSectionFrame::GetFollow() { - return static_cast<SwSectionFrm*>(SwFlowFrm::GetFollow()); + return static_cast<SwSectionFrame*>(SwFlowFrame::GetFollow()); } -inline const SwContentFrm *SwSectionFrm::FindLastContent( sal_uInt8 nMode ) const +inline const SwContentFrame *SwSectionFrame::FindLastContent( sal_uInt8 nMode ) const { - return const_cast<SwSectionFrm*>(this)->FindLastContent( nMode ); + return const_cast<SwSectionFrame*>(this)->FindLastContent( nMode ); } #endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index e290153f8c58..1df9c22ba665 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -79,8 +79,8 @@ class SwSubFont : public SvxFont void DrawStretchCapital( SwDrawTextInfo &rInf ); void DoOnCapitals( SwDoCapitals &rDo ); void _DrawStretchText( SwDrawTextInfo &rInf ); - sal_Int32 _GetCrsrOfst( SwDrawTextInfo& rInf ); - sal_Int32 GetCapitalCrsrOfst( SwDrawTextInfo& rInf ); + sal_Int32 _GetCursorOfst( SwDrawTextInfo& rInf ); + sal_Int32 GetCapitalCursorOfst( SwDrawTextInfo& rInf ); inline void SetColor( const Color& rColor ); inline void SetFillColor( const Color& rColor ); @@ -311,8 +311,8 @@ public: sal_Int32 GetTextBreak( SwDrawTextInfo& rInf, long nTextWidth ); - sal_Int32 _GetCrsrOfst( SwDrawTextInfo& rInf ) - { return m_aSub[m_nActual]._GetCrsrOfst( rInf ); } + sal_Int32 _GetCursorOfst( SwDrawTextInfo& rInf ) + { return m_aSub[m_nActual]._GetCursorOfst( rInf ); } inline void _DrawText( SwDrawTextInfo &rInf ) { m_aSub[m_nActual]._DrawText( rInf, IsGreyWave() ); } diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx index 01bbfef5575a..53350dd6485a 100644 --- a/sw/source/core/inc/swselectionlist.hxx +++ b/sw/source/core/inc/swselectionlist.hxx @@ -22,7 +22,7 @@ #include <list> class SwPaM; -class SwFrm; +class SwFrame; /** This class is used as parameter for creation of a block cursor selection @@ -40,15 +40,15 @@ class SwFrm; class SwSelectionList { std::list< SwPaM* > aList; // container for the selected text portions - const SwFrm* pContext; // the context of these text portions + const SwFrame* pContext; // the context of these text portions public: /** Ctor to create an empty list for a given context @param pInitCxt - The frame (normally a SwTextFrm) where the block cursor selection starts, + The frame (normally a SwTextFrame) where the block cursor selection starts, it will be used to get the allowed context for the text selections. */ - explicit SwSelectionList( const SwFrm* pInitCxt ); + explicit SwSelectionList( const SwFrame* pInitCxt ); /** Start of the container for the selected text portions */ @@ -83,7 +83,7 @@ public: @return true, if the context of the frame is equal to the one of the list */ - bool checkContext( const SwFrm* pCheck ); + bool checkContext( const SwFrame* pCheck ); }; #endif // INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index a9f025983a21..0422e8f62b22 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -27,13 +27,13 @@ class SwTable; class SwBorderAttrs; class SwAttrSetChg; -/// SwTabFrm is one table in the document layout, containing rows (which contain cells). -class SwTabFrm: public SwLayoutFrm, public SwFlowFrm +/// SwTabFrame is one table in the document layout, containing rows (which contain cells). +class SwTabFrame: public SwLayoutFrame, public SwFlowFrame { - friend void CalcContent( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow ); + friend void CalcContent( SwLayoutFrame *pLay, bool bNoColl, bool bNoCalcFollow ); // does the special treatment for _Get[Next|Prev]Leaf() - using SwFrm::GetLeaf; + using SwFrame::GetLeaf; SwTable * m_pTable; @@ -46,7 +46,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm bool m_bLockBackMove :1; /// The Master took care of the BackMove test bool m_bResizeHTMLTable :1; /// Call the Resize of the HTMLTableLayout in the MakeAll /// This is an optimization, so that we don't have to call - /// it in ContentFrm::Grow; there it might be called for + /// it in ContentFrame::Grow; there it might be called for /// _every_ Cell bool m_bONECalcLowers :1; /// Primarily for the StarONE SS @@ -62,7 +62,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm // want any notification to the master table bool m_bRestrictTableGrowth :1; // Usually, the table may grow infinitely, - // as the table can be split in SwTabFrm::MakeAll + // as the table can be split in SwTabFrame::MakeAll // In MakeAll, this flag is set to indicate that // the table may only grow inside its upper. This // is necessary, in order to let the text flow into @@ -86,7 +86,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm bool m_bInRecalcLowerRow : 1; /** - * Split() splits the Frm at the specified position: a Follow is + * Split() splits the Frame at the specified position: a Follow is * created and constructed and inserted directly after this. * Join() gets the Follow's content and destroys it. */ @@ -99,30 +99,30 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); - virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) override; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool bHead, bool &rReformat ) override; virtual void DestroyImpl() override; - virtual ~SwTabFrm(); + virtual ~SwTabFrame(); protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = nullptr ) override; virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; // only changes the Framesize, not the PrtArea size - virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) override; + virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; public: - SwTabFrm( SwTable &, SwFrm* ); // calling Regist Flys always after creation _and_pasting! - SwTabFrm( SwTabFrm & ); // _only_ for the creation of follows + SwTabFrame( SwTable &, SwFrame* ); // calling Regist Flys always after creation _and_pasting! + SwTabFrame( SwTabFrame & ); // _only_ for the creation of follows - void JoinAndDelFollows(); // for DelFrms of the TableNodes! + void JoinAndDelFollows(); // for DelFrames of the TableNodes! // calls thr RegistFlys of the rows void RegistFlys(); - inline const SwTabFrm *GetFollow() const; - inline SwTabFrm *GetFollow(); - SwTabFrm* FindMaster( bool bFirstMaster = false ) const; + inline const SwTabFrame *GetFollow() const; + inline SwTabFrame *GetFollow(); + SwTabFrame* FindMaster( bool bFirstMaster = false ) const; virtual bool GetInfo( SfxPoolItem &rHint ) const override; virtual void Paint( vcl::RenderContext& rRenderContext, SwRect const&, @@ -130,13 +130,13 @@ public: virtual void CheckDirection( bool bVert ) override; virtual void Cut() override; - virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override; + virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; virtual bool Prepare( const PrepareHint ePrep = PREP_CLEAR, const void *pVoid = nullptr, bool bNotify = true ) override; - SwContentFrm *FindLastContent(); - inline const SwContentFrm *FindLastContent() const; + SwContentFrame *FindLastContent(); + inline const SwContentFrame *FindLastContent() const; const SwTable *GetTable() const { return m_pTable; } SwTable *GetTable() { return m_pTable; } @@ -156,8 +156,8 @@ public: bool HasFollowFlowLine() const { return m_bHasFollowFlowLine; } void SetFollowFlowLine(bool bNew) { m_bHasFollowFlowLine = bNew; } - //return the SwTabFrm (if any) that this SwTabFrm is a follow flow line for - SwTabFrm* GetFollowFlowLineFor(); + //return the SwTabFrame (if any) that this SwTabFrame is a follow flow line for + SwTabFrame* GetFollowFlowLineFor(); bool IsRebuildLastLine() const { return m_bIsRebuildLastLine; } void SetRebuildLastLine(bool bNew) { m_bIsRebuildLastLine = bNew; } @@ -208,8 +208,8 @@ public: SwTwips CalcHeightOfFirstContentLine() const; - bool IsInHeadline( const SwFrm& rFrm ) const; - SwRowFrm* GetFirstNonHeadlineRow() const; + bool IsInHeadline( const SwFrame& rFrame ) const; + SwRowFrame* GetFirstNonHeadlineRow() const; bool IsLayoutSplitAllowed() const; @@ -220,21 +220,21 @@ public: virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; - DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrame) }; -inline const SwContentFrm *SwTabFrm::FindLastContent() const +inline const SwContentFrame *SwTabFrame::FindLastContent() const { - return const_cast<SwTabFrm*>(this)->FindLastContent(); + return const_cast<SwTabFrame*>(this)->FindLastContent(); } -inline const SwTabFrm *SwTabFrm::GetFollow() const +inline const SwTabFrame *SwTabFrame::GetFollow() const { - return static_cast<const SwTabFrm*>(SwFlowFrm::GetFollow()); + return static_cast<const SwTabFrame*>(SwFlowFrame::GetFollow()); } -inline SwTabFrm *SwTabFrm::GetFollow() +inline SwTabFrame *SwTabFrame::GetFollow() { - return static_cast<SwTabFrm*>(SwFlowFrm::GetFollow()); + return static_cast<SwTabFrame*>(SwFlowFrame::GetFollow()); } #endif // INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 7a00950477de..31f16b0ad30f 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -38,7 +38,7 @@ class SwHistory; class SwContentNode; class SfxPoolItem; class SwShareBoxFormats; -class SwFormatFrmSize; +class SwFormatFrameSize; struct _CpyPara; struct _InsULPara; @@ -190,7 +190,7 @@ public: void AddFormat( const SwFrameFormat& rOld, SwFrameFormat& rNew ); - void SetSize( SwTableBox& rBox, const SwFormatFrmSize& rSz ); + void SetSize( SwTableBox& rBox, const SwFormatFrameSize& rSz ); void SetAttr( SwTableBox& rBox, const SfxPoolItem& rItem ); void SetAttr( SwTableLine& rLine, const SfxPoolItem& rItem ); diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index e332af4c4b9c..6521e94e8a34 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -20,9 +20,9 @@ #define INCLUDED_SW_SOURCE_CORE_INC_TOCNTNTANCHOREDOBJECTPOSITION_HXX #include <anchoredobjectposition.hxx> -class SwFrm; -class SwTextFrm; -class SwLayoutFrm; +class SwFrame; +class SwTextFrame; +class SwLayoutFrame; class SwRect; namespace objectpositioning @@ -31,27 +31,27 @@ namespace objectpositioning { private: // calculated data for object position - const SwLayoutFrm* mpVertPosOrientFrm; + const SwLayoutFrame* mpVertPosOrientFrame; // #i26791# // determine offset to frame anchor position according to the // positioning alignments - Point maOffsetToFrmAnchorPos; + Point maOffsetToFrameAnchorPos; // data for calculation of position bool mbAnchorToChar; - const SwFrm* mpToCharOrientFrm; + const SwFrame* mpToCharOrientFrame; const SwRect* mpToCharRect; SwTwips mnToCharTopOfLine; virtual bool IsAnchoredToChar() const override; - virtual const SwFrm* ToCharOrientFrm() const override; + virtual const SwFrame* ToCharOrientFrame() const override; virtual const SwRect* ToCharRect() const override; // #i22341# virtual SwTwips ToCharTopOfLine() const override; - // method to cast <SwAnchoredObjectPosition::GetAnchorFrm()> to + // method to cast <SwAnchoredObjectPosition::GetAnchorFrame()> to // the needed type - SwTextFrm& GetAnchorTextFrm() const; + SwTextFrame& GetAnchorTextFrame() const; /** determine frame for horizontal position @@ -62,13 +62,13 @@ namespace objectpositioning for the first, that the anchor or a follow of the anchor. If none is found, the proposed frame is returned. - @param _pProposedFrm + @param _pProposedFrame input parameter - proposed frame for horizontal position - @return constant reference to <SwFrm> object, at which the + @return constant reference to <SwFrame> object, at which the horizontal position is determined. */ - const SwFrm& _GetHoriVirtualAnchor( const SwLayoutFrm& _pProposedFrm ) const; + const SwFrame& _GetHoriVirtualAnchor( const SwLayoutFrame& _pProposedFrame ) const; public: SwToContentAnchoredObjectPosition( SdrObject& _rDrawObj ); @@ -80,7 +80,7 @@ namespace objectpositioning /** frame, at which the vertical position is oriented at */ - const SwLayoutFrm& GetVertPosOrientFrm() const { return *mpVertPosOrientFrm;} + const SwLayoutFrame& GetVertPosOrientFrame() const { return *mpVertPosOrientFrame;} }; } // namespace objectpositioning diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index debc00fb6e79..0ad7b00569a0 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -33,7 +33,7 @@ namespace objectpositioning // #i26791# // determine offset to frame anchor position according to the // positioning alignments - Point maOffsetToFrmAnchorPos; + Point maOffsetToFrameAnchorPos; public: SwToLayoutAnchoredObjectPosition( SdrObject& _rDrawObj ); diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx index bdb26e4bb778..6702f8f62eaf 100644 --- a/sw/source/core/inc/txtfly.hxx +++ b/sw/source/core/inc/txtfly.hxx @@ -25,15 +25,15 @@ #include <vector> class OutputDevice; -class SwContentFrm; -class SwPageFrm; +class SwContentFrame; +class SwPageFrame; class SwTextFly; class SdrObject; class SwTextPaintInfo; class SwFormat; class TextRanger; class SwAnchoredObject; -class SwTextFrm; +class SwTextFrame; class SwDrawTextInfo; class SwContourCache; @@ -60,7 +60,7 @@ class SwContourCache long nPntCnt; sal_uInt16 nObjCnt; const SwRect ContourRect( const SwFormat* pFormat, const SdrObject* pObj, - const SwTextFrm* pFrm, const SwRect &rLine, const long nXPos, + const SwTextFrame* pFrame, const SwRect &rLine, const long nXPos, const bool bRight ); public: @@ -79,7 +79,7 @@ public: */ static const SwRect CalcBoundRect( const SwAnchoredObject* pAnchoredObj, const SwRect &rLine, - const SwTextFrm* pFrm, + const SwTextFrame* pFrame, const long nXPos, const bool bRight ); }; @@ -118,10 +118,10 @@ public: */ class SwTextFly { - const SwPageFrm * pPage; + const SwPageFrame * pPage; const SwAnchoredObject * mpCurrAnchoredObj; - const SwTextFrm * pCurrFrm; - const SwContentFrm * pMaster; + const SwTextFrame * pCurrFrame; + const SwContentFrame * pMaster; SwAnchoredObjList * mpAnchoredObjList; long nMinBottom; @@ -146,7 +146,7 @@ class SwTextFly \param[in] rPortion Scope: document global. */ - SwRect _GetFrm( const SwRect &rPortion, bool bTop ) const; + SwRect _GetFrame( const SwRect &rPortion, bool bTop ) const; SwAnchoredObjList* InitAnchoredObjList(); @@ -184,7 +184,7 @@ class SwTextFly /** The left margin is the left margin of the current PrintArea or - it is determined by the last FlyFrm, which stands on the line. + it is determined by the last FlyFrame, which stands on the line. */ void CalcLeftMargin( SwRect &rFly, SwAnchoredObjList::size_type nPos, @@ -201,20 +201,20 @@ class SwTextFly SwTwips CalcMinBottom() const; - const SwContentFrm* _GetMaster(); + const SwContentFrame* _GetMaster(); public: SwTextFly(); - SwTextFly( const SwTextFrm *pFrm ); + SwTextFly( const SwTextFrame *pFrame ); SwTextFly( const SwTextFly& rTextFly ); ~SwTextFly(); - void CtorInitTextFly( const SwTextFrm *pFrm ); + void CtorInitTextFly( const SwTextFrame *pFrame ); void SetTopRule(); - SwRect GetFrm( const SwRect &rPortion, bool bTop = true ) const; + SwRect GetFrame( const SwRect &rPortion, bool bTop = true ) const; bool IsOn() const; /** @@ -227,7 +227,7 @@ public: bool Relax(); SwTwips GetMinBottom() const; - const SwContentFrm* GetMaster() const; + const SwContentFrame* GetMaster() const; // This temporary variable needs to be manipulated in const methods long GetNextTop() const; @@ -250,7 +250,7 @@ public: Ensures that the overlapping frames (except the transparent frames) won't be scribbled by setting clip regions so that only the portions that are not - in the area of FlyFrms that are opaque and above the current frame will + in the area of FlyFrames that are opaque and above the current frame will be output. DrawText() takes over the on optimization! @@ -274,13 +274,13 @@ public: \param[in] the line area \return whether the line will be overlapped by a frame */ - bool IsAnyFrm( const SwRect &rLine ) const; + bool IsAnyFrame( const SwRect &rLine ) const; /** - Same as IsAnyFrm(const SwRect&), but uses the current frame print + Same as IsAnyFrame(const SwRect&), but uses the current frame print area */ - bool IsAnyFrm() const; + bool IsAnyFrame() const; /** true when a frame or DrawObj must to be taken in account. The optimizations @@ -320,7 +320,7 @@ inline bool SwTextFly::Relax( const SwRect &rRect ) { if (bOn) { - bOn = IsAnyFrm( rRect ); + bOn = IsAnyFrame( rRect ); } return bOn; } @@ -329,7 +329,7 @@ inline bool SwTextFly::Relax() { if (bOn) { - bOn = IsAnyFrm(); + bOn = IsAnyFrame(); } return bOn; } @@ -339,7 +339,7 @@ inline SwTwips SwTextFly::GetMinBottom() const return mpAnchoredObjList ? nMinBottom : CalcMinBottom(); } -inline const SwContentFrm* SwTextFly::GetMaster() const +inline const SwContentFrame* SwTextFly::GetMaster() const { return pMaster ? pMaster : const_cast<SwTextFly*>(this)->_GetMaster(); } @@ -354,9 +354,9 @@ inline void SwTextFly::SetNextTop( long nNew ) const const_cast<SwTextFly*>(this)->nNextTop = nNew; } -inline SwRect SwTextFly::GetFrm( const SwRect &rRect, bool bTop ) const +inline SwRect SwTextFly::GetFrame( const SwRect &rRect, bool bTop ) const { - return bOn ? _GetFrm( rRect, bTop ) : SwRect(); + return bOn ? _GetFrame( rRect, bTop ) : SwRect(); } inline void SwTextFly::SetIgnoreCurrentFrame( bool bNew ) diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index b20d2d3d18ba..d662ac83717b 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -30,7 +30,7 @@ class SwTextFormatter; class SwTextFormatInfo; class SwParaPortion; class WidowsAndOrphans; -class SwBodyFrm; +class SwBodyFrame; class SwTextFootnote; class SwInterHyphInfo; // Hyphenate() class SwCache; @@ -38,7 +38,7 @@ class SwBorderAttrs; class SwFrameFormat; class OutputDevice; class SwTestFormat; -struct SwCrsrMoveState; +struct SwCursorMoveState; struct SwFillData; class SwPortionHandler; class SwScriptInfo; @@ -48,13 +48,13 @@ class SwWrongList; #define NON_PRINTING_CHARACTER_COLOR RGB_COLORDATA(0x26, 0x8b, 0xd2) /// Represents the visualization of a paragraph. -class SwTextFrm: public SwContentFrm +class SwTextFrame: public SwContentFrame { friend class SwTextIter; friend class SwTestFormat; friend class WidowsAndOrphans; - friend class TextFrmLockGuard; // May Lock()/Unlock() - friend bool sw_ChangeOffset( SwTextFrm* pFrm, sal_Int32 nNew ); + friend class TextFrameLockGuard; // May Lock()/Unlock() + friend bool sw_ChangeOffset( SwTextFrame* pFrame, sal_Int32 nNew ); static SwCache *pTextCache; // Pointer to the Line Cache static long nMinPrtLine; // This Line must not be underrun when printing @@ -64,7 +64,7 @@ class SwTextFrm: public SwContentFrm sal_uLong mnThisLines :8; // Count of Lines of the Frame // The x position for flys anchored at this paragraph. - // These values are calculated in SwTextFrm::CalcBaseOfstForFly() + // These values are calculated in SwTextFrame::CalcBaseOfstForFly() SwTwips mnFlyAnchorOfst; // The x position for wrap-through flys anchored at this paragraph. SwTwips mnFlyAnchorOfstNoWrap; @@ -90,7 +90,7 @@ class SwTextFrm: public SwContentFrm void CalcLineSpace(); // Only called in Format - void AdjustFrm( const SwTwips nChgHeight, bool bHasToFit = false ); + void AdjustFrame( const SwTwips nChgHeight, bool bHasToFit = false ); // Evaluates the Preps in Format() bool CalcPreps(); @@ -98,8 +98,8 @@ class SwTextFrm: public SwContentFrm void _InvalidateRange( const SwCharRange &, const long = 0); inline void InvalidateRange( const SwCharRange &, const long = 0); - // WidowsAndOrphans, AdjustFrm, AdjustFollow - void FormatAdjust( SwTextFormatter &rLine, WidowsAndOrphans &rFrmBreak, + // WidowsAndOrphans, AdjustFrame, AdjustFollow + void FormatAdjust( SwTextFormatter &rLine, WidowsAndOrphans &rFrameBreak, const sal_Int32 nStrLen, const bool bDummy ); bool mbLocked : 1; // In the Format? @@ -108,7 +108,7 @@ class SwTextFrm: public SwContentFrm bool mbEmpty : 1; // Are we an empty paragraph? bool mbInFootnoteConnect : 1; // Is in Connect at the moment bool mbFootnote : 1; // Has at least one footnote - bool mbRepaint : 1; // TextFrm: Repaint is ready to be fetched + bool mbRepaint : 1; // TextFrame: Repaint is ready to be fetched bool mbHasBlinkPortions : 1; // Contains Blink Portions bool mbFieldFollow : 1; // Start with Field rest of the Master bool mbHasAnimation : 1; // Contains animated SwGrfNumPortion @@ -116,7 +116,7 @@ class SwTextFrm: public SwContentFrm // width and height for vertical formatting // OD 14.03.2003 #i11760# - flag to control, if follow is formatted in // method <CalcFollow(..)>. - // E.g., avoid formatting of follow, if method <SwLayoutFrm::FormatWidthCols(..)> + // E.g., avoid formatting of follow, if method <SwLayoutFrame::FormatWidthCols(..)> // is running. bool mbFollowFormatAllowed : 1; @@ -131,9 +131,9 @@ class SwTextFrm: public SwContentFrm bool IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) const; // Changes the Frame or not (cf. FlyCnt) - bool _GetCrsrOfst(SwPosition *pPos, const Point &rPoint, - const bool bChgFrm, SwCrsrMoveState* = nullptr ) const; - void FillCrsrPos( SwFillData &rFill ) const; + bool _GetCursorOfst(SwPosition *pPos, const Point &rPoint, + const bool bChgFrame, SwCursorMoveState* = nullptr ) const; + void FillCursorPos( SwFillData &rFill ) const; // Format exactly one Line bool FormatLine( SwTextFormatter &rLine, const bool bPrev ); @@ -153,20 +153,20 @@ class SwTextFrm: public SwContentFrm const sal_Int32 nEnd); // inline branch - SwTwips _GetFootnoteFrmHeight() const; + SwTwips _GetFootnoteFrameHeight() const; // Outsourced to CalcPreps bool CalcPrepFootnoteAdjust(); // For Footnote and WidOrp: Forced validation - void ValidateFrm(); - void ValidateBodyFrm(); + void ValidateFrame(); + void ValidateBodyFrame(); bool _GetDropRect( SwRect &rRect ) const; void SetPara( SwParaPortion *pNew, bool bDelete = true ); - bool _IsFootnoteNumFrm() const; + bool _IsFootnoteNumFrame() const; // Refresh formatting information bool FormatQuick( bool bForceQuickFormat ); @@ -197,7 +197,7 @@ class SwTextFrm: public SwContentFrm void _CalcHeightOfLastLine( const bool _bUseFont = false ); virtual void DestroyImpl() override; - virtual ~SwTextFrm(); + virtual ~SwTextFrame(); protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; @@ -224,11 +224,11 @@ public: /** * Returns the screen position of rPos. The values are relative to the upper * left position of the page frame. - * Additional information can be obtained by passing an SwCrsrMoveState object. + * Additional information can be obtained by passing an SwCursorMoveState object. * Returns false if rPos > number of character is string */ virtual bool GetCharRect( SwRect& rRect, const SwPosition& rPos, - SwCrsrMoveState* pCMS = nullptr ) const override; + SwCursorMoveState* pCMS = nullptr ) const override; /// A slimmer version of GetCharRect for autopositioning Frames bool GetAutoPos( SwRect &, const SwPosition& ) const; @@ -266,15 +266,15 @@ public: * @returns false if the SPoint is outside of the SSize else * returns true */ - virtual bool GetCrsrOfst( SwPosition *, Point&, - SwCrsrMoveState* = nullptr, bool bTestBackground = false ) const override; + virtual bool GetCursorOfst( SwPosition *, Point&, + SwCursorMoveState* = nullptr, bool bTestBackground = false ) const override; /** * Makes sure that the Frame is not switched (e.g. switched for a * character-bound Frame) */ - inline bool GetKeyCrsrOfst(SwPosition *pPos, const Point &rPoint ) const - { return _GetCrsrOfst( pPos, rPoint, false ); } + inline bool GetKeyCursorOfst(SwPosition *pPos, const Point &rPoint ) const + { return _GetCursorOfst( pPos, rPoint, false ); } void PaintExtraData( const SwRect & rRect ) const; /// Page number etc. SwRect Paint(); @@ -303,19 +303,19 @@ public: * Prepares the cursor position for a visual cursor move (BiDi). * The behaviour is different for insert and overwrite cursors */ - void PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCrsrLevel, - bool& bRight, bool bInsertCrsr ); + void PrepareVisualMove( sal_Int32& nPos, sal_uInt8& nCursorLevel, + bool& bRight, bool bInsertCursor ); /// Methods to manage the FollowFrame - SwContentFrm *SplitFrm( const sal_Int32 nTextPos ); - SwContentFrm *JoinFrm(); + SwContentFrame *SplitFrame( const sal_Int32 nTextPos ); + SwContentFrame *JoinFrame(); inline sal_Int32 GetOfst() const { return mnOffset; } void _SetOfst( const sal_Int32 nNewOfst ); inline void SetOfst ( const sal_Int32 nNewOfst ); inline void ManipOfst ( const sal_Int32 nNewOfst ){ mnOffset = nNewOfst; } - SwTextFrm *GetFrmAtPos ( const SwPosition &rPos); - inline const SwTextFrm *GetFrmAtPos ( const SwPosition &rPos) const; - SwTextFrm& GetFrmAtOfst( const sal_Int32 nOfst ); + SwTextFrame *GetFrameAtPos ( const SwPosition &rPos); + inline const SwTextFrame *GetFrameAtPos ( const SwPosition &rPos) const; + SwTextFrame& GetFrameAtOfst( const sal_Int32 nOfst ); /// If there's a Follow and we don't contain text ourselves inline bool IsEmptyMaster() const { return GetFollow() && !GetFollow()->GetOfst(); } @@ -323,18 +323,18 @@ public: /// Returns the text portion we want to edit (for inline see underneath) const OUString& GetText() const; inline SwTextNode *GetTextNode() - { return static_cast< SwTextNode* >( SwContentFrm::GetNode()); } + { return static_cast< SwTextNode* >( SwContentFrame::GetNode()); } inline const SwTextNode *GetTextNode() const - { return static_cast< const SwTextNode* >( SwContentFrm::GetNode()); } + { return static_cast< const SwTextNode* >( SwContentFrame::GetNode()); } - SwTextFrm(SwTextNode * const, SwFrm* ); + SwTextFrame(SwTextNode * const, SwFrame* ); /** - * SwContentFrm: the shortcut for the Frames + * SwContentFrame: the shortcut for the Frames * If the void* casts wrongly, it's its own fault! * The void* must be checked for 0 in any case! * - * return true if the Portion associated with this SwTextFrm was + * return true if the Portion associated with this SwTextFrame was * potentially destroyed and replaced by Prepare */ virtual bool Prepare( const PrepareHint ePrep = PREP_CLEAR, @@ -353,7 +353,7 @@ public: * determines whether the paragraph needs to be split. * We pass the potential predecessor for the distance calculation */ - bool TestFormat( const SwFrm* pPrv, SwTwips &nMaxHeight, bool &bSplit ); + bool TestFormat( const SwFrame* pPrv, SwTwips &nMaxHeight, bool &bSplit ); /** * We format a Line for interactive hyphenation @@ -374,7 +374,7 @@ public: SwTwips HangingMargin() const; // RTTI - DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrm) + DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrame) // Locking inline bool IsLocked() const { return mbLocked; } @@ -393,14 +393,14 @@ public: inline void ResetBlinkPor() const; inline bool HasBlinkPor() const { return mbHasBlinkPortions; } inline void SetAnimation() const - { const_cast<SwTextFrm*>(this)->mbHasAnimation = true; } + { const_cast<SwTextFrame*>(this)->mbHasAnimation = true; } inline bool HasAnimation() const { return mbHasAnimation; } inline bool IsSwapped() const { return mbIsSwapped; } - /// Does the Frm have a local footnote (in this Frm or Follow)? + /// Does the Frame have a local footnote (in this Frame or Follow)? #ifdef DBG_UTIL - void CalcFootnoteFlag( sal_Int32 nStop = COMPLETE_STRING ); //For testing SplitFrm + void CalcFootnoteFlag( sal_Int32 nStop = COMPLETE_STRING ); //For testing SplitFrame #else void CalcFootnoteFlag(); #endif @@ -420,15 +420,15 @@ public: /// Footnote void RemoveFootnote( const sal_Int32 nStart = 0, const sal_Int32 nLen = COMPLETE_STRING ); - inline SwTwips GetFootnoteFrmHeight() const; - SwTextFrm *FindFootnoteRef( const SwTextFootnote *pFootnote ); - inline const SwTextFrm *FindFootnoteRef( const SwTextFootnote *pFootnote ) const - { return const_cast<SwTextFrm *>(this)->FindFootnoteRef( pFootnote ); } + inline SwTwips GetFootnoteFrameHeight() const; + SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ); + inline const SwTextFrame *FindFootnoteRef( const SwTextFootnote *pFootnote ) const + { return const_cast<SwTextFrame *>(this)->FindFootnoteRef( pFootnote ); } void ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDeadLine ); /** * If we're a Footnote that grows towards its reference ... - * public, because it's needed by SwContentFrm::MakeAll + * public, because it's needed by SwContentFrame::MakeAll */ SwTwips GetFootnoteLine( const SwTextFootnote *pFootnote ) const; @@ -438,11 +438,11 @@ public: /// Returns the sum of line height in pLine sal_uInt16 GetParHeight() const; - inline SwTextFrm *GetFollow(); - inline const SwTextFrm *GetFollow() const; + inline SwTextFrame *GetFollow(); + inline const SwTextFrame *GetFollow() const; /// Find the page number of ErgoSum and QuoVadis - SwTextFrm *FindQuoVadisFrm(); + SwTextFrame *FindQuoVadisFrame(); /** * Makes up for formatting if the Idle Handler has struck @@ -452,7 +452,7 @@ public: * has to be avoided during painting. Therefore we need to pass the * information that we are currently in the paint process. */ - SwTextFrm* GetFormatted( bool bForceQuickFormat = false ); + SwTextFrame* GetFormatted( bool bForceQuickFormat = false ); /// Will be moved soon inline void SetFootnote( const bool bNew ) { mbFootnote = bNew; } @@ -460,7 +460,7 @@ public: /// Respect the Follows inline bool IsInside( const sal_Int32 nPos ) const; - const SwBodyFrm *FindBodyFrm() const; + const SwBodyFrame *FindBodyFrame() const; /// DropCaps and selections inline bool GetDropRect( SwRect &rRect ) const @@ -477,9 +477,9 @@ public: /// Removes the Line information from the Cache void ClearPara(); - /// Am I a FootnoteFrm, with a number at the start of the paragraph? - inline bool IsFootnoteNumFrm() const - { return IsInFootnote() && !GetIndPrev() && _IsFootnoteNumFrm(); } + /// Am I a FootnoteFrame, with a number at the start of the paragraph? + inline bool IsFootnoteNumFrame() const + { return IsInFootnote() && !GetIndPrev() && _IsFootnoteNumFrame(); } /** * Simulates a formatting as if there were not right margin or Flys or other @@ -510,10 +510,10 @@ public: /// Returns the first line height sal_uInt16 FirstLineHeight() const; - /// Rewires FlyInCntFrm, if nEnd > Index >= nStart - void MoveFlyInCnt( SwTextFrm *pNew, sal_Int32 nStart, sal_Int32 nEnd ); + /// Rewires FlyInContentFrame, if nEnd > Index >= nStart + void MoveFlyInCnt( SwTextFrame *pNew, sal_Int32 nStart, sal_Int32 nEnd ); - /// Calculates the position of FlyInCntFrms + /// Calculates the position of FlyInContentFrames sal_Int32 CalcFlyPos( SwFrameFormat* pSearch ); /// Determines the start position and step size of the register @@ -631,23 +631,23 @@ public: virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override; }; -//use this to protect a SwTextFrm for a given scope from getting merged with +//use this to protect a SwTextFrame for a given scope from getting merged with //its neighbour and thus deleted -class TextFrmLockGuard +class TextFrameLockGuard { private: - SwTextFrm *m_pTextFrm; + SwTextFrame *m_pTextFrame; bool m_bOldLocked; public: - //Lock pFrm for the lifetime of the Cut/Paste call, etc. to avoid - //SwTextFrm::_AdjustFollow removing the pFrm we're trying to Make - TextFrmLockGuard(SwFrm* pFrm) + //Lock pFrame for the lifetime of the Cut/Paste call, etc. to avoid + //SwTextFrame::_AdjustFollow removing the pFrame we're trying to Make + TextFrameLockGuard(SwFrame* pFrame) { - m_pTextFrm = pFrm->IsTextFrm() ? static_cast<SwTextFrm*>(pFrm) : nullptr; - if (m_pTextFrm) + m_pTextFrame = pFrame->IsTextFrame() ? static_cast<SwTextFrame*>(pFrame) : nullptr; + if (m_pTextFrame) { - m_bOldLocked = m_pTextFrm->IsLocked(); - m_pTextFrm->Lock(); + m_bOldLocked = m_pTextFrame->IsLocked(); + m_pTextFrame->Lock(); } else { @@ -655,91 +655,91 @@ public: } } - ~TextFrmLockGuard() + ~TextFrameLockGuard() { - if (m_pTextFrm && !m_bOldLocked) - m_pTextFrm->Unlock(); + if (m_pTextFrame && !m_bOldLocked) + m_pTextFrame->Unlock(); } }; -inline const SwParaPortion *SwTextFrm::GetPara() const +inline const SwParaPortion *SwTextFrame::GetPara() const { - return const_cast<SwTextFrm*>(this)->GetPara(); + return const_cast<SwTextFrame*>(this)->GetPara(); } -inline bool SwTextFrm::HasPara() const +inline bool SwTextFrame::HasPara() const { return mnCacheIndex!=USHRT_MAX && _HasPara(); } -inline SwTwips SwTextFrm::GrowTst( const SwTwips nGrow ) +inline SwTwips SwTextFrame::GrowTst( const SwTwips nGrow ) { return Grow( nGrow, true ); } -inline bool SwTextFrm::IsInside( const sal_Int32 nPos ) const +inline bool SwTextFrame::IsInside( const sal_Int32 nPos ) const { bool bRet = true; if( nPos < GetOfst() ) bRet = false; else { - const SwTextFrm *pFoll = GetFollow(); + const SwTextFrame *pFoll = GetFollow(); if( pFoll && nPos >= pFoll->GetOfst() ) bRet = false; } return bRet; } -inline SwTwips SwTextFrm::GetFootnoteFrmHeight() const +inline SwTwips SwTextFrame::GetFootnoteFrameHeight() const { if( !IsFollow() && IsInFootnote() && HasPara() ) - return _GetFootnoteFrmHeight(); + return _GetFootnoteFrameHeight(); else return 0; } -inline const SwTextFrm *SwTextFrm::GetFollow() const +inline const SwTextFrame *SwTextFrame::GetFollow() const { - return static_cast<const SwTextFrm*>(SwContentFrm::GetFollow()); + return static_cast<const SwTextFrame*>(SwContentFrame::GetFollow()); } -inline SwTextFrm *SwTextFrm::GetFollow() +inline SwTextFrame *SwTextFrame::GetFollow() { - return static_cast<SwTextFrm*>(SwContentFrm::GetFollow()); + return static_cast<SwTextFrame*>(SwContentFrame::GetFollow()); } -inline const SwTextFrm *SwTextFrm::GetFrmAtPos( const SwPosition &rPos) const +inline const SwTextFrame *SwTextFrame::GetFrameAtPos( const SwPosition &rPos) const { - return const_cast<SwTextFrm*>(this)->GetFrmAtPos( rPos ); + return const_cast<SwTextFrame*>(this)->GetFrameAtPos( rPos ); } -inline void SwTextFrm::SetOfst( const sal_Int32 nNewOfst ) +inline void SwTextFrame::SetOfst( const sal_Int32 nNewOfst ) { if ( mnOffset != nNewOfst ) _SetOfst( nNewOfst ); } -inline void SwTextFrm::SetRepaint() const +inline void SwTextFrame::SetRepaint() const { - const_cast<SwTextFrm*>(this)->mbRepaint = true; + const_cast<SwTextFrame*>(this)->mbRepaint = true; } -inline void SwTextFrm::ResetRepaint() const +inline void SwTextFrame::ResetRepaint() const { - const_cast<SwTextFrm*>(this)->mbRepaint = false; + const_cast<SwTextFrame*>(this)->mbRepaint = false; } -inline void SwTextFrm::SetBlinkPor() const +inline void SwTextFrame::SetBlinkPor() const { - const_cast<SwTextFrm*>(this)->mbHasBlinkPortions = true; + const_cast<SwTextFrame*>(this)->mbHasBlinkPortions = true; } -inline void SwTextFrm::ResetBlinkPor() const +inline void SwTextFrame::ResetBlinkPor() const { - const_cast<SwTextFrm*>(this)->mbHasBlinkPortions = false; + const_cast<SwTextFrame*>(this)->mbHasBlinkPortions = false; } class TemporarySwap { protected: - explicit TemporarySwap(SwTextFrm * frame, bool swap): + explicit TemporarySwap(SwTextFrame * frame, bool swap): frame_(frame), undo_(false) { if (frame_->IsVertical() && swap) { @@ -758,19 +758,19 @@ private: TemporarySwap(TemporarySwap &) = delete; void operator =(TemporarySwap &) = delete; - SwTextFrm * frame_; + SwTextFrame * frame_; bool undo_; }; class SwSwapIfSwapped: private TemporarySwap { public: - explicit SwSwapIfSwapped(SwTextFrm* frame): + explicit SwSwapIfSwapped(SwTextFrame* frame): TemporarySwap(frame, frame->IsSwapped()) {} }; class SwSwapIfNotSwapped: private TemporarySwap { public: - explicit SwSwapIfNotSwapped(SwTextFrm* frame): + explicit SwSwapIfNotSwapped(SwTextFrame* frame): TemporarySwap(frame, !frame->IsSwapped()) {} }; @@ -778,13 +778,13 @@ public: * Helper class which can be used instead of the macros if a function * has too many returns */ -class SwFrmSwapper +class SwFrameSwapper { - const SwTextFrm* pFrm; + const SwTextFrame* pFrame; bool bUndo; public: - SwFrmSwapper( const SwTextFrm* pFrm, bool bSwapIfNotSwapped ); - ~SwFrmSwapper(); + SwFrameSwapper( const SwTextFrame* pFrame, bool bSwapIfNotSwapped ); + ~SwFrameSwapper(); }; class SwLayoutModeModifier diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index cb8e364f87c6..8b9e72426f1c 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -122,7 +122,7 @@ private: bool m_bIsCollapsed; - void init(const SwUnoCrsr* pPortionCursor); + void init(const SwUnoCursor* pPortionCursor); protected: @@ -135,7 +135,7 @@ protected: throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); void GetPropertyValue( css::uno::Any &rVal, - const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet ); + const SfxItemPropertySimpleEntry& rEntry, SwUnoCursor *pUnoCursor, SfxItemSet *&pSet ); css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> SAL_CALL GetPropertyValuesTolerant_Impl( const css::uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly ) @@ -147,11 +147,11 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: - SwXTextPortion(const SwUnoCrsr* pPortionCrsr, css::uno::Reference< css::text::XText > const& rParent, SwTextPortionType eType ); - SwXTextPortion(const SwUnoCrsr* pPortionCrsr, css::uno::Reference< css::text::XText > const& rParent, SwFrameFormat& rFormat ); + SwXTextPortion(const SwUnoCursor* pPortionCursor, css::uno::Reference< css::text::XText > const& rParent, SwTextPortionType eType ); + SwXTextPortion(const SwUnoCursor* pPortionCursor, css::uno::Reference< css::text::XText > const& rParent, SwFrameFormat& rFormat ); // for Ruby - SwXTextPortion(const SwUnoCrsr* pPortionCrsr, + SwXTextPortion(const SwUnoCursor* pPortionCursor, SwTextRuby const& rAttr, css::uno::Reference< css::text::XText > const& xParent, bool bIsEnd ); @@ -225,7 +225,7 @@ public: SwTextPortionType GetTextPortionType() const { return m_ePortionType; } - SwUnoCrsr& GetCursor() const + SwUnoCursor& GetCursor() const { return *m_pUnoCursor; } }; @@ -237,20 +237,20 @@ class SwXTextPortionEnumeration > { TextRangeList_t m_Portions; // contains all portions, filled by ctor - sw::UnoCursorPointer m_pUnoCrsr; + sw::UnoCursorPointer m_pUnoCursor; - SwUnoCrsr& GetCursor() const - {return *m_pUnoCrsr;} + SwUnoCursor& GetCursor() const + {return *m_pUnoCursor;} protected: virtual ~SwXTextPortionEnumeration(); public: - SwXTextPortionEnumeration(SwPaM& rParaCrsr, + SwXTextPortionEnumeration(SwPaM& rParaCursor, css::uno::Reference< css::text::XText > const & xParent, const sal_Int32 nStart, const sal_Int32 nEnd ); - SwXTextPortionEnumeration(SwPaM& rParaCrsr, + SwXTextPortionEnumeration(SwPaM& rParaCursor, TextRangeList_t const & rPortions ); static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -292,7 +292,7 @@ private: public: SwXRedlinePortion( SwRangeRedline const& rRedline, - SwUnoCrsr const* pPortionCrsr, + SwUnoCursor const* pPortionCursor, css::uno::Reference< css::text::XText > const& xParent, bool const bIsStart); diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index e6efdf4278be..3bde62fcaef9 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -28,15 +28,15 @@ #include <vector> class SwViewShell; -class SwFlyFrm; +class SwFlyFrame; class SwViewOption; class SwRegionRects; -class SwFrm; +class SwFrame; class SwLayAction; class SwLayIdle; class SwDrawView; class SdrPageView; -class SwPageFrm; +class SwPageFrame; class SwRegionRects; class SwAccessibleMap; class SdrObject; @@ -44,7 +44,7 @@ class Fraction; class SwPrintData; class SwPagePreviewLayout; struct PreviewPage; -class SwTextFrm; +class SwTextFrame; // --> OD #i76669# namespace sdr { namespace contact { class ViewObjectContactRedirector; @@ -67,7 +67,7 @@ class SwViewShellImp SwDrawView *m_pDrawView; // Our DrawView SdrPageView *m_pSdrPageView; // Exactly one Page for our DrawView - SwPageFrm *m_pFirstVisiblePage; // Always points to the first visible Page + SwPageFrame *m_pFirstVisiblePage; // Always points to the first visible Page SwRegionRects *m_pRegion; // Collector of Paintrects from the LayAction SwLayAction *m_pLayAction; // Is set if an Action object exists @@ -103,18 +103,18 @@ private: implementation for wrapper method <SwViewShell::InvalidateAccessibleParaFlowRelation(..)> - @param _pFromTextFrm + @param _pFromTextFrame input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM has to be invalidated. If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated - @param _pToTextFrm + @param _pToTextFrame input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO has to be invalidated. If NULL, no CONTENT_FLOWS_TO relation has to be invalidated */ - void _InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm, - const SwTextFrm* _pToTextFrm ); + void _InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFromTextFrame, + const SwTextFrame* _pToTextFrame ); /** invalidate text selection for paragraphs @@ -130,7 +130,7 @@ private: implementation for wrapper method <SwViewShell::InvalidateAccessibleParaAttrs(..)> */ - void _InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm ); + void _InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame ); public: SwViewShellImp( SwViewShell * ); @@ -143,8 +143,8 @@ public: Color GetRetoucheColor() const; /// Management of the first visible Page - const SwPageFrm *GetFirstVisPage(OutputDevice* pRenderContext) const; - SwPageFrm *GetFirstVisPage(OutputDevice* pRenderContext); + const SwPageFrame *GetFirstVisPage(OutputDevice* pRenderContext) const; + SwPageFrame *GetFirstVisPage(OutputDevice* pRenderContext); void SetFirstVisPageInvalid() { m_bFirstPageInvalid = true; } bool AddPaintRect( const SwRect &rRect ); @@ -191,9 +191,9 @@ public: /** * If an Action is running we ask it to check whether it's time - * to enable the WaitCrsr + * to enable the WaitCursor */ - void CheckWaitCrsr(); + void CheckWaitCursor(); /// Asks the LayAction if present bool IsCalcLayoutProgress() const; @@ -224,41 +224,41 @@ public: void UpdateAccessible(); /// Remove a frame from the accessible view - void DisposeAccessible( const SwFrm *pFrm, const SdrObject *pObj, + void DisposeAccessible( const SwFrame *pFrame, const SdrObject *pObj, bool bRecursive ); - inline void DisposeAccessibleFrm( const SwFrm *pFrm, + inline void DisposeAccessibleFrame( const SwFrame *pFrame, bool bRecursive = false ); inline void DisposeAccessibleObj( const SdrObject *pObj ); /// Move a frame's position in the accessible view - void MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj, - const SwRect& rOldFrm ); - inline void MoveAccessibleFrm( const SwFrm *pFrm, const SwRect& rOldFrm ); + void MoveAccessible( const SwFrame *pFrame, const SdrObject *pObj, + const SwRect& rOldFrame ); + inline void MoveAccessibleFrame( const SwFrame *pFrame, const SwRect& rOldFrame ); /// Add a frame in the accessible view - inline void AddAccessibleFrm( const SwFrm *pFrm ); + inline void AddAccessibleFrame( const SwFrame *pFrame ); inline void AddAccessibleObj( const SdrObject *pObj ); /// Invalidate accessible frame's frame's content - void InvalidateAccessibleFrmContent( const SwFrm *pFrm ); + void InvalidateAccessibleFrameContent( const SwFrame *pFrame ); /// Invalidate accessible frame's cursor position - void InvalidateAccessibleCursorPosition( const SwFrm *pFrm ); + void InvalidateAccessibleCursorPosition( const SwFrame *pFrame ); /// Invalidate editable state for all accessible frames void InvalidateAccessibleEditableState( bool bAllShells = true, - const SwFrm *pFrm=nullptr ); + const SwFrame *pFrame=nullptr ); /// Invalidate frame's relation set (for chained frames) - void InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster, - const SwFlyFrm *pFollow ); + void InvalidateAccessibleRelationSet( const SwFlyFrame *pMaster, + const SwFlyFrame *pFollow ); /// update data for accessible preview /// change method signature due to new page preview functionality void UpdateAccessiblePreview( const std::vector<PreviewPage*>& _rPreviewPages, const Fraction& _rScale, - const SwPageFrm* _pSelectedPageFrm, + const SwPageFrame* _pSelectedPageFrame, const Size& _rPreviewWinSize ); void InvalidateAccessiblePreviewSelection( sal_uInt16 nSelPage ); @@ -275,10 +275,10 @@ inline SwAccessibleMap& SwViewShellImp::GetAccessibleMap() return *m_pAccessibleMap; } -inline void SwViewShellImp::DisposeAccessibleFrm( const SwFrm *pFrm, +inline void SwViewShellImp::DisposeAccessibleFrame( const SwFrame *pFrame, bool bRecursive ) { - DisposeAccessible( pFrm, nullptr, bRecursive ); + DisposeAccessible( pFrame, nullptr, bRecursive ); } inline void SwViewShellImp::DisposeAccessibleObj( const SdrObject *pObj ) @@ -286,16 +286,16 @@ inline void SwViewShellImp::DisposeAccessibleObj( const SdrObject *pObj ) DisposeAccessible( nullptr, pObj, false ); } -inline void SwViewShellImp::MoveAccessibleFrm( const SwFrm *pFrm, - const SwRect& rOldFrm ) +inline void SwViewShellImp::MoveAccessibleFrame( const SwFrame *pFrame, + const SwRect& rOldFrame ) { - MoveAccessible( pFrm, nullptr, rOldFrm ); + MoveAccessible( pFrame, nullptr, rOldFrame ); } -inline void SwViewShellImp::AddAccessibleFrm( const SwFrm *pFrm ) +inline void SwViewShellImp::AddAccessibleFrame( const SwFrame *pFrame ) { SwRect aEmptyRect; - MoveAccessible( pFrm, nullptr, aEmptyRect ); + MoveAccessible( pFrame, nullptr, aEmptyRect ); } inline void SwViewShellImp::AddAccessibleObj( const SdrObject *pObj ) |