Skip to content

C
core
Kaydet (Commit) 3652012a authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin: cstylecast 

Change-Id: I4fbe7d35b66dda16f19019fd1baf0aa03361390c
üst 526917bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
sw/inc/fmtcnct.hxx
Dosyayı görüntüle @ 3652012a
......@@ -23,8 +23,8 @@
#include <svl/poolitem.hxx>
#include <format.hxx>
#include <calbck.hxx>
#include <frmfmt.hxx>
class SwFlyFrmFmt;
class IntlWrapper;
/// Connection (text flow) between two FlyFrms.
......
sw/inc/fmthdft.hxx
Dosyayı görüntüle @ 3652012a
......@@ -23,8 +23,8 @@
#include <format.hxx>
#include <svl/poolitem.hxx>
#include <calbck.hxx>
#include <frmfmt.hxx>
class SwFrmFmt;
class IntlWrapper;
class SwFmt;
......
sw/inc/txatritr.hxx
Dosyayı görüntüle @ 3652012a
......@@ -82,7 +82,7 @@ public:
{}
sal_uInt16 GetLanguage() const
{ return ((SvxLanguageItem&)GetAttr()).GetValue(); }
{ return static_cast<const SvxLanguageItem&>(GetAttr()).GetValue(); }
};
#endif
......
sw/source/core/crsr/crstrvl.cxx
Dosyayı görüntüle @ 3652012a
This diff is collapsed.
sw/source/core/crsr/findattr.cxx
Dosyayı görüntüle @ 3652012a
......@@ -57,16 +57,16 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
switch( rItem1.Which() )
{
case RES_CHRATR_FONT:
return ((SvxFontItem&)rItem1).GetFamilyName() ==
((SvxFontItem&)rItem2).GetFamilyName();
return static_cast<const SvxFontItem&>(rItem1).GetFamilyName() ==
static_cast<const SvxFontItem&>(rItem2).GetFamilyName();
case RES_CHRATR_COLOR:
return ((SvxColorItem&)rItem1).GetValue().IsRGBEqual(
((SvxColorItem&)rItem2).GetValue() );
return static_cast<const SvxColorItem&>(rItem1).GetValue().IsRGBEqual(
static_cast<const SvxColorItem&>(rItem2).GetValue() );
case RES_PAGEDESC:
bool bNumOffsetEqual = false;
::boost::optional<sal_uInt16> oNumOffset1 = ((SwFmtPageDesc&)rItem1).GetNumOffset();
::boost::optional<sal_uInt16> oNumOffset2 = ((SwFmtPageDesc&)rItem1).GetNumOffset();
::boost::optional<sal_uInt16> oNumOffset1 = static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
::boost::optional<sal_uInt16> oNumOffset2 = static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
if (!oNumOffset1 && !oNumOffset2)
{
bNumOffsetEqual = true;
......@@ -83,7 +83,7 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
if (bNumOffsetEqual == false)
return false;
return ((SwFmtPageDesc&)rItem1).GetPageDesc() == ((SwFmtPageDesc&)rItem2).GetPageDesc();
return static_cast<const SwFmtPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFmtPageDesc&>(rItem2).GetPageDesc();
}
return rItem1 == rItem2;
}
......@@ -915,8 +915,8 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
if( !pNode->IsTxtNode() ) // CharAttr are only in text nodes
continue;
if( ((SwTxtNode*)pNode)->HasHints() &&
lcl_Search( *(SwTxtNode*)pNode, *pPam, rAttr, fnMove, bValue ))
if( static_cast<SwTxtNode*>(pNode)->HasHints() &&
lcl_Search( *static_cast<SwTxtNode*>(pNode), *pPam, rAttr, fnMove, bValue ))
{
// set to the values of the attribute
SetMark();
......@@ -1005,7 +1005,7 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
if( (!aOtherSet.Count() ||
lcl_Search( *pNode, aOtherSet, bNoColls )) &&
(*fnSearch)( *(SwTxtNode*)pNode, aCmpArr, *pPam ))
(*fnSearch)( *static_cast<SwTxtNode*>(pNode), aCmpArr, *pPam ))
{
// set to the values of the attribute
SetMark();
......
sw/source/core/crsr/findtxt.cxx
Dosyayı görüntüle @ 3652012a
......@@ -253,7 +253,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
// if there are SwPostItFields inside our current node text, we
// split the text into separate pieces and search for text inside
// the pieces as well as inside the fields
const SwpHints *pHts = ((SwTxtNode*)pNode)->GetpSwpHints();
const SwpHints *pHts = static_cast<SwTxtNode*>(pNode)->GetpSwpHints();
// count PostItFields by looping over all fields
sal_Int32 aNumberPostits = 0;
......@@ -446,7 +446,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
if ( nSearchScript == nCurrScript )
{
const LanguageType eCurrLang =
((SwTxtNode*)pNode)->GetLang( bSrchForward ?
static_cast<SwTxtNode*>(pNode)->GetLang( bSrchForward ?
nStart :
nEnd );
......
sw/source/core/crsr/pam.cxx
Dosyayı görüntüle @ 3652012a
......@@ -272,14 +272,14 @@ bool CheckNodesRange( const SwNodeIndex& rStt,
bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
if( pNd->IsCntntNode() )
return ((SwCntntNode*)pNd)->GoNext( pIdx, nMode );
return static_cast<SwCntntNode*>(pNd)->GoNext( pIdx, nMode );
return false;
}
bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
if( pNd->IsCntntNode() )
return ((SwCntntNode*)pNd)->GoPrevious( pIdx, nMode );
return static_cast<SwCntntNode*>(pNd)->GoPrevious( pIdx, nMode );
return false;
}
......@@ -760,7 +760,7 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
(
0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
( !bInReadOnly && pFrm->IsProtected() ) ||
(pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsHiddenNow())
(pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow())
) ||
( !bInReadOnly && pNd->FindSectionNode() &&
pNd->FindSectionNode()->GetSection().IsProtect()
......@@ -794,7 +794,7 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
if( 0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
( !bInReadOnly && pFrm->IsProtected() ) ||
( pFrm->IsTxtFrm() &&
((SwTxtFrm*)pFrm)->IsHiddenNow() ) )
static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow() ) )
{
pNd = 0;
continue;
......
sw/source/core/crsr/swcrsr.cxx
Dosyayı görüntüle @ 3652012a
......@@ -324,7 +324,7 @@ bool SwCursor::IsSelOvr( int eFlags )
const SwNode* pNd = &GetPoint()->nNode.GetNode();
if( pNd->IsCntntNode() && !dynamic_cast<SwUnoCrsr*>(this) )
{
const SwCntntFrm* pFrm = ((SwCntntNode*)pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
const SwCntntFrm* pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
if( pFrm && pFrm->IsValid()
&& 0 == pFrm->Frm().Height()
&& 0 != ( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags ) )
......@@ -341,7 +341,7 @@ bool SwCursor::IsSelOvr( int eFlags )
if( !pFrm )
{
bGoNxt = !bGoNxt;
pFrm = ((SwCntntNode*)pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
while ( pFrm && 0 == pFrm->Frm().Height() )
{
pFrm = bGoNxt ? pFrm->GetNextCntntFrm()
......@@ -405,7 +405,7 @@ bool SwCursor::IsSelOvr( int eFlags )
}
if( (pNd = &GetMark()->nNode.GetNode())->IsCntntNode()
&& !((SwCntntNode*)pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
&& !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
&& !dynamic_cast<SwUnoCrsr*>(this) )
{
DeleteMark();
......@@ -522,7 +522,7 @@ bool SwCursor::IsSelOvr( int eFlags )
pMyNd = pOuterTableNd;
else
{
SwCntntNode* pCNd = (SwCntntNode*)pMyNd;
SwCntntNode* pCNd = const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pMyNd));
GetPoint()->nContent.Assign( pCNd, bSelTop ? pCNd->Len() : 0 );
return false;
}
......@@ -694,7 +694,7 @@ bool SwCursor::IsAtValidPos( bool bPoint ) const
const SwPosition* pPos = bPoint ? GetPoint() : GetMark();
const SwNode* pNd = &pPos->nNode.GetNode();
if( pNd->IsCntntNode() && !((SwCntntNode*)pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
if( pNd->IsCntntNode() && !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
!dynamic_cast<const SwUnoCrsr*>(this) )
{
return false;
......@@ -751,13 +751,13 @@ static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
sal_uInt16 nCrsrCnt = 0;
if( FND_IN_SEL & eFndRngs )
{
while( pCurCrsr != ( pTmpCrsr = (SwPaM*)pTmpCrsr->GetNext() ))
while( pCurCrsr != ( pTmpCrsr = static_cast<SwPaM*>(pTmpCrsr->GetNext()) ))
++nCrsrCnt;
if( nCrsrCnt && !bIsUnoCrsr )
pPHdl = new _PercentHdl( 0, nCrsrCnt, pDoc->GetDocShell() );
}
else
pSaveCrsr = (SwPaM*)pSaveCrsr->GetPrev();
pSaveCrsr = static_cast<SwPaM*>(pSaveCrsr->GetPrev());
bool bEnd = false;
do {
......@@ -842,7 +842,7 @@ static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
if( bEnd || !( eFndRngs & ( FND_IN_SELALL | FND_IN_SEL )) )
break;
pTmpCrsr = ((SwPaM*)pTmpCrsr->GetNext());
pTmpCrsr = static_cast<SwPaM*>(pTmpCrsr->GetNext());
if( nCrsrCnt && pPHdl )
{
pPHdl->NextPos( ++pPHdl->nActPos );
......@@ -1585,7 +1585,7 @@ SwCursor::DoSetBidiLevelLeftRight(
{
sal_uInt8 nCrsrLevel = GetCrsrBidiLevel();
bool bForward = ! io_rbLeft;
((SwTxtFrm*)pSttFrm)->PrepareVisualMove( nPos, nCrsrLevel,
const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSttFrm))->PrepareVisualMove( nPos, nCrsrLevel,
bForward, bInsertCrsr );
rIdx = nPos;
SetCrsrBidiLevel( nCrsrLevel );
......@@ -1710,7 +1710,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
if ( &rTmpNode != &rNode && rTmpNode.IsTxtNode() )
{
Point aPt;
const SwCntntFrm* pEndFrm = ((SwTxtNode&)rTmpNode).getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
const SwCntntFrm* pEndFrm = static_cast<SwTxtNode&>(rTmpNode).getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
if ( pEndFrm )
{
if ( ! pEndFrm->IsRightToLeft() != ! pSttFrm->IsRightToLeft() )
......@@ -1736,7 +1736,7 @@ void SwCursor::DoSetBidiLevelUpDown()
if ( rNode.IsTxtNode() )
{
const SwScriptInfo* pSI =
SwScriptInfo::GetScriptInfo( (SwTxtNode&)rNode );
SwScriptInfo::GetScriptInfo( static_cast<SwTxtNode&>(rNode) );
if ( pSI )
{
SwIndex& rIdx = GetPoint()->nContent;
......@@ -2177,7 +2177,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
SwPosition* pPos = pCur->GetMark();
if( pNd != &pPos->nNode.GetNode() )
pPos->nNode = *pNd;
pPos->nContent.Assign( (SwCntntNode*)pNd, 0 );
pPos->nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), 0 );
aIdx.Assign( *pSttNd->EndOfSectionNode(), - 1 );
if( !( pNd = &aIdx.GetNode())->IsCntntNode() )
......@@ -2186,17 +2186,17 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
pPos = pCur->GetPoint();
if (pNd && pNd != &pPos->nNode.GetNode())
pPos->nNode = *pNd;
pPos->nContent.Assign((SwCntntNode*)pNd, pNd ? ((SwCntntNode*)pNd)->Len() : 0);
pPos->nContent.Assign(const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), pNd ? static_cast<const SwCntntNode*>(pNd)->Len() : 0);
aTmp.erase( aTmp.begin() + nPos );
}
else
bDel = true;
pCur = (SwPaM*)pCur->GetNext();
pCur = static_cast<SwPaM*>(pCur->GetNext());
if( bDel )
{
SwPaM* pDel = (SwPaM*)pCur->GetPrev();
SwPaM* pDel = static_cast<SwPaM*>(pCur->GetPrev());
if( pDel == pAktCrsr )
pAktCrsr->DeleteMark();
......@@ -2212,7 +2212,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
SwNodeIndex aIdx( *pSttNd, 1 );
if( &aIdx.GetNodes() != &rNds )
break;
const SwNode* pNd = &aIdx.GetNode();
SwNode* pNd = &aIdx.GetNode();
if( !pNd->IsCntntNode() )
pNd = rNds.GoNextSection( &aIdx, true, false );
......@@ -2220,7 +2220,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
? pAktCrsr
: pAktCrsr->Create( pAktCrsr );
pNew->GetPoint()->nNode = *pNd;
pNew->GetPoint()->nContent.Assign( (SwCntntNode*)pNd, 0 );
pNew->GetPoint()->nContent.Assign( static_cast<SwCntntNode*>(pNd), 0 );
pNew->SetMark();
SwPosition* pPos = pNew->GetPoint();
......@@ -2228,7 +2228,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
if( !( pNd = &pPos->nNode.GetNode())->IsCntntNode() )
pNd = rNds.GoPrevSection( &pPos->nNode, true, false );
pPos->nContent.Assign((SwCntntNode*)pNd, pNd ? ((SwCntntNode*)pNd)->Len() : 0);
pPos->nContent.Assign(static_cast<SwCntntNode*>(pNd), pNd ? static_cast<SwCntntNode*>(pNd)->Len() : 0);
}
}
return pAktCrsr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment