diff options
Diffstat (limited to 'sw/source/core/inc/flyfrms.hxx')
-rw-r--r-- | sw/source/core/inc/flyfrms.hxx | 56 |
1 files changed, 28 insertions, 28 deletions
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; } |