diff options
-rw-r--r-- | compilerplugins/clang/virtualdead.unusedparams.results | 3 | ||||
-rw-r--r-- | sw/source/core/inc/cntfrm.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/flowfrm.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/sectfrm.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/tabfrm.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/calcmove.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 6 |
9 files changed, 10 insertions, 13 deletions
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 5e0802e4a386..3573570aa806 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -325,9 +325,6 @@ sw/inc/swcrsr.hxx:161 sw/source/core/access/acccontext.hxx:348 _Bool SwAccessibleContext::SetSelectedState(_Bool,) 0 -sw/source/core/inc/flowfrm.hxx:145 - _Bool SwFlowFrame::ShouldBwdMoved(class SwLayoutFrame *,_Bool,_Bool &,) - 101 sw/source/core/inc/txmsrt.hxx:145 void SwTOXSortTabBase::FillText(class SwTextNode &,const class SwIndex &,unsigned short,const class SwRootFrame *const,)const 1100 diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 526938433267..2daec8fdd81a 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -49,7 +49,7 @@ class SAL_DLLPUBLIC_RTTI SwContentFrame: public SwFrame, public SwFlowFrame void UpdateAttr_( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); - virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool& ) override; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool& ) override; const SwContentFrame* ImplGetNextContentFrame( bool bFwd ) const; diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx index cf06172d0c06..078ef9326837 100644 --- a/sw/source/core/inc/flowfrm.hxx +++ b/sw/source/core/inc/flowfrm.hxx @@ -142,7 +142,7 @@ protected: bool CheckMoveFwd( bool& rbMakePage, bool bKeep, bool bIgnoreMyOwnKeepValue ); bool MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways = false ); bool MoveBwd( bool &rbReformat ); - virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool bHead, bool &rReformat )=0; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool &rReformat )=0; public: SwFlowFrame( SwFrame &rFrame ); diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index d9ebecd78f97..3b890b385e2a 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -58,7 +58,7 @@ class SwSectionFrame: public SwLayoutFrame, public SwFlowFrame protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; - virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool bHead, bool &rReformat ) override; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, 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; diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 69e07ac9c692..95da935cd079 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -100,7 +100,7 @@ class SwTabFrame: public SwLayoutFrame, public SwFlowFrame SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); - virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool bHead, bool &rReformat ) override; + virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool &rReformat ) override; virtual void DestroyImpl() override; virtual ~SwTabFrame() override; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index a986773f422a..a8f4da4e79a4 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -50,7 +50,7 @@ // Move methods /// Return value tells whether the Frame should be moved. -bool SwContentFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool & ) +bool SwContentFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool & ) { if ( SwFlowFrame::IsMoveBwdJump() || !IsPrevObjMove() ) { diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 1d1a2b3b2233..027e6a8182b2 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2379,7 +2379,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) pNewUpper = nullptr; } } - if ( pNewUpper && !ShouldBwdMoved( pNewUpper, true, rbReformat ) ) + if ( pNewUpper && !ShouldBwdMoved( pNewUpper, rbReformat ) ) { if( !pNewUpper->Lower() ) { diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 7c71e6c44e33..524562585bd1 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -853,7 +853,7 @@ void SwSectionFrame::MakeAll(vcl::RenderContext* pRenderContext) DelEmpty( false ); } -bool SwSectionFrame::ShouldBwdMoved( SwLayoutFrame *, bool , bool & ) +bool SwSectionFrame::ShouldBwdMoved( SwLayoutFrame *, bool & ) { OSL_FAIL( "Oops, where is my tinfoil hat?" ); return false; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 7333acc59c9d..b7ffcceabdd5 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2053,7 +2053,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) { SwTabFrame *pMaster = FindMaster(); bool bDummy; - if ( ShouldBwdMoved( pMaster->GetUpper(), false, bDummy ) ) + if ( ShouldBwdMoved( pMaster->GetUpper(), bDummy ) ) pMaster->InvalidatePos(); } } @@ -2143,7 +2143,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) if ( !bSplit && GetFollow() ) { bool bDummy; - if ( GetFollow()->ShouldBwdMoved( GetUpper(), false, bDummy ) ) + if ( GetFollow()->ShouldBwdMoved( GetUpper(), bDummy ) ) { SwFrame *pTmp = GetUpper(); SwTwips nDeadLine = aRectFnSet.GetPrtBottom(*pTmp); @@ -3418,7 +3418,7 @@ SwContentFrame *SwTabFrame::FindLastContent() } /// Return value defines if the frm needs to be relocated -bool SwTabFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool, bool &rReformat ) +bool SwTabFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool &rReformat ) { rReformat = false; if ( SwFlowFrame::IsMoveBwdJump() || !IsPrevObjMove() ) |