diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-26 10:27:15 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-26 11:46:38 +0200 |
commit | 5be1635d45e28e047af0cde4e387b07a3131cc9d (patch) | |
tree | d2bd0d9f133c10e563655081174d1481a68e09b3 /sw/source/core | |
parent | b61ca31e53f0a56667a5e00e966681be29ea7bf7 (diff) |
loplugin: cstylecast
Change-Id: Idce7220056f7bc339a5060fd0bd6fbbbdde4f6ff
Diffstat (limited to 'sw/source/core')
-rw-r--r-- | sw/source/core/inc/frame.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/inc/layfrm.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/inc/txtfrm.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/text/frmform.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index cd96b26dc02d..472568b4deb6 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -973,11 +973,11 @@ inline void SwFrm::ResetRetouche() const inline SwLayoutFrm *SwFrm::GetNextLayoutLeaf() { - return (SwLayoutFrm*)((const SwFrm*)this)->GetNextLayoutLeaf(); + return (SwLayoutFrm*)static_cast<const SwFrm*>(this)->GetNextLayoutLeaf(); } inline SwLayoutFrm *SwFrm::GetPrevLayoutLeaf() { - return (SwLayoutFrm*)((const SwFrm*)this)->GetPrevLayoutLeaf(); + return (SwLayoutFrm*)static_cast<const SwFrm*>(this)->GetPrevLayoutLeaf(); } inline const SwLayoutFrm *SwFrm::GetNextLayoutLeaf() const { diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index d074034ba387..c4d3772b754f 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -195,17 +195,17 @@ public: */ inline SwCntntFrm* SwLayoutFrm::ContainsCntnt() { - return (SwCntntFrm*)(((const SwLayoutFrm*)this)->ContainsCntnt()); + return (SwCntntFrm*)(static_cast<const SwLayoutFrm*>(this)->ContainsCntnt()); } inline SwCellFrm* SwLayoutFrm::FirstCell() { - return (SwCellFrm*)(((const SwLayoutFrm*)this)->FirstCell()); + return (SwCellFrm*)(static_cast<const SwLayoutFrm*>(this)->FirstCell()); } inline SwFrm* SwLayoutFrm::ContainsAny( const bool _bInvestigateFtnForSections ) { - return (SwFrm*)(((const SwLayoutFrm*)this)->ContainsAny( _bInvestigateFtnForSections )); + return (SwFrm*)(static_cast<const SwLayoutFrm*>(this)->ContainsAny( _bInvestigateFtnForSections )); } /** diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index d76fc92c0f13..3317c270c27d 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -670,9 +670,9 @@ inline bool SwTxtFrm::HasPara() const /// 9104: Frm().Height() - Prt().Height(), see widorp.cxx and 7455, 6114, 7908 inline SwTwips SwTxtFrm::GetRstHeight() const { - return !GetUpper() ? 0 : ((const SwFrm*)GetUpper())->Frm().Top() - + ((const SwFrm*)GetUpper())->Prt().Top() - + ((const SwFrm*)GetUpper())->Prt().Height() + return !GetUpper() ? 0 : static_cast<const SwFrm*>(GetUpper())->Frm().Top() + + static_cast<const SwFrm*>(GetUpper())->Prt().Top() + + static_cast<const SwFrm*>(GetUpper())->Prt().Height() - Frm().Top() - (Frm().Height() - Prt().Height()); } diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 71b353f8fa7e..2edea7c73200 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -1574,7 +1574,7 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) return; // If necessary the pPara - sal_uInt16 nOld = ((const SwTxtMargin&)rLine).GetDropHeight(); + sal_uInt16 nOld = static_cast<const SwTxtMargin&>(rLine).GetDropHeight(); bool bShrink = false; bool bGrow = false; bool bGoOn = rLine.IsOnceMore(); @@ -1593,7 +1593,7 @@ void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) bGoOn = rLine.IsOnceMore(); if( bGoOn ) { - const sal_uInt16 nNew = ((const SwTxtMargin&)rLine).GetDropHeight(); + const sal_uInt16 nNew = static_cast<const SwTxtMargin&>(rLine).GetDropHeight(); if( nOld == nNew ) bGoOn = false; else |