diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-21 14:36:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-24 14:20:37 +0200 |
| commit | 0df9e5e46b0df4a8cc9e7dc39b56b10f922a31e5 (patch) | |
| tree | ceccee8d3f94fc31cca8cc7ea0306519df79e0c0 /sw | |
| parent | d7a7b841913afc64bf1dd19ce55cf1564f0c8275 (diff) | |
loplugin: cstylecast
Change-Id: Ia3dc8efc8c8803597cbf226780bdb7e1c9681ee0
Diffstat (limited to 'sw')
48 files changed, 508 insertions, 507 deletions
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index 79db5385608d..7cf57d2373ed 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -887,7 +887,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( const SwFrm* pObjContext = ::FindKontext( &rAnchorTxtFrm, FRM_COLUMN ); sal_uLong nObjIndex = rAnchorTxtFrm.GetTxtNode()->GetIndex(); SwOrderIter aIter( pObjPage, true ); - const SwFlyFrm* pFly = ((SwVirtFlyDrawObj*)aIter.Bottom())->GetFlyFrm(); + const SwFlyFrm* pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Bottom())->GetFlyFrm(); while ( pFly && nObjOrdNum > pFly->GetVirtDrawObj()->GetOrdNumDirect() ) { if ( _DrawAsideFly( pFly, aTmpObjRect, pObjContext, nObjIndex, @@ -967,7 +967,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside( } // end of <if (bVert)> } // end of <if _DrawAsideFly(..)> - pFly = ((SwVirtFlyDrawObj*)aIter.Next())->GetFlyFrm(); + pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Next())->GetFlyFrm(); } // end of <loop on fly frames return nAdjustedRelPosX; diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 3136db566faa..a0740e39f355 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -485,7 +485,7 @@ bool SwOLENode::IsInGlobalDocSection() const // pAnchorNd contains the most recently found Section Node, which // now must fulfill the prerequesites for the GlobalDoc - pSectNd = (SwSectionNode*)pAnchorNd; + pSectNd = static_cast<const SwSectionNode*>(pAnchorNd); return FILE_LINK_SECTION == pSectNd->GetSection().GetType() && pSectNd->GetIndex() > nEndExtraIdx; } diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index c5daf58c02ac..838e4823b90f 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -109,12 +109,12 @@ bool SwFmtDrop::GetInfo( SfxPoolItem& ) const bool SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( nLines == ((SwFmtDrop&)rAttr).GetLines() && - nChars == ((SwFmtDrop&)rAttr).GetChars() && - nDistance == ((SwFmtDrop&)rAttr).GetDistance() && - bWholeWord == ((SwFmtDrop&)rAttr).GetWholeWord() && - GetCharFmt() == ((SwFmtDrop&)rAttr).GetCharFmt() && - pDefinedIn == ((SwFmtDrop&)rAttr).pDefinedIn ); + return ( nLines == static_cast<const SwFmtDrop&>(rAttr).GetLines() && + nChars == static_cast<const SwFmtDrop&>(rAttr).GetChars() && + nDistance == static_cast<const SwFmtDrop&>(rAttr).GetDistance() && + bWholeWord == static_cast<const SwFmtDrop&>(rAttr).GetWholeWord() && + GetCharFmt() == static_cast<const SwFmtDrop&>(rAttr).GetCharFmt() && + pDefinedIn == static_cast<const SwFmtDrop&>(rAttr).pDefinedIn ); } SfxPoolItem* SwFmtDrop::Clone( SfxItemPool* ) const @@ -219,7 +219,7 @@ bool SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return GetValue() == ((SwNumRuleItem&)rAttr).GetValue(); + return GetValue() == static_cast<const SwNumRuleItem&>(rAttr).GetValue(); } bool SwNumRuleItem::QueryValue( uno::Any& rVal, sal_uInt8 ) const diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx index 0a08b012264b..b08866fe2337 100644 --- a/sw/source/core/sw3io/swacorr.cxx +++ b/sw/source/core/sw3io/swacorr.cxx @@ -73,7 +73,7 @@ bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, if( !rObjSh.IsA( TYPE(SwDocShell) ) ) return false; - SwDocShell& rDShell = (SwDocShell&)rObjSh; + SwDocShell& rDShell = static_cast<SwDocShell&>(rObjSh); sal_uLong nRet = 0; // mba: relative URLs don't make sense here diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 7f581c291d4f..7311dd904c16 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -255,7 +255,7 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort, if(!xBlkRoot.is()) return ERR_SWG_WRITE_ERROR; - uno::Reference < container::XNameAccess > xAccess( ((SwXMLTextBlocks&)rDestImp).xBlkRoot, uno::UNO_QUERY ); + uno::Reference < container::XNameAccess > xAccess( static_cast<SwXMLTextBlocks&>(rDestImp).xBlkRoot, uno::UNO_QUERY ); while ( xAccess->hasByName( sDestShortName ) ) { ++nIdx; @@ -272,7 +272,7 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort, try { uno::Reference < embed::XStorage > rSourceRoot = xBlkRoot->openStorageElement( aGroup, embed::ElementModes::READ ); - uno::Reference < embed::XStorage > rDestRoot = ((SwXMLTextBlocks&)rDestImp).xBlkRoot->openStorageElement( sDestShortName, embed::ElementModes::READWRITE ); + uno::Reference < embed::XStorage > rDestRoot = static_cast<SwXMLTextBlocks&>(rDestImp).xBlkRoot->openStorageElement( sDestShortName, embed::ElementModes::READWRITE ); rSourceRoot->copyToStorage( rDestRoot ); } catch (const uno::Exception&) @@ -283,8 +283,8 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, OUString& rShort, if(!nError) { rShort = sDestShortName; - ((SwXMLTextBlocks&)rDestImp).AddName( rShort, rLong, bTextOnly ); - ((SwXMLTextBlocks&)rDestImp).MakeBlockList(); + static_cast<SwXMLTextBlocks&>(rDestImp).AddName( rShort, rLong, bTextOnly ); + static_cast<SwXMLTextBlocks&>(rDestImp).MakeBlockList(); } CloseFile(); rDestImp.CloseFile(); @@ -596,7 +596,7 @@ void SwXMLTextBlocks::MakeBlockText( const OUString& rText ) { if ( nPos ) { - pTxtNode = (SwTxtNode*)pTxtNode->AppendNode( SwPosition( *pTxtNode ) ); + pTxtNode = static_cast<SwTxtNode*>(pTxtNode->AppendNode( SwPosition( *pTxtNode ) )); } SwIndex aIdx( pTxtNode ); pTxtNode->InsertText( rText.getToken( 0, '\015', nPos ), aIdx ); diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index d34f7797c227..1f048872f019 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -705,7 +705,7 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, SwTableBox* pBox = pLine->GetTabBoxes()[ nInsPos ]; if( bBehind ) ++nInsPos; - SwTableBoxFmt* pBoxFrmFmt = (SwTableBoxFmt*)pBox->GetFrmFmt(); + SwTableBoxFmt* pBoxFrmFmt = static_cast<SwTableBoxFmt*>(pBox->GetFrmFmt()); ::_InsTblBox( pDoc, pTblNd, pLine, pBoxFrmFmt, pBox, nInsPos, nCnt ); long nRowSpan = pBox->getRowSpan(); long nDiff = i - nLastLine; @@ -757,7 +757,7 @@ bool SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, pFrmFmt->SetFmtAttr( aFrmSz ); if( pNoRightBorder && ( !bBehind || j+1 < nCnt ) ) pFrmFmt->SetFmtAttr( *pNoRightBorder ); - aInsFormat[j] = (SwTableBoxFmt*)pFrmFmt; + aInsFormat[j] = static_cast<SwTableBoxFmt*>(pFrmFmt); } else pCurrBox->ChgFrmFmt( aInsFormat[j] ); @@ -943,7 +943,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes, pFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, 0, 0 ) ); } else - pBox->ChgFrmFmt( (SwTableBoxFmt*)pNewFmt ); + pBox->ChgFrmFmt( static_cast<SwTableBoxFmt*>(pNewFmt) ); } } if( pLastBox ) // Robust diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 9a66c9be8aee..c73b3c2faf4b 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -217,12 +217,12 @@ void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd, else aAttrSet.ClearItem( RES_CHRATR_COLOR ); pDoc->GetNodes().InsBoxen( pTblNd, pLine, pBoxFrmFmt, - ((SwTxtNode*)pCNd)->GetTxtColl(), + static_cast<SwTxtNode*>(pCNd)->GetTxtColl(), &aAttrSet, nInsPos, nCnt ); } else pDoc->GetNodes().InsBoxen( pTblNd, pLine, pBoxFrmFmt, - ((SwTxtNode*)pCNd)->GetTxtColl(), + static_cast<SwTxtNode*>(pCNd)->GetTxtColl(), pCNd->GetpSwAttrSet(), nInsPos, nCnt ); } @@ -288,7 +288,7 @@ SwTable::~SwTable() } // the table can be deleted if it's the last client of the FrameFormat - SwTableFmt* pFmt = (SwTableFmt*)GetFrmFmt(); + SwTableFmt* pFmt = static_cast<SwTableFmt*>(GetFrmFmt()); pFmt->Remove( this ); // remove if( !pFmt->GetDepends() ) @@ -386,16 +386,16 @@ void SwTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( RES_ATTRSET_CHG == nWhich ) { - if (pOld && pNew && SfxItemState::SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( + if (pOld && pNew && SfxItemState::SET == static_cast<const SwAttrSetChg*>(pNew)->GetChgSet()->GetItemState( RES_FRM_SIZE, false, (const SfxPoolItem**)&pNewSize)) { - pOldSize = &((SwAttrSetChg*)pOld)->GetChgSet()->GetFrmSize(); + pOldSize = &static_cast<const SwAttrSetChg*>(pOld)->GetChgSet()->GetFrmSize(); } } else if( RES_FRM_SIZE == nWhich ) { - pOldSize = (const SwFmtFrmSize*)pOld; - pNewSize = (const SwFmtFrmSize*)pNew; + pOldSize = static_cast<const SwFmtFrmSize*>(pOld); + pNewSize = static_cast<const SwFmtFrmSize*>(pNew); } else CheckRegistration( pOld, pNew ); @@ -1479,7 +1479,7 @@ SwTableBox* SwTable::GetTblBox( sal_uLong nSttIdx ) while ( pFrm && !pFrm->IsCellFrm() ) pFrm = pFrm->GetUpper(); if ( pFrm ) - pRet = (SwTableBox*)((SwCellFrm*)pFrm)->GetTabBox(); + pRet = (SwTableBox*)static_cast<SwCellFrm*>(pFrm)->GetTabBox(); } // In case the layout doesn't exist yet or anything else goes wrong. @@ -1539,7 +1539,7 @@ SwFrmFmt* SwTableLine::ClaimFrmFmt() // of an SwTableLineFmt object // If other SwTableLine objects currently listen to the same SwTableLineFmt as // this one, something needs to be done - SwTableLineFmt *pRet = (SwTableLineFmt*)GetFrmFmt(); + SwTableLineFmt *pRet = static_cast<SwTableLineFmt*>(GetFrmFmt()); SwIterator<SwTableLine,SwFmt> aIter( *pRet ); for( SwTableLine* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { @@ -1759,7 +1759,7 @@ SwFrmFmt* SwTableBox::ClaimFrmFmt() // of an SwTableBoxFmt object // If other SwTableBox objects currently listen to the same SwTableBoxFmt as // this one, something needs to be done - SwTableBoxFmt *pRet = (SwTableBoxFmt*)GetFrmFmt(); + SwTableBoxFmt *pRet = static_cast<SwTableBoxFmt*>(GetFrmFmt()); SwIterator<SwTableBox,SwFmt> aIter( *pRet ); for( SwTableBox* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { @@ -1911,12 +1911,12 @@ bool SwTable::GetInfo( SfxPoolItem& rInfo ) const case RES_AUTOFMT_DOCNODE: { const SwTableNode* pTblNode = GetTableNode(); - if( pTblNode && &pTblNode->GetNodes() == ((SwAutoFmtGetDocNode&)rInfo).pNodes ) + if( pTblNode && &pTblNode->GetNodes() == static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes ) { if (!m_TabSortContentBoxes.empty()) { SwNodeIndex aIdx( *m_TabSortContentBoxes[0]->GetSttNd() ); - ((SwAutoFmtGetDocNode&)rInfo).pCntntNode = + static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = GetFrmFmt()->GetDoc()->GetNodes().GoNext( &aIdx ); } return false; @@ -1924,7 +1924,7 @@ bool SwTable::GetInfo( SfxPoolItem& rInfo ) const break; } case RES_FINDNEARESTNODE: - if( GetFrmFmt() && ((SwFmtPageDesc&)GetFrmFmt()->GetFmtAttr( + if( GetFrmFmt() && static_cast<const SwFmtPageDesc&>(GetFrmFmt()->GetFmtAttr( RES_PAGEDESC )).GetPageDesc() && !m_TabSortContentBoxes.empty() && m_TabSortContentBoxes[0]->GetSttNd()->GetNodes().IsDocNodes() ) @@ -1933,7 +1933,7 @@ bool SwTable::GetInfo( SfxPoolItem& rInfo ) const break; case RES_CONTENT_VISIBLE: - ((SwPtrMsgPoolItem&)rInfo).pObject = SwIterator<SwFrm,SwFmt>::FirstElement( *GetFrmFmt() ); + static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFmt>::FirstElement( *GetFrmFmt() ); return false; } return true; @@ -1987,10 +1987,10 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol, if( bChgAlign ) { pItem = &pTNd->SwCntntNode::GetAttr( RES_PARATR_ADJUST ); - SvxAdjust eAdjust = ((SvxAdjustItem*)pItem)->GetAdjust(); + SvxAdjust eAdjust = static_cast<const SvxAdjustItem*>(pItem)->GetAdjust(); if( SVX_ADJUST_LEFT == eAdjust || SVX_ADJUST_BLOCK == eAdjust ) { - SvxAdjustItem aAdjust( *(SvxAdjustItem*)pItem ); + SvxAdjustItem aAdjust( *static_cast<const SvxAdjustItem*>(pItem) ); aAdjust.SetAdjust( SVX_ADJUST_RIGHT ); pTNd->SetAttr( aAdjust ); } @@ -2002,7 +2002,7 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol, pItem = 0; const Color* pOldNumFmtColor = rBox.GetSaveNumFmtColor(); - const Color* pNewUserColor = pItem ? &((SvxColorItem*)pItem)->GetValue() : 0; + const Color* pNewUserColor = pItem ? &static_cast<const SvxColorItem*>(pItem)->GetValue() : 0; if( ( pNewUserColor && pOldNumFmtColor && *pNewUserColor == *pOldNumFmtColor ) || @@ -2076,7 +2076,7 @@ void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol, if( bChgAlign && ( SfxItemState::SET != rBox.GetFrmFmt()->GetItemState( RES_VERT_ORIENT, true, &pItem ) || - text::VertOrientation::TOP == ((SwFmtVertOrient*)pItem)->GetVertOrient() )) + text::VertOrientation::TOP == static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() )) { rBox.GetFrmFmt()->SetFmtAttr( SwFmtVertOrient( 0, text::VertOrientation::BOTTOM )); } @@ -2119,7 +2119,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt ) // assign adjustment if( bChgAlign && pAttrSet && SfxItemState::SET == pAttrSet->GetItemState( RES_PARATR_ADJUST, false, &pItem ) && - SVX_ADJUST_RIGHT == ((SvxAdjustItem*)pItem)->GetAdjust() ) + SVX_ADJUST_RIGHT == static_cast<const SvxAdjustItem*>(pItem)->GetAdjust() ) { pTNd->SetAttr( SvxAdjustItem( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ) ); } @@ -2130,7 +2130,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt ) pItem = 0; const Color* pOldNumFmtColor = rBox.GetSaveNumFmtColor(); - const Color* pNewUserColor = pItem ? &((SvxColorItem*)pItem)->GetValue() : 0; + const Color* pNewUserColor = pItem ? &static_cast<const SvxColorItem*>(pItem)->GetValue() : 0; if( ( pNewUserColor && pOldNumFmtColor && *pNewUserColor == *pOldNumFmtColor ) || @@ -2165,7 +2165,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt ) if( bChgAlign && SfxItemState::SET == rBox.GetFrmFmt()->GetItemState( RES_VERT_ORIENT, false, &pItem ) && - text::VertOrientation::BOTTOM == ((SwFmtVertOrient*)pItem)->GetVertOrient() ) + text::VertOrientation::BOTTOM == static_cast<const SwFmtVertOrient*>(pItem)->GetVertOrient() ) { rBox.GetFrmFmt()->SetFmtAttr( SwFmtVertOrient( 0, text::VertOrientation::TOP )); } @@ -2186,10 +2186,10 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { case RES_ATTRSET_CHG: { - const SfxItemSet& rSet = *((SwAttrSetChg*)pNew)->GetChgSet(); + const SfxItemSet& rSet = *static_cast<const SwAttrSetChg*>(pNew)->GetChgSet(); if( SfxItemState::SET == rSet.GetItemState( RES_BOXATR_FORMAT, false, (const SfxPoolItem**)&pNewFmt ) ) - nOldFmt = ((SwTblBoxNumFormat&)((SwAttrSetChg*)pOld)-> + nOldFmt = static_cast<const SwTblBoxNumFormat&>(static_cast<const SwAttrSetChg*>(pOld)-> GetChgSet()->Get( RES_BOXATR_FORMAT )).GetValue(); rSet.GetItemState( RES_BOXATR_FORMULA, false, (const SfxPoolItem**)&pNewFml ); @@ -2198,14 +2198,14 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) break; } case RES_BOXATR_FORMAT: - pNewFmt = (SwTblBoxNumFormat*)pNew; - nOldFmt = ((SwTblBoxNumFormat*)pOld)->GetValue(); + pNewFmt = static_cast<const SwTblBoxNumFormat*>(pNew); + nOldFmt = static_cast<const SwTblBoxNumFormat*>(pOld)->GetValue(); break; case RES_BOXATR_FORMULA: - pNewFml = (SwTblBoxFormula*)pNew; + pNewFml = static_cast<const SwTblBoxFormula*>(pNew); break; case RES_BOXATR_VALUE: - pNewVal = (SwTblBoxValue*)pNew; + pNewVal = static_cast<const SwTblBoxValue*>(pNew); break; } @@ -2394,7 +2394,7 @@ bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, const SfxPoolItem* pItem; if( SfxItemState::SET == GetFrmFmt()->GetItemState( RES_BOXATR_FORMAT, false, &pItem )) { - rFmtIndex = ((SwTblBoxNumFormat*)pItem)->GetValue(); + rFmtIndex = static_cast<const SwTblBoxNumFormat*>(pItem)->GetValue(); // Special casing for percent if( !rIsEmptyTxtNd && NUMBERFORMAT_PERCENT == pNumFmtr->GetType( rFmtIndex )) { @@ -2554,14 +2554,14 @@ void SwTableBox::ActualiseValueBox() if( SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_FORMAT, true, &pFmtItem ) && SfxItemState::SET == pFmt->GetItemState( RES_BOXATR_VALUE, true, &pValItem )) { - const sal_uLong nFmtId = ((SwTblBoxNumFormat*)pFmtItem)->GetValue(); + const sal_uLong nFmtId = static_cast<const SwTblBoxNumFormat*>(pFmtItem)->GetValue(); sal_uLong nNdPos = ULONG_MAX; SvNumberFormatter* pNumFmtr = pFmt->GetDoc()->GetNumberFormatter(); if( !pNumFmtr->IsTextFormat( nFmtId ) && ULONG_MAX != (nNdPos = IsValidNumTxtNd( true )) ) { - double fVal = ((SwTblBoxValue*)pValItem)->GetValue(); + double fVal = static_cast<const SwTblBoxValue*>(pValItem)->GetValue(); Color* pCol = 0; OUString sNewTxt; pNumFmtr->GetOutputString( fVal, nFmtId, sNewTxt, &pCol ); diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index a9e174e1e7b2..d5935f4fde22 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1595,7 +1595,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() vcl::PDFNote aNote; // Use the NumberFormatter to get the date string: - const SwPostItField* pField = (SwPostItField*)pFirst->GetField(); + const SwPostItField* pField = static_cast<SwPostItField*>(pFirst->GetField()); SvNumberFormatter* pNumFormatter = pDoc->GetNumberFormatter(); const Date aDateDiff( pField->GetDate() - *pNumFormatter->GetNullDate() ); @@ -1847,7 +1847,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // Destination Rectangle const SwGetRefField* pField = - (SwGetRefField*)pFirst->GetField(); + static_cast<SwGetRefField*>(pFirst->GetField()); const OUString& rRefName = pField->GetSetRefName(); mrSh.GotoRefMark( rRefName, pField->GetSubType(), pField->GetSeqNo() ); const SwRect& rDestRect = mrSh.GetCharRect(); diff --git a/sw/source/core/text/SwGrammarMarkUp.cxx b/sw/source/core/text/SwGrammarMarkUp.cxx index 1d34f00380f3..d25ac883ff88 100644 --- a/sw/source/core/text/SwGrammarMarkUp.cxx +++ b/sw/source/core/text/SwGrammarMarkUp.cxx @@ -32,7 +32,7 @@ SwWrongList* SwGrammarMarkUp::Clone() void SwGrammarMarkUp::CopyFrom( const SwWrongList& rCopy ) { - maSentence = ((const SwGrammarMarkUp&)rCopy).maSentence; + maSentence = static_cast<const SwGrammarMarkUp&>(rCopy).maSentence; SwWrongList::CopyFrom( rCopy ); } @@ -57,7 +57,7 @@ void SwGrammarMarkUp::MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff ) SwGrammarMarkUp* SwGrammarMarkUp::SplitGrammarList( sal_Int32 nSplitPos ) { - SwGrammarMarkUp* pNew = (SwGrammarMarkUp*)SplitList( nSplitPos ); + SwGrammarMarkUp* pNew = static_cast<SwGrammarMarkUp*>(SplitList( nSplitPos )); if( !maSentence.size() ) return pNew; std::vector< sal_Int32 >::iterator pIter = maSentence.begin(); diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 0f12f74103a9..55a6f98f14c0 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -143,9 +143,9 @@ const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr ) else { // Get the attributes from the template - SwCharFmt* pFmt = RES_TXTATR_INETFMT == rAttr.Which() ? - ((SwFmtINetFmt&)rAttr).GetTxtINetFmt()->GetCharFmt() : - ((SwFmtCharFmt&)rAttr).GetCharFmt(); + const SwCharFmt* pFmt = RES_TXTATR_INETFMT == rAttr.Which() ? + static_cast<const SwFmtINetFmt&>(rAttr).GetTxtINetFmt()->GetCharFmt() : + static_cast<const SwFmtCharFmt&>(rAttr).GetCharFmt(); if( pFmt ) { pSet = &pFmt->GetAttrSet(); @@ -225,7 +225,7 @@ static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, const SwCharFmt* pTmpFmt = rINetAttr.GetCharFmt(); const SfxPoolItem* pItem; if (SfxItemState::SET == pTmpFmt->GetItemState(RES_CHRATR_COLOR, true, &pItem)) - *pColor = ((SvxColorItem*)pItem)->GetValue(); + *pColor = static_cast<const SvxColorItem*>(pItem)->GetValue(); rINetAttr.SetVisited(true); } return true; @@ -598,11 +598,11 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr ) if ( pTwoLineAttr ) { const SfxPoolItem* pTwoLineItem = CharFmt::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES ); - bTwoLineAct = ((SvxTwoLinesItem*)pTwoLineItem)->GetValue(); + bTwoLineAct = static_cast<const SvxTwoLinesItem*>(pTwoLineItem)->GetValue(); } else bTwoLineAct = - ((SvxTwoLinesItem*)pDefaultArray[ nTwoLineStack ])->GetValue(); + static_cast<const SvxTwoLinesItem*>(pDefaultArray[ nTwoLineStack ])->GetValue(); if ( bTwoLineAct ) return; @@ -614,12 +614,12 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr ) if ( pRotateAttr ) { const SfxPoolItem* pRotateItem = CharFmt::GetItem( *pRotateAttr, RES_CHRATR_ROTATE ); - rFnt.SetVertical( ((SvxCharRotateItem*)pRotateItem)->GetValue(), + rFnt.SetVertical( static_cast<const SvxCharRotateItem*>(pRotateItem)->GetValue(), bVertLayout ); } else rFnt.SetVertical( - ((SvxCharRotateItem*)pDefaultArray[ nRotateStack ])->GetValue(), + static_cast<const SvxCharRotateItem*>(pDefaultArray[ nRotateStack ])->GetValue(), bVertLayout ); } @@ -637,42 +637,42 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) switch ( rItem.Which() ) { case RES_CHRATR_CASEMAP : - rFnt.SetCaseMap( ((SvxCaseMapItem&)rItem).GetCaseMap() ); + rFnt.SetCaseMap( static_cast<const SvxCaseMapItem&>(rItem).GetCaseMap() ); break; case RES_CHRATR_COLOR : - rFnt.SetColor( ((SvxColorItem&)rItem).GetValue() ); + rFnt.SetColor( static_cast<const SvxColorItem&>(rItem).GetValue() ); break; case RES_CHRATR_CONTOUR : - rFnt.SetOutline( ((SvxContourItem&)rItem).GetValue() ); + rFnt.SetOutline( static_cast<const SvxContourItem&>(rItem).GetValue() ); break; case RES_CHRATR_CROSSEDOUT : - rFnt.SetStrikeout( ((SvxCrossedOutItem&)rItem).GetStrikeout() ); + rFnt.SetStrikeout( static_cast<const SvxCrossedOutItem&>(rItem).GetStrikeout() ); break; case RES_CHRATR_ESCAPEMENT : - rFnt.SetEscapement( ((SvxEscapementItem&)rItem).GetEsc() ); - rFnt.SetProportion( ((SvxEscapementItem&)rItem).GetProp() ); + rFnt.SetEscapement( static_cast<const SvxEscapementItem&>(rItem).GetEsc() ); + rFnt.SetProportion( static_cast<const SvxEscapementItem&>(rItem).GetProp() ); break; case RES_CHRATR_FONT : - rFnt.SetName( ((SvxFontItem&)rItem).GetFamilyName(), SW_LATIN ); - rFnt.SetStyleName( ((SvxFontItem&)rItem).GetStyleName(), SW_LATIN ); - rFnt.SetFamily( ((SvxFontItem&)rItem).GetFamily(), SW_LATIN ); - rFnt.SetPitch( ((SvxFontItem&)rItem).GetPitch(), SW_LATIN ); - rFnt.SetCharSet( ((SvxFontItem&)rItem).GetCharSet(), SW_LATIN ); + rFnt.SetName( static_cast<const SvxFontItem&>(rItem).GetFamilyName(), SW_LATIN ); + rFnt.SetStyleName( static_cast<const SvxFontItem&>(rItem).GetStyleName(), SW_LATIN ); + rFnt.SetFamily( static_cast<const SvxFontItem&>(rItem).GetFamily(), SW_LATIN ); + rFnt.SetPitch( static_cast<const SvxFontItem&>(rItem).GetPitch(), SW_LATIN ); + rFnt.SetCharSet( static_cast<const SvxFontItem&>(rItem).GetCharSet(), SW_LATIN ); break; case RES_CHRATR_FONTSIZE : - rFnt.SetSize(Size(0,((SvxFontHeightItem&)rItem).GetHeight() ), SW_LATIN ); + rFnt.SetSize(Size(0,static_cast<const SvxFontHeightItem&>(rItem).GetHeight() ), SW_LATIN ); break; case RES_CHRATR_KERNING : - rFnt.SetFixKerning( ((SvxKerningItem&)rItem).GetValue() ); + rFnt.SetFixKerning( static_cast<const SvxKerningItem&>(rItem).GetValue() ); break; case RES_CHRATR_LANGUAGE : - rFnt.SetLanguage( ((SvxLanguageItem&)rItem).GetLanguage(), SW_LATIN ); + rFnt.SetLanguage( static_cast<const SvxLanguageItem&>(rItem).GetLanguage(), SW_LATIN ); break; case RES_CHRATR_POSTURE : - rFnt.SetItalic( ((SvxPostureItem&)rItem).GetPosture(), SW_LATIN ); + rFnt.SetItalic( static_cast<const SvxPostureItem&>(rItem).GetPosture(), SW_LATIN ); break; case RES_CHRATR_SHADOWED : - rFnt.SetShadow( ((SvxShadowedItem&)rItem).GetValue() ); + rFnt.SetShadow( static_cast<const SvxShadowedItem&>(rItem).GetValue() ); break; case RES_CHRATR_UNDERLINE : { @@ -686,8 +686,8 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) if( (mpShell && !mpShell->GetWin()) || (pTmpItem && !static_cast<const SvxCharHiddenItem*>(pTmpItem)->GetValue()) ) { - rFnt.SetUnderline( ((SvxUnderlineItem&)rItem).GetLineStyle() ); - rFnt.SetUnderColor( ((SvxUnderlineItem&)rItem).GetColor() ); + rFnt.SetUnderline( static_cast<const SvxUnderlineItem&>(rItem).GetLineStyle() ); + rFnt.SetUnderColor( static_cast<const SvxUnderlineItem&>(rItem).GetColor() ); } break; } @@ -713,17 +713,17 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) break; } case RES_CHRATR_OVERLINE : - rFnt.SetOverline( ((SvxOverlineItem&)rItem).GetLineStyle() ); - rFnt.SetOverColor( ((SvxOverlineItem&)rItem).GetColor() ); + rFnt.SetOverline( static_cast<const SvxOverlineItem&>(rItem).GetLineStyle() ); + rFnt.SetOverColor( static_cast<const SvxOverlineItem&>(rItem).GetColor() ); break; case RES_CHRATR_WEIGHT : - rFnt.SetWeight( ((SvxWeightItem&)rItem).GetWeight(), SW_LATIN ); + rFnt.SetWeight( static_cast<const SvxWeightItem&>(rItem).GetWeight(), SW_LATIN ); break; case RES_CHRATR_WORDLINEMODE : - rFnt.SetWordLineMode( ((SvxWordLineModeItem&)rItem).GetValue() ); + rFnt.SetWordLineMode( static_cast<const SvxWordLineModeItem&>(rItem).GetValue() ); break; case RES_CHRATR_AUTOKERN : - if( ((SvxAutoKernItem&)rItem).GetValue() ) + if( static_cast<const SvxAutoKernItem&>(rItem).GetValue() ) { rFnt.SetAutoKern( ( !mpIDocumentSettingAccess || !mpIDocumentSettingAccess->get(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION) ) ? @@ -734,67 +734,67 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) rFnt.SetAutoKern( 0 ); break; case RES_CHRATR_BLINK : - rFnt.SetBlink( ((SvxBlinkItem&)rItem).GetValue() ); + rFnt.SetBlink( static_cast<const SvxBlinkItem&>(rItem).GetValue() ); break; case RES_CHRATR_BACKGROUND : - rFnt.SetBackColor(new Color( ((SvxBrushItem&)rItem).GetColor() ) ); + rFnt.SetBackColor(new Color( static_cast<const SvxBrushItem&>(rItem).GetColor() ) ); break; case RES_CHRATR_HIGHLIGHT : - rFnt.SetHighlightColor( ((SvxBrushItem&)rItem).GetColor() ); + rFnt.SetHighlightColor( static_cast<const SvxBrushItem&>(rItem).GetColor() ); break; case RES_CHRATR_CJK_FONT : - rFnt.SetName( ((SvxFontItem&)rItem).GetFamilyName(), SW_CJK ); - rFnt.SetStyleName( ((SvxFontItem&)rItem).GetStyleName(), SW_CJK ); - rFnt.SetFamily( ((SvxFontItem&)rItem).GetFamily(), SW_CJK ); - rFnt.SetPitch( ((SvxFontItem&)rItem).GetPitch(), SW_CJK ); - rFnt.SetCharSet( ((SvxFontItem&)rItem).GetCharSet(), SW_CJK ); + rFnt.SetName( static_cast<const SvxFontItem&>(rItem).GetFamilyName(), SW_CJK ); + rFnt.SetStyleName( static_cast<const SvxFontItem&>(rItem).GetStyleName(), SW_CJK ); + rFnt.SetFamily( static_cast<const SvxFontItem&>(rItem).GetFamily(), SW_CJK ); + rFnt.SetPitch( static_cast<const SvxFontItem&>(rItem).GetPitch(), SW_CJK ); + rFnt.SetCharSet( static_cast<const SvxFontItem&>(rItem).GetCharSet(), SW_CJK ); break; case RES_CHRATR_CJK_FONTSIZE : - rFnt.SetSize(Size( 0, ((SvxFontHeightItem&)rItem).GetHeight()), SW_CJK); + rFnt.SetSize(Size( 0, static_cast<const SvxFontHeightItem&>(rItem).GetHeight()), SW_CJK); break; case RES_CHRATR_CJK_LANGUAGE : - rFnt.SetLanguage( ((SvxLanguageItem&)rItem).GetLanguage(), SW_CJK ); + rFnt.SetLanguage( static_cast<const SvxLanguageItem&>(rItem).GetLanguage(), SW_CJK ); break; case RES_CHRATR_CJK_POSTURE : - rFnt.SetItalic( ((SvxPostureItem&)rItem).GetPosture(), SW_CJK ); + rFnt.SetItalic( static_cast<const SvxPostureItem&>(rItem).GetPosture(), SW_CJK ); break; case RES_CHRATR_CJK_WEIGHT : - rFnt.SetWeight( ((SvxWeightItem&)rItem).GetWeight(), SW_CJK ); + rFnt.SetWeight( static_cast<const SvxWeightItem&>(rItem).GetWeight(), SW_CJK ); break; case RES_CHRATR_CTL_FONT : - rFnt.SetName( ((SvxFontItem&)rItem).GetFamilyName(), SW_CTL ); - rFnt.SetStyleName( ((SvxFontItem&)rItem).GetStyleName(), SW_CTL ); - rFnt.SetFamily( ((SvxFontItem&)rItem).GetFamily(), SW_CTL ); - rFnt.SetPitch( ((SvxFontItem&)rItem).GetPitch(), SW_CTL ); - rFnt.SetCharSet( ((SvxFontItem&)rItem).GetCharSet(), SW_CTL ); + rFnt.SetName( static_cast<const SvxFontItem&>(rItem).GetFamilyName(), SW_CTL ); + rFnt.SetStyleName( static_cast<const SvxFontItem&>(rItem).GetStyleName(), SW_CTL ); + rFnt.SetFamily( static_cast<const SvxFontItem&>(rItem).GetFamily(), SW_CTL ); + rFnt.SetPitch( static_cast<const SvxFontItem&>(rItem).GetPitch(), SW_CTL ); + rFnt.SetCharSet( static_cast<const SvxFontItem&>(rItem).GetCharSet(), SW_CTL ); break; case RES_CHRATR_CTL_FONTSIZE : - rFnt.SetSize(Size(0, ((SvxFontHeightItem&)rItem).GetHeight() ), SW_CTL); + rFnt.SetSize(Size(0, static_cast<const SvxFontHeightItem&>(rItem).GetHeight() ), SW_CTL); break; case RES_CHRATR_CTL_LANGUAGE : - rFnt.SetLanguage( ((SvxLanguageItem&)rItem).GetLanguage(), SW_CTL ); + rFnt.SetLanguage( static_cast<const SvxLanguageItem&>(rItem).GetLanguage(), SW_CTL ); break; case RES_CHRATR_CTL_POSTURE : - rFnt.SetItalic( ((SvxPostureItem&)rItem).GetPosture(), SW_CTL ); + rFnt.SetItalic( static_cast<const SvxPostureItem&>(rItem).GetPosture(), SW_CTL ); break; case RES_CHRATR_CTL_WEIGHT : - rFnt.SetWeight( ((SvxWeightItem&)rItem).GetWeight(), SW_CTL ); + rFnt.SetWeight( static_cast<const SvxWeightItem&>(rItem).GetWeight(), SW_CTL ); break; case RES_CHRATR_EMPHASIS_MARK : rFnt.SetEmphasisMark( - ((SvxEmphasisMarkItem&)rItem).GetEmphasisMark() + static_cast<const SvxEmphasisMarkItem&>(rItem).GetEmphasisMark() ); break; case RES_CHRATR_SCALEW : - rFnt.SetPropWidth( ((SvxCharScaleWidthItem&)rItem).GetValue() ); + rFnt.SetPropWidth( static_cast<const SvxCharScaleWidthItem&>(rItem).GetValue() ); break; case RES_CHRATR_RELIEF : - rFnt.SetRelief( (FontRelief)((SvxCharReliefItem&)rItem).GetValue() ); + rFnt.SetRelief( (FontRelief)static_cast<const SvxCharReliefItem&>(rItem).GetValue() ); break; case RES_CHRATR_HIDDEN : if( mpShell && mpShell->GetWin()) { - if ( ((SvxCharHiddenItem&)rItem).GetValue() ) + if ( static_cast<const SvxCharHiddenItem&>(rItem).GetValue() ) rFnt.SetUnderline( UNDERLINE_DOTTED ); else ActivateTop( rFnt, RES_CHRATR_UNDERLINE ); @@ -819,14 +819,14 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) if ( pTwoLineAttr ) { const SfxPoolItem* pTwoLineItem = CharFmt::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES ); - bTwoLineAct = ((SvxTwoLinesItem*)pTwoLineItem)->GetValue(); + bTwoLineAct = static_cast<const SvxTwoLinesItem*>(pTwoLineItem)->GetValue(); } else bTwoLineAct = - ((SvxTwoLinesItem*)pDefaultArray[ nTwoLineStack ])->GetValue(); + static_cast<const SvxTwoLinesItem*>(pDefaultArray[ nTwoLineStack ])->GetValue(); if ( !bTwoLineAct ) - rFnt.SetVertical( ((SvxCharRotateItem&)rItem).GetValue(), + rFnt.SetVertical( static_cast<const SvxCharRotateItem&>(rItem).GetValue(), bVertLayout ); break; @@ -839,7 +839,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) // two line is activated, if // 1. no ruby attribute is set and // 2. attribute is active - if ( !bRuby && ((SvxTwoLinesItem&)rItem).GetValue() ) + if ( !bRuby && static_cast<const SvxTwoLinesItem&>(rItem).GetValue() ) { rFnt.SetVertical( 0, bVertLayout ); break; @@ -856,12 +856,12 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) if ( pRotateAttr ) { const SfxPoolItem* pRotateItem = CharFmt::GetItem( *pRotateAttr, RES_CHRATR_ROTATE ); - rFnt.SetVertical( ((SvxCharRotateItem*)pRotateItem)->GetValue(), + rFnt.SetVertical( static_cast<const SvxCharRotateItem*>(pRotateItem)->GetValue(), bVertLayout ); } else rFnt.SetVertical( - ((SvxCharRotateItem*)pDefaultArray[ nRotateStack ])->GetValue(), + static_cast<const SvxCharRotateItem*>(pDefaultArray[ nRotateStack ])->GetValue(), bVertLayout ); break; diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 9fb4baebb7b8..3323d22bf821 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -134,7 +134,7 @@ void SwBlink::Insert( const Point& rPoint, const SwLinePortion* pPor, aList.insert( pBlinkPor ); pTxtFrm->SetBlinkPor(); if( pPor->IsLayPortion() || pPor->IsParaPortion() ) - ((SwLineLayout*)pPor)->SetBlinking(); + const_cast<SwLineLayout*>(static_cast<const SwLineLayout*>(pPor))->SetBlinking(); if( !aTimer.IsActive() ) aTimer.Start(); diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 445720fce791..c5dead749156 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -908,7 +908,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, sal_Int32 nI if ( bRight ) { bool bRecurse = pPor && pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->IsBidi(); + static_cast<const SwMultiPortion*>(pPor)->IsBidi(); // 1. special case: at beginning of bidi portion if ( bRecurse && nIdx == nPos ) @@ -930,7 +930,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, sal_Int32 nI // 2. special case: at beginning of portion after bidi portion else if ( pLast && pLast->IsMultiPortion() && - ((SwMultiPortion*)pLast)->IsBidi() && nIdx == nPos ) + static_cast<const SwMultiPortion*>(pLast)->IsBidi() && nIdx == nPos ) { // enter bidi portion if ( nCrsrLevel != nDefaultDir ) @@ -944,7 +944,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, sal_Int32 nI // Recursion if ( bRecurse ) { - const SwLineLayout& rLine = ((SwMultiPortion*)pPor)->GetRoot(); + const SwLineLayout& rLine = static_cast<const SwMultiPortion*>(pPor)->GetRoot(); sal_Int32 nTmpPos = nPos - nIdx; bool bTmpForward = ! bRight; sal_uInt8 nTmpCrsrLevel = nCrsrLevel; @@ -966,7 +966,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, sal_Int32 nI } else { - bool bRecurse = pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi(); + bool bRecurse = pPor && pPor->IsMultiPortion() && static_cast<const SwMultiPortion*>(pPor)->IsBidi(); // 1. special case: at beginning of bidi portion if ( bRecurse && nIdx == nPos ) @@ -980,7 +980,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, sal_Int32 nI // 2. special case: at beginning of portion after bidi portion else if ( pLast && pLast->IsMultiPortion() && - ((SwMultiPortion*)pLast)->IsBidi() && nIdx == nPos ) + static_cast<const SwMultiPortion*>(pLast)->IsBidi() && nIdx == nPos ) { nPos = nPos - pLast->GetLen(); @@ -1003,7 +1003,7 @@ static void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, sal_Int32 nI // go forward if ( bRecurse ) { - const SwLineLayout& rLine = ((SwMultiPortion*)pPor)->GetRoot(); + const SwLineLayout& rLine = static_cast<const SwMultiPortion*>(pPor)->GetRoot(); sal_Int32 nTmpPos = nPos - nIdx; bool bTmpForward = ! bRight; sal_uInt8 nTmpCrsrLevel = nCrsrLevel; @@ -1257,7 +1257,7 @@ bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset, if( pTmpFollow ) { aCharBox.Pos().Y() = pTmpFollow->Frm().Top() + 1; - return ((SwTxtFrm*)pTmpFollow)->GetKeyCrsrOfst( pPam->GetPoint(), + return static_cast<const SwTxtFrm*>(pTmpFollow)->GetKeyCrsrOfst( pPam->GetPoint(), aCharBox.Pos() ); } return SwCntntFrm::UnitDown( pPam, nOffset, bSetInReadOnly ); @@ -1297,17 +1297,17 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const if( !rFill.bColumn && GetUpper()->IsColBodyFrm() ) // ColumnFrms now with BodyFrm { const SwColumnFrm* pTmp = - (SwColumnFrm*)GetUpper()->GetUpper()->GetUpper()->Lower(); // The 1st column + static_cast<const SwColumnFrm*>(GetUpper()->GetUpper()->GetUpper()->Lower()); // The 1st column // The first SwFrm in BodyFrm of the first column - const SwFrm* pFrm = ((SwLayoutFrm*)pTmp->Lower())->Lower(); + const SwFrm* pFrm = static_cast<const SwLayoutFrm*>(pTmp->Lower())->Lower(); sal_uInt16 nNextCol = 0; // In which column do we end up in? while( rFill.X() > pTmp->Frm().Right() && pTmp->GetNext() ) { - pTmp = (SwColumnFrm*)pTmp->GetNext(); - if( ((SwLayoutFrm*)pTmp->Lower())->Lower() ) // ColumnFrms now with BodyFrm + pTmp = static_cast<const SwColumnFrm*>(pTmp->GetNext()); + if( static_cast<const SwLayoutFrm*>(pTmp->Lower())->Lower() ) // ColumnFrms now with BodyFrm { - pFrm = ((SwLayoutFrm*)pTmp->Lower())->Lower(); + pFrm = static_cast<const SwLayoutFrm*>(pTmp->Lower())->Lower(); nNextCol = 0; } else @@ -1335,7 +1335,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const rFill.bColumn = true; if( rFill.pPos ) { - SwTxtNode* pTxtNd = ((SwTxtFrm*)pFrm)->GetTxtNode(); + SwTxtNode* pTxtNd = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pFrm))->GetTxtNode(); rFill.pPos->nNode = *pTxtNd; rFill.pPos->nContent.Assign( pTxtNd, pTxtNd->GetTxt().getLength()); @@ -1347,7 +1347,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const } else rFill.aFrm = pFrm->Frm(); - ((SwTxtFrm*)pFrm)->FillCrsrPos( rFill ); + static_cast<const SwTxtFrm*>(pFrm)->FillCrsrPos( rFill ); } return; } @@ -1526,8 +1526,8 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const else { const SvxTabStopItem& rTab = - (const SvxTabStopItem &)pSet-> - GetPool()->GetDefaultItem( RES_PARATR_TABSTOP ); + static_cast<const SvxTabStopItem &>(pSet-> + GetPool()->GetDefaultItem( RES_PARATR_TABSTOP )); const SwTwips nDefTabDist = rTab[0].GetTabPos(); nRightTab = nLeftTab - nTxtLeft; nRightTab /= nDefTabDist; diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 14bc83e8d3bc..3fe5aa816cd8 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -120,11 +120,11 @@ void _ValidateBodyFrm( SwFrm *pFrm ) pFrm->Calc(); else { - const bool bOld = ((SwSectionFrm*)pFrm)->IsCntntLocked(); - ((SwSectionFrm*)pFrm)->SetCntntLock( true ); + const bool bOld = static_cast<SwSectionFrm*>(pFrm)->IsCntntLocked(); + static_cast<SwSectionFrm*>(pFrm)->SetCntntLock( true ); pFrm->Calc(); if( !bOld ) - ((SwSectionFrm*)pFrm)->SetCntntLock( false ); + static_cast<SwSectionFrm*>(pFrm)->SetCntntLock( false ); } } } @@ -621,13 +621,13 @@ SwCntntFrm *SwTxtFrm::JoinFrm() { if( !pEndBoss ) pEndBoss = pFoll->FindFtnBossFrm(); - pEndBoss->ChangeFtnRef( pFoll, (SwTxtFtn*)pHt, this ); + pEndBoss->ChangeFtnRef( pFoll, static_cast<const SwTxtFtn*>(pHt), this ); } else { if( !pFtnBoss ) pFtnBoss = pFoll->FindFtnBossFrm( true ); - pFtnBoss->ChangeFtnRef( pFoll, (SwTxtFtn*)pHt, this ); + pFtnBoss->ChangeFtnRef( pFoll, static_cast<const SwTxtFtn*>(pHt), this ); } SetFtn( true ); } @@ -674,7 +674,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const sal_Int32 nTxtPos ) // The Paste sends a Modify() to me // I lock myself, so that my data does not disappear SwTxtFrmLocker aLock( this ); - SwTxtFrm *pNew = (SwTxtFrm *)(GetTxtNode()->MakeFrm( this )); + SwTxtFrm *pNew = static_cast<SwTxtFrm *>(GetTxtNode()->MakeFrm( this )); pNew->SetFollow( GetFollow() ); SetFollow( pNew ); @@ -714,13 +714,13 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const sal_Int32 nTxtPos ) { if( !pEndBoss ) pEndBoss = FindFtnBossFrm(); - pEndBoss->ChangeFtnRef( this, (SwTxtFtn*)pHt, pNew ); + pEndBoss->ChangeFtnRef( this, static_cast<const SwTxtFtn*>(pHt), pNew ); } else { if( !pFtnBoss ) pFtnBoss = FindFtnBossFrm( true ); - pFtnBoss->ChangeFtnRef( this, (SwTxtFtn*)pHt, pNew ); + pFtnBoss->ChangeFtnRef( this, static_cast<const SwTxtFtn*>(pHt), pNew ); } pNew->SetFtn( true ); } diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx index 95feb445d2d9..861c7ed7f692 100644 --- a/sw/source/core/text/guess.cxx +++ b/sw/source/core/text/guess.cxx @@ -262,7 +262,7 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf, CH_TXTATR_BREAKWORD == ( cFldChr = rInf.GetTxt()[ rInf.GetIdx() - 1 ] ) ) { - SwFldPortion* pFld = (SwFldPortion*)rInf.GetLast(); + SwFldPortion* pFld = static_cast<SwFldPortion*>(rInf.GetLast()); OUString aTxt; pFld->GetExpTxt( rInf, aTxt ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index a03a0be3f94a..83c9fbe1567b 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -695,7 +695,7 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor, { Size aSize( rPor.Width(), rPor.Height() ); if( rPor.IsHangingPortion() ) - aSize.Width() = ((SwHangingPortion&)rPor).GetInnerWidth(); + aSize.Width() = static_cast<const SwHangingPortion&>(rPor).GetInnerWidth(); if( rPor.InSpaceGrp() && GetSpaceAdd() ) { SwTwips nAdd = rPor.CalcSpacing( GetSpaceAdd(), *this ); @@ -907,7 +907,7 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic, m_pOut->DrawRect( rRect.SVRect() ); else { - if(pBrushItem != ((SvxBrushItem*)-1)) + if(pBrushItem != reinterpret_cast<SvxBrushItem*>(-1)) { ::DrawGraphic( pBrushItem, m_pOut, aItemRect, rRect ); } @@ -962,9 +962,9 @@ void SwTxtPaintInfo::DrawLineBreak( const SwLinePortion &rPor ) const void SwTxtPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const { Size aSize( SPECIAL_FONT_HEIGHT, SPECIAL_FONT_HEIGHT ); - SwRect aRect( ((SwArrowPortion&)rPor).GetPos(), aSize ); + SwRect aRect( static_cast<const SwArrowPortion&>(rPor).GetPos(), aSize ); sal_Unicode cChar; - if( ((SwArrowPortion&)rPor).IsLeft() ) + if( static_cast<const SwArrowPortion&>(rPor).IsLeft() ) { aRect.Pos().Y() += 20 - GetAscent(); aRect.Pos().X() += 20; @@ -1394,7 +1394,7 @@ void SwTxtFormatInfo::Init() // there is a master for this follow and the master does not have // any contents (especially it does not have a number portion) bNumDone = ! pTmpPara || - ! ((SwParaPortion*)pTmpPara)->GetFirstPortion()->IsFlyPortion(); + ! static_cast<const SwParaPortion*>(pTmpPara)->GetFirstPortion()->IsFlyPortion(); } pRoot = 0; @@ -1480,7 +1480,7 @@ bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) const sal_uInt16 nHeight = pCurr->GetRealHeight(); for( SwLinePortion *pPor = pCurr->GetPortion(); pPor; pPor = pPor->GetPortion() ) { - if( pPor->IsFtnPortion() && nHeight > ((SwFtnPortion*)pPor)->Orig() ) + if( pPor->IsFtnPortion() && nHeight > static_cast<SwFtnPortion*>(pPor)->Orig() ) { SetLineHeight( nHeight ); SetLineNetHeight( pCurr->Height() ); @@ -1655,15 +1655,15 @@ SwTxtSlot::SwTxtSlot( const sal_uInt16 nPos = pOldSmartTagList->GetWrongPos(nIdx); const sal_Int32 nListPos = pOldSmartTagList->Pos(nPos); if( nListPos == nIdx ) - ((SwTxtPaintInfo*)pInf)->SetSmartTags( pOldSmartTagList->SubList( nPos ) ); + static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( pOldSmartTagList->SubList( nPos ) ); else if( !pTempList && nPos < pOldSmartTagList->Count() && nListPos < nIdx && !aTxt.isEmpty() ) { pTempList = new SwWrongList( WRONGLIST_SMARTTAG ); pTempList->Insert( OUString(), 0, 0, aTxt.getLength(), 0 ); - ((SwTxtPaintInfo*)pInf)->SetSmartTags( pTempList ); + static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( pTempList ); } else - ((SwTxtPaintInfo*)pInf)->SetSmartTags( 0); + static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( 0); } pOldGrammarCheckList = static_cast<SwTxtPaintInfo*>(pInf)->GetGrammarCheckList(); if ( pOldGrammarCheckList ) @@ -1671,15 +1671,15 @@ SwTxtSlot::SwTxtSlot( const sal_uInt16 nPos = pOldGrammarCheckList->GetWrongPos(nIdx); const sal_Int32 nListPos = pOldGrammarCheckList->Pos(nPos); if( nListPos == nIdx ) - ((SwTxtPaintInfo*)pInf)->SetGrammarCheckList( pOldGrammarCheckList->SubList( nPos ) ); + static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( pOldGrammarCheckList->SubList( nPos ) ); else if( !pTempList && nPos < pOldGrammarCheckList->Count() && nListPos < nIdx && !aTxt.isEmpty() ) { pTempList = new SwWrongList( WRONGLIST_GRAMMAR ); pTempList->Insert( OUString(), 0, 0, aTxt.getLength(), 0 ); - ((SwTxtPaintInfo*)pInf)->SetGrammarCheckList( pTempList ); + static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( pTempList ); } else - ((SwTxtPaintInfo*)pInf)->SetGrammarCheckList( 0); + static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( 0); } } } @@ -1696,9 +1696,9 @@ SwTxtSlot::~SwTxtSlot() // ST2 // Restore old smart tag list if ( pOldSmartTagList ) - ((SwTxtPaintInfo*)pInf)->SetSmartTags( pOldSmartTagList ); + static_cast<SwTxtPaintInfo*>(pInf)->SetSmartTags( pOldSmartTagList ); if ( pOldGrammarCheckList ) - ((SwTxtPaintInfo*)pInf)->SetGrammarCheckList( pOldGrammarCheckList ); + static_cast<SwTxtPaintInfo*>(pInf)->SetGrammarCheckList( pOldGrammarCheckList ); delete pTempList; } } diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 301a8159e67c..28d3495591e6 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -407,7 +407,7 @@ protected: , pSmartTags(0) , pSpaceAdd(0) #ifdef DBG_UTIL - , pBrushItem((SvxBrushItem*)-1) + , pBrushItem(reinterpret_cast<SvxBrushItem*>(-1)) #else , pBrushItem(0) #endif diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index e86d90462d57..56302eae61a7 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -301,10 +301,10 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent, } if ( pPos->InTxtGrp() ) - nGluePortion = nGluePortion + ((SwTxtPortion*)pPos)->GetSpaceCnt( GetInfo(), nCharCnt ); + nGluePortion = nGluePortion + static_cast<SwTxtPortion*>(pPos)->GetSpaceCnt( GetInfo(), nCharCnt ); else if( pPos->IsMultiPortion() ) { - SwMultiPortion* pMulti = (SwMultiPortion*)pPos; + SwMultiPortion* pMulti = static_cast<SwMultiPortion*>(pPos); // a multiportion with a tabulator inside breaks the text adjustment // a ruby portion will not be stretched by text adjustment // a double line portion takes additional space for each blank @@ -319,9 +319,9 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent, nCharCnt = 0; } else if( pMulti->IsDouble() ) - nGluePortion = nGluePortion + ((SwDoubleLinePortion*)pMulti)->GetSpaceCnt(); + nGluePortion = nGluePortion + static_cast<SwDoubleLinePortion*>(pMulti)->GetSpaceCnt(); else if ( pMulti->IsBidi() ) - nGluePortion = nGluePortion + ((SwBidiPortion*)pMulti)->GetSpaceCnt( GetInfo() ); // i60594 + nGluePortion = nGluePortion + static_cast<SwBidiPortion*>(pMulti)->GetSpaceCnt( GetInfo() ); // i60594 } if( pPos->InGlueGrp() ) @@ -369,13 +369,13 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent, } pCurrent->SetLLSpaceAdd( nSpaceAdd , nSpaceIdx ); - pPos->Width( ( (SwGluePortion*)pPos )->GetFixWidth() ); + pPos->Width( static_cast<SwGluePortion*>(pPos)->GetFixWidth() ); } else if ( IsOneBlock() && nCharCnt > 1 ) { const long nSpaceAdd = - nGluePortionWidth / ( nCharCnt - 1 ); pCurrent->SetLLSpaceAdd( nSpaceAdd, nSpaceIdx ); - pPos->Width( ( (SwGluePortion*)pPos )->GetFixWidth() ); + pPos->Width( static_cast<SwGluePortion*>(pPos)->GetFixWidth() ); } nSpaceIdx++; @@ -457,7 +457,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent ) else { nRest = ! bNoCompression ? - ((SwGluePortion*)pPos)->GetPrtGlue() : + static_cast<SwGluePortion*>(pPos)->GetPrtGlue() : 0; bNoCompression = false; @@ -517,7 +517,7 @@ SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent ) if ( pPos->InTabGrp() ) // set fix width to width - ((SwTabPortion*)pPos)->SetFixWidth( pPos->Width() ); + static_cast<SwTabPortion*>(pPos)->SetFixWidth( pPos->Width() ); if ( ++nKanaIdx < pCurrent->GetKanaComp().size() ) nCompress = ( pCurrent->GetKanaComp() )[ nKanaIdx ]; @@ -602,7 +602,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent ) while( pPos ) { - if ( pPos->IsMultiPortion() && ((SwMultiPortion*)pPos)->HasTabulator() ) + if ( pPos->IsMultiPortion() && static_cast<SwMultiPortion*>(pPos)->HasTabulator() ) bMultiTab = true; else if( pPos->InFixMargGrp() && ( bTabCompat ? ! pPos->InTabGrp() : ! bMultiTab ) ) @@ -611,7 +611,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent ) // in non tab compat mode we do not want to change margins if we // found a multi portion with tabs if( SVX_ADJUST_RIGHT == GetAdjust() ) - ((SwGluePortion*)pPos)->MoveAllGlue( pGlue ); + static_cast<SwGluePortion*>(pPos)->MoveAllGlue( pGlue ); else { // We set the first text portion to right-aligned and the last one @@ -619,7 +619,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent ) // The first text portion gets the whole Glue, but only if we have // more than one line. if( bComplete && GetInfo().GetTxt().getLength() == nLen ) - ((SwGluePortion*)pPos)->MoveHalfGlue( pGlue ); + static_cast<SwGluePortion*>(pPos)->MoveHalfGlue( pGlue ); else { if ( ! bTabCompat ) @@ -629,23 +629,23 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent ) // If we only have a left and right margin, the // margins share the Glue. if( nLen + pPos->GetLen() >= pCurrent->GetLen() ) - ((SwGluePortion*)pPos)->MoveHalfGlue( pGlue ); + static_cast<SwGluePortion*>(pPos)->MoveHalfGlue( pGlue ); else - ((SwGluePortion*)pPos)->MoveAllGlue( pGlue ); + static_cast<SwGluePortion*>(pPos)->MoveAllGlue( pGlue ); } else { // The last text portion retains its Glue. if( !pPos->IsMarginPortion() ) - ((SwGluePortion*)pPos)->MoveHalfGlue( pGlue ); + static_cast<SwGluePortion*>(pPos)->MoveHalfGlue( pGlue ); } } else - ((SwGluePortion*)pPos)->MoveHalfGlue( pGlue ); + static_cast<SwGluePortion*>(pPos)->MoveHalfGlue( pGlue ); } } - pGlue = (SwGluePortion*)pPos; + pGlue = static_cast<SwGluePortion*>(pPos); bComplete = false; } nLen = nLen + pPos->GetLen(); @@ -754,8 +754,8 @@ void SwTxtAdjuster::CalcDropAdjust() if( pPor->InGlueGrp() && pPor->GetPortion() && pPor->GetPortion()->IsDropPortion() ) { - const SwLinePortion *pDropPor = (SwDropPortion*) pPor->GetPortion(); - SwGluePortion *pLeft = (SwGluePortion*) pPor; + const SwLinePortion *pDropPor = static_cast<SwDropPortion*>( pPor->GetPortion() ); + SwGluePortion *pLeft = static_cast<SwGluePortion*>( pPor ); // 4) pRight: Find the GluePor coming after the DropPor pPor = pPor->GetPortion(); @@ -763,7 +763,7 @@ void SwTxtAdjuster::CalcDropAdjust() pPor = pPor->GetPortion(); SwGluePortion *pRight = ( pPor && pPor->InGlueGrp() ) ? - (SwGluePortion*) pPor : 0; + static_cast<SwGluePortion*>(pPor) : 0; if( pRight && pRight != pLeft ) { // 5) Calculate nMinLeft. Who is the most to left? @@ -779,7 +779,7 @@ void SwTxtAdjuster::CalcDropAdjust() pPor = pCurr->GetFirstPortion(); const SwMarginPortion *pMar = pPor->IsMarginPortion() ? - (SwMarginPortion*)pPor : 0; + static_cast<SwMarginPortion*>(pPor) : 0; if( !pMar ) nMinLeft = 0; else diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 1a3affd00d7f..1366d59d57cc 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -60,7 +60,7 @@ static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig, { OSL_ENSURE( rCMS.pSpecialPos, "Information about special pos missing" ); - if ( rPor.InFldGrp() && !((SwFldPortion&)rPor).GetExp().isEmpty() ) + if ( rPor.InFldGrp() && !static_cast<const SwFldPortion&>(rPor).GetExp().isEmpty() ) { const sal_Int32 nCharOfst = rCMS.pSpecialPos->nCharOfst; sal_Int32 nFldIdx = 0; @@ -73,7 +73,7 @@ static void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig, { if ( pPor->InFldGrp() ) { - sString = ((SwFldPortion*)pPor)->GetExp(); + sString = static_cast<const SwFldPortion*>(pPor)->GetExp(); pString = &sString; nFldLen = pString->getLength(); } @@ -532,7 +532,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, bNoTxt = false; nTmpFirst = nX; } - if( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->HasTabulator() ) + if( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->HasTabulator() ) { if ( pCurr->IsSpaceAdd() ) { @@ -596,7 +596,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, // the portion width to nX. For MultiPortions, nExtra = 0, // therefore we go to the 'else' branch and start a recursion. const sal_Int32 nExtra = pPor->IsMultiPortion() && - ! ((SwMultiPortion*)pPor)->IsBidi() && + ! static_cast<SwMultiPortion*>(pPor)->IsBidi() && ! bWidth ? 0 : 1; if ( aInf.GetIdx() + pPor->GetLen() < nOfst + nExtra ) { @@ -627,7 +627,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, } if( pPor->IsMultiPortion() ) { - if ( ((SwMultiPortion*)pPor)->HasTabulator() ) + if ( static_cast<SwMultiPortion*>(pPor)->HasTabulator() ) { if ( pCurr->IsSpaceAdd() ) { @@ -645,10 +645,10 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, // hold a pointer to the BidiPortion in order to // find the correct cursor position, depending on the // cursor level - if ( ((SwMultiPortion*)pPor)->IsBidi() && + if ( static_cast<SwMultiPortion*>(pPor)->IsBidi() && aInf.GetIdx() + pPor->GetLen() == nOfst ) { - pLastBidiPor = (SwBidiPortion*)pPor; + pLastBidiPor = static_cast<SwBidiPortion*>(pPor); nLastBidiPorWidth = pLastBidiPor->Width() + pLastBidiPor->CalcSpacing( nSpaceAdd, aInf );; } @@ -674,16 +674,16 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, pCMS->p2Lines->aLine = SwRect(aCharPos, aCharSize); } - if( ((SwMultiPortion*)pPor)->HasRotation() ) + if( static_cast<SwMultiPortion*>(pPor)->HasRotation() ) { - if( ((SwMultiPortion*)pPor)->IsRevers() ) + if( static_cast<SwMultiPortion*>(pPor)->IsRevers() ) pCMS->p2Lines->nMultiType = MT_ROT_270; else pCMS->p2Lines->nMultiType = MT_ROT_90; } - else if( ((SwMultiPortion*)pPor)->IsDouble() ) + else if( static_cast<SwMultiPortion*>(pPor)->IsDouble() ) pCMS->p2Lines->nMultiType = MT_TWOLINE; - else if( ((SwMultiPortion*)pPor)->IsBidi() ) + else if( static_cast<SwMultiPortion*>(pPor)->IsBidi() ) pCMS->p2Lines->nMultiType = MT_BIDI; else pCMS->p2Lines->nMultiType = MT_RUBY; @@ -709,8 +709,8 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, sal_uInt8 nOldProp = GetPropFont(); nStart = aInf.GetIdx(); SwLineLayout* pOldCurr = pCurr; - pCurr = &((SwMultiPortion*)pPor)->GetRoot(); - if( ((SwMultiPortion*)pPor)->IsDouble() ) + pCurr = &static_cast<SwMultiPortion*>(pPor)->GetRoot(); + if( static_cast<SwMultiPortion*>(pPor)->IsDouble() ) SetPropFont( 50 ); SwTextGridItem const*const pGrid( @@ -720,15 +720,15 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, pGrid->GetRubyHeight() : 0; if( nStart + pCurr->GetLen() <= nOfst && GetNext() && - ( ! ((SwMultiPortion*)pPor)->IsRuby() || - ((SwMultiPortion*)pPor)->OnTop() ) ) + ( ! static_cast<SwMultiPortion*>(pPor)->IsRuby() || + static_cast<SwMultiPortion*>(pPor)->OnTop() ) ) { sal_uInt16 nOffset; // in grid mode we may only add the height of the // ruby line if ruby line is on top if ( bHasGrid && - ((SwMultiPortion*)pPor)->IsRuby() && - ((SwMultiPortion*)pPor)->OnTop() ) + static_cast<SwMultiPortion*>(pPor)->IsRuby() && + static_cast<SwMultiPortion*>(pPor)->OnTop() ) nOffset = nRubyHeight; else nOffset = GetLineHeight(); @@ -737,7 +737,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, Next(); } - const bool bSpaceChg = ((SwMultiPortion*)pPor)-> + const bool bSpaceChg = static_cast<SwMultiPortion*>(pPor)-> ChgSpaceAdd( pCurr, nSpaceAdd ); Point aOldPos = pOrig->Pos(); @@ -748,7 +748,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, const sal_uInt16 nOldRubyHeight = pCurr->Height(); const sal_uInt16 nOldRubyRealHeight = pCurr->GetRealHeight(); const bool bChgHeight = - ((SwMultiPortion*)pPor)->IsRuby() && bHasGrid; + static_cast<SwMultiPortion*>(pPor)->IsRuby() && bHasGrid; if ( bChgHeight ) { @@ -758,10 +758,10 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, } SwLayoutModeModifier aLayoutModeModifier( *GetInfo().GetOut() ); - if ( ((SwMultiPortion*)pPor)->IsBidi() ) + if ( static_cast<SwMultiPortion*>(pPor)->IsBidi() ) { aLayoutModeModifier.Modify( - ((SwBidiPortion*)pPor)->GetLevel() % 2 ); + static_cast<SwBidiPortion*>(pPor)->GetLevel() % 2 ); } _GetCharRect( pOrig, nOfst, pCMS ); @@ -775,7 +775,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, // if we are still in the first row of // our 2 line multiportion, we use the FirstMulti flag // to indicate this - if ( ((SwMultiPortion*)pPor)->IsDouble() ) + if ( static_cast<SwMultiPortion*>(pPor)->IsDouble() ) { // the recursion may have damaged our font size SetPropFont( nOldProp ); @@ -783,7 +783,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, nOldProp = 100; GetInfo().GetFont()->SetProportion( 100 ); - if ( pCurr == &((SwMultiPortion*)pPor)->GetRoot() ) + if ( pCurr == &static_cast<SwMultiPortion*>(pPor)->GetRoot() ) { GetInfo().SetFirstMulti( true ); @@ -796,12 +796,12 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, } } // ruby portions are treated like single line portions - else if( ((SwMultiPortion*)pPor)->IsRuby() || - ((SwMultiPortion*)pPor)->IsBidi() ) + else if( static_cast<SwMultiPortion*>(pPor)->IsRuby() || + static_cast<SwMultiPortion*>(pPor)->IsBidi() ) GetInfo().SetMulti( false ); // calculate cursor values - if( ((SwMultiPortion*)pPor)->HasRotation() ) + if( static_cast<SwMultiPortion*>(pPor)->HasRotation() ) { GetInfo().SetMulti( false ); long nTmp = pOrig->Width(); @@ -816,7 +816,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, nTmp--; pOrig->Pos().X() = nX + aOldPos.X(); - if( ((SwMultiPortion*)pPor)->IsRevers() ) + if( static_cast<SwMultiPortion*>(pPor)->IsRevers() ) pOrig->Pos().Y() = aOldPos.Y() + nTmp; else pOrig->Pos().Y() = aOldPos.Y() @@ -826,7 +826,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, pCMS->aRealHeight.Y() = -pCMS->aRealHeight.Y(); // result for rotated multi portion is not // correct for reverse (270 degree) portions - if( ((SwMultiPortion*)pPor)->IsRevers() ) + if( static_cast<SwMultiPortion*>(pPor)->IsRevers() ) { if ( SvxParaVertAlignItem::AUTOMATIC == GetLineInfo().GetVertAlign() ) @@ -847,7 +847,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, else { pOrig->Pos().Y() += aOldPos.Y(); - if ( ((SwMultiPortion*)pPor)->IsBidi() ) + if ( static_cast<SwMultiPortion*>(pPor)->IsBidi() ) { const SwTwips nPorWidth = pPor->Width() + pPor->CalcSpacing( nSpaceAdd, aInf ); @@ -858,9 +858,9 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, else pOrig->Pos().X() += nX; - if( ((SwMultiPortion*)pPor)->HasBrackets() ) + if( static_cast<SwMultiPortion*>(pPor)->HasBrackets() ) pOrig->Pos().X() += - ((SwDoubleLinePortion*)pPor)->PreWidth(); + static_cast<SwDoubleLinePortion*>(pPor)->PreWidth(); } if( bSpaceChg ) @@ -942,7 +942,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, bool bEmptyFld = false; if( pPor->InFldGrp() && pPor->GetLen() ) { - SwFldPortion *pTmp = (SwFldPortion*)pPor; + SwFldPortion *pTmp = static_cast<SwFldPortion*>(pPor); while( pTmp->HasFollow() && pTmp->GetExp().isEmpty() ) { sal_uInt16 nAddX = pTmp->Width(); @@ -955,7 +955,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, } if( !pNext ) break; - pTmp = (SwFldPortion*)pNext; + pTmp = static_cast<SwFldPortion*>(pNext); nPorHeight = pTmp->Height(); nPorAscent = pTmp->GetAscent(); nX += nAddX; @@ -991,7 +991,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, nX += pPor->PrtWidth(); } if( pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->HasTabulator() ) + static_cast<SwMultiPortion*>(pPor)->HasTabulator() ) { if ( pCurr->IsSpaceAdd() ) { @@ -1036,14 +1036,14 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, pOrig->Width( pPor->Width() ); if( pPor->IsDropPortion() ) { - nPorAscent = ((SwDropPortion*)pPor)->GetDropHeight(); + nPorAscent = static_cast<SwDropPortion*>(pPor)->GetDropHeight(); // The drop height is only calculated, if we have more than // one line. Otherwise it is 0. if ( ! nPorAscent) nPorAscent = pPor->Height(); nPorHeight = nPorAscent; pOrig->Height( nPorHeight + - ((SwDropPortion*)pPor)->GetDropDescent() ); + static_cast<SwDropPortion*>(pPor)->GetDropDescent() ); if( nTmpHeight < pOrig->Height() ) { nTmpAscent = nPorAscent; @@ -1101,7 +1101,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, ( pLastBidiPor || ( pPor && pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->IsBidi() ) ) ) + static_cast<SwMultiPortion*>(pPor)->IsBidi() ) ) ) { // we determine if the cursor has to blink before or behind // the bidi portion @@ -1125,7 +1125,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, const SwLinePortion *pLast = rLineLayout.FindLastPortion(); if ( pLast->IsMultiPortion() ) { - OSL_ENSURE( ((SwMultiPortion*)pLast)->IsBidi(), + OSL_ENSURE( static_cast<const SwMultiPortion*>(pLast)->IsBidi(), "Non-BidiPortion inside BidiPortion" ); pOrig->Pos().X() += pLast->Width() + pLast->CalcSpacing( nSpaceAdd, aInf ); @@ -1134,7 +1134,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst, } else { - const sal_uInt8 nPortionLevel = ((SwBidiPortion*)pPor)->GetLevel(); + const sal_uInt8 nPortionLevel = static_cast<SwBidiPortion*>(pPor)->GetLevel(); if ( pCMS->nCursorBidiLevel >= nPortionLevel ) { @@ -1309,7 +1309,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, nWidth = nWidth + sal_uInt16( pPor->CalcSpacing( nSpaceAdd, GetInfo() ) ); } if( ( pPor->InFixMargGrp() && ! pPor->IsMarginPortion() ) || - ( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->HasTabulator() ) + ( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->HasTabulator() ) ) { if ( pCurr->IsSpaceAdd() ) @@ -1354,7 +1354,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, } if( ( pPor->InFixMargGrp() && ! pPor->IsMarginPortion() ) || - ( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->HasTabulator() ) + ( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->HasTabulator() ) ) { if ( pCurr->IsSpaceAdd() ) @@ -1453,7 +1453,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, // in the last line of a centered paragraph nCurrStart < rText.getLength() ) ) --nCurrStart; - else if( pPor->InFldGrp() && ((SwFldPortion*)pPor)->IsFollow() + else if( pPor->InFldGrp() && static_cast<SwFldPortion*>(pPor)->IsFollow() && nWidth > nX ) { if( bFieldInfo ) @@ -1478,7 +1478,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, { if ( pPor->InFldGrp() || ( pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->IsBidi() ) ) + static_cast<SwMultiPortion*>(pPor)->IsBidi() ) ) { sal_uInt16 nHeight = 0; if( !bFieldInfo ) @@ -1490,7 +1490,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, if( nWidth - nHeight/2 <= nX && ( ! pPor->InFldGrp() || - !((SwFldPortion*)pPor)->HasFollow() ) ) + !static_cast<SwFldPortion*>(pPor)->HasFollow() ) ) ++nCurrStart; } else if ( ( !pPor->IsFlyPortion() || ( pPor->GetPortion() && @@ -1515,7 +1515,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, return nCurrStart; if ( pPor->InFldGrp() ) { - if( bRightOver && !((SwFldPortion*)pPor)->HasFollow() ) + if( bRightOver && !static_cast<SwFldPortion*>(pPor)->HasFollow() ) ++nCurrStart; return nCurrStart; } @@ -1528,7 +1528,7 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, --nLength; if( nWidth > nX || - ( nWidth == nX && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsDouble() ) ) + ( nWidth == nX && pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->IsDouble() ) ) { if( pPor->IsMultiPortion() ) { @@ -1537,42 +1537,42 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, // if we are in the first line of a double line portion, we have // to add a value to nTmpY for not staying in this line // we also want to skip the first line, if we are inside ruby - if ( ( ((SwTxtSizeInfo*)pInf)->IsMulti() && - ((SwTxtSizeInfo*)pInf)->IsFirstMulti() ) || - ( ((SwMultiPortion*)pPor)->IsRuby() && - ((SwMultiPortion*)pPor)->OnTop() ) ) - nTmpY += ((SwMultiPortion*)pPor)->Height(); + if ( ( static_cast<SwTxtSizeInfo*>(pInf)->IsMulti() && + static_cast<SwTxtSizeInfo*>(pInf)->IsFirstMulti() ) || + ( static_cast<SwMultiPortion*>(pPor)->IsRuby() && + static_cast<SwMultiPortion*>(pPor)->OnTop() ) ) + nTmpY += static_cast<SwMultiPortion*>(pPor)->Height(); // Important for cursor traveling in ruby portions: // We have to set nTmpY to 0 in order to stay in the first row // if the phonetic line is the second row - if ( ((SwMultiPortion*)pPor)->IsRuby() && - ! ((SwMultiPortion*)pPor)->OnTop() ) + if ( static_cast<SwMultiPortion*>(pPor)->IsRuby() && + ! static_cast<SwMultiPortion*>(pPor)->OnTop() ) nTmpY = 0; - SwTxtCursorSave aSave( (SwTxtCursor*)this, (SwMultiPortion*)pPor, + SwTxtCursorSave aSave( const_cast<SwTxtCursor*>(static_cast<const SwTxtCursor*>(this)), static_cast<SwMultiPortion*>(pPor), nTmpY, nX, nCurrStart, nSpaceAdd ); SwLayoutModeModifier aLayoutModeModifier( *GetInfo().GetOut() ); - if ( ((SwMultiPortion*)pPor)->IsBidi() ) + if ( static_cast<SwMultiPortion*>(pPor)->IsBidi() ) { - const sal_uInt8 nBidiLevel = ((SwBidiPortion*)pPor)->GetLevel(); + const sal_uInt8 nBidiLevel = static_cast<SwBidiPortion*>(pPor)->GetLevel(); aLayoutModeModifier.Modify( nBidiLevel % 2 ); } - if( ((SwMultiPortion*)pPor)->HasRotation() ) + if( static_cast<SwMultiPortion*>(pPor)->HasRotation() ) { nTmpY -= nY; - if( !((SwMultiPortion*)pPor)->IsRevers() ) + if( !static_cast<SwMultiPortion*>(pPor)->IsRevers() ) nTmpY = pPor->Height() - nTmpY; if( nTmpY < 0 ) nTmpY = 0; nX = (sal_uInt16)nTmpY; } - if( ((SwMultiPortion*)pPor)->HasBrackets() ) + if( static_cast<SwMultiPortion*>(pPor)->HasBrackets() ) { - const sal_uInt16 nPreWidth = ((SwDoubleLinePortion*)pPor)->PreWidth(); + const sal_uInt16 nPreWidth = static_cast<SwDoubleLinePortion*>(pPor)->PreWidth(); if ( nX > nPreWidth ) nX = nX - nPreWidth; else @@ -1595,9 +1595,9 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, { SwTxtSizeInfo aSizeInf( GetInfo(), &rText, nCurrStart ); ((SwTxtCursor*)this)->SeekAndChg( aSizeInf ); - SwTxtSlot aDiffTxt( &aSizeInf, ((SwTxtPortion*)pPor), false, false ); + SwTxtSlot aDiffTxt( &aSizeInf, static_cast<SwTxtPortion*>(pPor), false, false ); SwFontSave aSave( aSizeInf, pPor->IsDropPortion() ? - ((SwDropPortion*)pPor)->GetFnt() : NULL ); + static_cast<SwDropPortion*>(pPor)->GetFnt() : NULL ); SwParaPortion* pPara = (SwParaPortion*)GetInfo().GetParaPortion(); OSL_ENSURE( pPara, "No paragraph!" ); @@ -1690,12 +1690,12 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, else { if( nChgNode && pPos && pPor->IsFlyCntPortion() - && !( (SwFlyCntPortion*)pPor )->IsDraw() ) + && !static_cast<SwFlyCntPortion*>(pPor)->IsDraw() ) { // JP 24.11.94: if the Position is not in Fly, then // we many not return with COMPLETE_STRING as value! // (BugId: 9692 + Change in feshview) - SwFlyInCntFrm *pTmp = ( (SwFlyCntPortion*)pPor )->GetFlyFrm(); + SwFlyInCntFrm *pTmp = static_cast<SwFlyCntPortion*>(pPor)->GetFlyFrm(); SwFrm* pLower = pTmp->GetLower(); bool bChgNode = pLower && (pLower->IsTxtFrm() || pLower->IsLayoutFrm()); @@ -1710,12 +1710,12 @@ sal_Int32 SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, if( bChgNode && pTmp->Frm().IsInside( aTmpPoint ) && !( pTmp->IsProtected() ) ) { - nLength = ((SwFlyCntPortion*)pPor)-> + nLength = static_cast<SwFlyCntPortion*>(pPor)-> GetFlyCrsrOfst( nX, aTmpPoint, pPos, pCMS ); // After a change of the frame, our font must be still // available for/in the OutputDevice. // For comparison: Paint and new SwFlyCntPortion ! - ((SwTxtSizeInfo*)pInf)->SelectFont(); + static_cast<SwTxtSizeInfo*>(pInf)->SelectFont(); // 6776: The pIter->GetCrsrOfst is returning here // from a nesting with COMPLETE_STRING. diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index a3c729a4135f..37ae1bab91a1 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -404,7 +404,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) // We have to check the script for fields in order to set the // correct nActual value for the font. if( pPor->InFldGrp() ) - ((SwFldPortion*)pPor)->CheckScript( rInf ); + static_cast<SwFldPortion*>(pPor)->CheckScript( rInf ); if( ! bHasGrid && rInf.HasScriptSpace() && rInf.GetLast() && rInf.GetLast()->InTxtGrp() && @@ -422,12 +422,12 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) if ( pPor->InFldGrp() ) { OUString aAltTxt; - if ( ((SwFldPortion*)pPor)->GetExpTxt( rInf, aAltTxt ) && + if ( static_cast<SwFldPortion*>(pPor)->GetExpTxt( rInf, aAltTxt ) && !aAltTxt.isEmpty() ) { bAllowBehind = rCC.isLetterNumeric( aAltTxt, 0 ); - const SwFont* pTmpFnt = ((SwFldPortion*)pPor)->GetFont(); + const SwFont* pTmpFnt = static_cast<SwFldPortion*>(pPor)->GetFont(); if ( pTmpFnt ) nNxtActual = pTmpFnt->GetActual(); } @@ -445,12 +445,12 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) if ( pLast->InFldGrp() ) { OUString aAltTxt; - if ( ((SwFldPortion*)pLast)->GetExpTxt( rInf, aAltTxt ) && + if ( static_cast<const SwFldPortion*>(pLast)->GetExpTxt( rInf, aAltTxt ) && !aAltTxt.isEmpty() ) { bAllowBefore = rCC.isLetterNumeric( aAltTxt, aAltTxt.getLength() - 1 ); - const SwFont* pTmpFnt = ((SwFldPortion*)pLast)->GetFont(); + const SwFont* pTmpFnt = static_cast<const SwFldPortion*>(pLast)->GetFont(); if ( pTmpFnt ) { nLstActual = pTmpFnt->GetActual(); @@ -484,7 +484,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) // insert a grid kerning portion if ( ! pGridKernPortion ) pGridKernPortion = pPor->IsKernPortion() ? - (SwKernPortion*)pPor : + static_cast<SwKernPortion*>(pPor) : new SwKernPortion( *pCurr ); // if we have a new GridKernPortion, we initially calculate @@ -527,7 +527,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) // the multi-portion has it's own format function if( pPor->IsMultiPortion() && ( !pMulti || pMulti->IsBidi() ) ) - bFull = BuildMultiPortion( rInf, *((SwMultiPortion*)pPor) ); + bFull = BuildMultiPortion( rInf, *static_cast<SwMultiPortion*>(pPor) ); else bFull = pPor->Format( rInf ); @@ -566,7 +566,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) // 2. Right Tab ( ( pPor->InTabGrp() && !pPor->IsTabLeftPortion() ) || // 3. BidiPortions - ( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) || + ( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->IsBidi() ) || // 4. Multi Portion and 5. Drop Caps ( ( pPor->IsDropPortion() || pPor->IsMultiPortion() ) && rInf.GetReformatStart() >= rInf.GetIdx() && @@ -585,7 +585,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) nUnderLineStart = 0; if( pPor->IsFlyCntPortion() || ( pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->HasFlyInCntnt() ) ) + static_cast<SwMultiPortion*>(pPor)->HasFlyInCntnt() ) ) SetFlyInCntBase(); // bUnderflow needs to be reset or we wrap again at the next softhyphen if ( !bFull ) @@ -700,7 +700,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) rInf.GetLast()->FormatEOL( rInf ); } if( pCurr->GetPortion() && pCurr->GetPortion()->InNumberGrp() - && ((SwNumberPortion*)pCurr->GetPortion())->IsHide() ) + && static_cast<SwNumberPortion*>(pCurr->GetPortion())->IsHide() ) rInf.SetNumDone( false ); // Delete fly in any case @@ -728,11 +728,11 @@ void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurrent ) void SwTxtFormatter::CalcAscent( SwTxtFormatInfo &rInf, SwLinePortion *pPor ) { bool bCalc = false; - if ( pPor->InFldGrp() && ((SwFldPortion*)pPor)->GetFont() ) + if ( pPor->InFldGrp() && static_cast<SwFldPortion*>(pPor)->GetFont() ) { // Numbering + InterNetFlds can keep an own font, then their size is // independent from hard attribute values - SwFont* pFldFnt = ((SwFldPortion*)pPor)->pFnt; + SwFont* pFldFnt = static_cast<SwFldPortion*>(pPor)->pFnt; SwFontSave aSave( rInf, pFldFnt ); pPor->Height( rInf.GetTxtHeight() ); pPor->SetAscent( rInf.GetAscent() ); @@ -1137,8 +1137,8 @@ static bool lcl_OldFieldRest( const SwLineLayout* pCurr ) bool bRet = false; while( pPor && !bRet ) { - bRet = (pPor->InFldGrp() && ((SwFldPortion*)pPor)->IsFollow()) || - (pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsFollowFld()); + bRet = (pPor->InFldGrp() && static_cast<const SwFldPortion*>(pPor)->IsFollow()) || + (pPor->IsMultiPortion() && static_cast<const SwMultiPortion*>(pPor)->IsFollowFld()); if( !pPor->GetLen() ) break; pPor = pPor->GetPortion(); @@ -1396,7 +1396,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) { if ( pPor->IsFtnPortion() ) { - const SwTxtFtn* pTxtFtn = ((SwFtnPortion*)pPor)->GetTxtFtn(); + const SwTxtFtn* pTxtFtn = static_cast<SwFtnPortion*>(pPor)->GetTxtFtn(); if ( pTxtFtn ) { @@ -1413,7 +1413,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) sal_uInt16 nDir = 0; if( SfxItemState::SET == rSet.GetItemState( RES_CHRATR_ROTATE, true, &pItem )) - nDir = ((SvxCharRotateItem*)pItem)->GetValue(); + nDir = static_cast<const SvxCharRotateItem*>(pItem)->GetValue(); if ( 0 != nDir ) { @@ -1426,7 +1426,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) } else if ( pPor->InNumberGrp() ) { - const SwFont* pNumFnt = ((SwFldPortion*)pPor)->GetFont(); + const SwFont* pNumFnt = static_cast<SwFldPortion*>(pPor)->GetFont(); if ( pNumFnt ) { @@ -1502,7 +1502,7 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos) boost::scoped_ptr<SwFldPortion> xSaveFld; if ( pFld && pFld->InFldGrp() && !pFld->IsFtnPortion() ) - xSaveFld.reset(new SwFldPortion( *((SwFldPortion*)pFld) )); + xSaveFld.reset(new SwFldPortion( *static_cast<SwFldPortion*>(pFld) )); // for an optimal repaint rectangle, we want to compare fly portions // before and after the BuildPortions call @@ -2076,7 +2076,7 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart, nTmpDescent = nTmpHeight - nAscent; nFlyDesc = nTmpDescent; } - ((SwGrfNumPortion*)pPos)->SetBase( nTmpAscent, nTmpDescent, + static_cast<SwGrfNumPortion*>(pPos)->SetBase( nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc ); } else @@ -2085,22 +2085,22 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart, if ( GetInfo().GetTxtFrm()->IsVertical() ) GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( aBase ); - ((SwFlyCntPortion*)pPos)->SetBase( *aTmpInf.GetTxtFrm(), + static_cast<SwFlyCntPortion*>(pPos)->SetBase( *aTmpInf.GetTxtFrm(), aBase, nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc, nFlags ); } } - if( pPos->IsMultiPortion() && ((SwMultiPortion*)pPos)->HasFlyInCntnt() ) + if( pPos->IsMultiPortion() && static_cast<SwMultiPortion*>(pPos)->HasFlyInCntnt() ) { OSL_ENSURE( !GetMulti(), "Too much multi" ); - ((SwTxtFormatter*)this)->pMulti = (SwMultiPortion*)pPos; + const_cast<SwTxtFormatter*>(static_cast<const SwTxtFormatter*>(this))->pMulti = static_cast<SwMultiPortion*>(pPos); SwLineLayout *pLay = &GetMulti()->GetRoot(); Point aSt( aTmpInf.X(), aStart.Y() ); if ( GetMulti()->HasBrackets() ) { OSL_ENSURE( GetMulti()->IsDouble(), "Brackets only for doubles"); - aSt.X() += ((SwDoubleLinePortion*)GetMulti())->PreWidth(); + aSt.X() += static_cast<SwDoubleLinePortion*>(GetMulti())->PreWidth(); } else if( GetMulti()->HasRotation() ) { @@ -2155,7 +2155,7 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const pCurr->MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc, pPos ); if( pPos->IsGrfNumPortion() ) - ((SwGrfNumPortion*)pPos)->SetBase( nTmpAscent, nTmpDescent, + static_cast<SwGrfNumPortion*>(pPos)->SetBase( nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc ); else { @@ -2163,12 +2163,12 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const if ( GetInfo().GetTxtFrm()->IsVertical() ) { nBaseLine = GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( nBaseLine ); - aBase = Point( nBaseLine, ((SwFlyCntPortion*)pPos)->GetRefPoint().Y() ); + aBase = Point( nBaseLine, static_cast<SwFlyCntPortion*>(pPos)->GetRefPoint().Y() ); } else - aBase = Point( ((SwFlyCntPortion*)pPos)->GetRefPoint().X(), nBaseLine ); + aBase = Point( static_cast<SwFlyCntPortion*>(pPos)->GetRefPoint().X(), nBaseLine ); - ((SwFlyCntPortion*)pPos)->SetBase( *GetInfo().GetTxtFrm(), aBase, nTmpAscent, nTmpDescent, + static_cast<SwFlyCntPortion*>(pPos)->SetBase( *GetInfo().GetTxtFrm(), aBase, nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc, nFlags ); } } @@ -2248,7 +2248,7 @@ bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const // we also have to reformat the line, if the fly size // differs from the intersection interval's size. if( ! aInter.HasArea() || - ((SwFlyPortion*)pPos)->GetFixWidth() != aInter.Width() ) + static_cast<const SwFlyPortion*>(pPos)->GetFixWidth() != aInter.Width() ) { rInf.SetLineHeight( nHeight ); rInf.SetLineNetHeight( pCurr->Height() ); @@ -2477,9 +2477,9 @@ SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf, const SwFrm *pFrame = (SwFrm*)pFrm; SwFlyInCntFrm *pFly; - SwFrmFmt* pFrmFmt = ((SwTxtFlyCnt*)pHint)->GetFlyCnt().GetFrmFmt(); + SwFrmFmt* pFrmFmt = static_cast<SwTxtFlyCnt*>(pHint)->GetFlyCnt().GetFrmFmt(); if( RES_FLYFRMFMT == pFrmFmt->Which() ) - pFly = ((SwTxtFlyCnt*)pHint)->GetFlyFrm(pFrame); + pFly = static_cast<SwTxtFlyCnt*>(pHint)->GetFlyFrm(pFrame); else pFly = NULL; // aBase is the document-global position, from which the new extra portion is placed diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx index 6ab2e1e80594..7a6053fb2655 100644 --- a/sw/source/core/text/itrform2.hxx +++ b/sw/source/core/text/itrform2.hxx @@ -216,9 +216,9 @@ public: void SetFlyInCntBase( bool bNew = true ) { bFlyInCntBase = bNew; } SwTxtFormatInfo &GetInfo() - { return (SwTxtFormatInfo&)SwTxtIter::GetInfo(); } + { return static_cast<SwTxtFormatInfo&>(SwTxtIter::GetInfo()); } const SwTxtFormatInfo &GetInfo() const - { return (const SwTxtFormatInfo&)SwTxtIter::GetInfo(); } + { return static_cast<const SwTxtFormatInfo&>(SwTxtIter::GetInfo()); } void InitCntHyph() { CntHyphens( nCntEndHyph, nCntMidHyph ); } const sal_uInt8 &CntEndHyph() const { return nCntEndHyph; } diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index f1f2a202b624..2e93cdd4ee29 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -64,7 +64,7 @@ bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt ) rPor.IsFlyPortion() || rPor.IsFlyCntPortion() || rPor.IsBreakPortion() || rPor.IsMarginPortion() || rPor.IsHolePortion() || - ( rPor.IsMultiPortion() && ! ((SwMultiPortion&)rPor).IsBidi() ) || + ( rPor.IsMultiPortion() && ! static_cast<const SwMultiPortion&>(rPor).IsBidi() ) || rFnt.GetEscapement() < 0 || rFnt.IsWordLineMode() || SVX_CASEMAP_KAPITAELCHEN == rFnt.GetCaseMap(); } @@ -370,7 +370,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, &aPorInfo, *pOut ); if( pPor->IsMultiPortion() ) - PaintMultiPortion( rPaint, (SwMultiPortion&)*pPor ); + PaintMultiPortion( rPaint, static_cast<SwMultiPortion&>(*pPor) ); else pPor->Paint( GetInfo() ); } @@ -389,7 +389,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, if( pNext || !pPor->IsMarginPortion() ) pPor->Move( GetInfo() ); if( pPor->IsArrowPortion() && GetInfo().OnWin() && !pArrow ) - pArrow = (SwArrowPortion*)pPor; + pArrow = static_cast<SwArrowPortion*>(pPor); pPor = bDrawInWindow || GetInfo().X() <= nMaxRight || // #i16816# tagged pdf support @@ -433,7 +433,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, ( GetTxtFrm()->GetNext() && 0 == GetTxtFrm()->GetNext()->Prt().Height() && GetTxtFrm()->GetNext()->IsTxtFrm() && - ((SwTxtFrm*)GetTxtFrm()->GetNext())->IsUndersized() ) ; + static_cast<SwTxtFrm*>(GetTxtFrm()->GetNext())->IsUndersized() ) ; if( bUnderSz || bNextUndersized ) { @@ -565,7 +565,7 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor, if ( pPor->IsFlyPortion() || pPor->IsFlyCntPortion() || pPor->IsBreakPortion() || pPor->IsMarginPortion() || pPor->IsHolePortion() || - ( pPor->IsMultiPortion() && ! ((SwMultiPortion*)pPor)->IsBidi() ) ) + ( pPor->IsMultiPortion() && ! static_cast<const SwMultiPortion*>(pPor)->IsBidi() ) ) break; aIter.Seek( nTmpIdx ); diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx index 767e878236da..3f5bb35f65f3 100644 --- a/sw/source/core/text/itrpaint.hxx +++ b/sw/source/core/text/itrpaint.hxx @@ -54,9 +54,9 @@ public: inline void SetPaintDrop( const bool bNew ) { bPaintDrop = bNew; } inline bool IsPaintDrop() const { return bPaintDrop; } inline SwTxtPaintInfo &GetInfo() - { return (SwTxtPaintInfo&)SwTxtIter::GetInfo(); } + { return static_cast<SwTxtPaintInfo&>(SwTxtIter::GetInfo()); } inline const SwTxtPaintInfo &GetInfo() const - { return (const SwTxtPaintInfo&)SwTxtIter::GetInfo(); } + { return static_cast<const SwTxtPaintInfo&>(SwTxtIter::GetInfo()); } }; bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt ); diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index 058a41e691dd..cd9294735083 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -242,7 +242,7 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine, nOfst = nOfst + nPorAscent; if ( ! pPor || ! pPor->IsMultiPortion() || - ! ((SwMultiPortion*)pPor)->IsRuby() ) + ! static_cast<const SwMultiPortion*>(pPor)->IsRuby() ) { // Portions which are bigger than on grid distance are // centered inside the whole line. @@ -306,7 +306,7 @@ static bool lcl_NeedsFieldRest( const SwLineLayout* pCurr ) bool bRet = false; while( pPor && !bRet ) { - bRet = pPor->InFldGrp() && ((SwFldPortion*)pPor)->HasFollow(); + bRet = pPor->InFldGrp() && static_cast<const SwFldPortion*>(pPor)->HasFollow(); if( !pPor->GetPortion() || !pPor->GetPortion()->InFldGrp() ) break; pPor = pPor->GetPortion(); diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx index 70db16c7ddcc..9ef29dedaf23 100644 --- a/sw/source/core/text/itrtxt.hxx +++ b/sw/source/core/text/itrtxt.hxx @@ -215,9 +215,9 @@ public: sal_Int32 GetTxtEnd() const; inline SwTxtSizeInfo &GetInfo() - { return (SwTxtSizeInfo&)SwTxtIter::GetInfo(); } + { return static_cast<SwTxtSizeInfo&>(SwTxtIter::GetInfo()); } inline const SwTxtSizeInfo &GetInfo() const - { return (const SwTxtSizeInfo&)SwTxtIter::GetInfo(); } + { return static_cast<const SwTxtSizeInfo&>(SwTxtIter::GetInfo()); } }; diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 997d975ab1bd..46c4b9f47231 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -364,7 +364,7 @@ bool SwFldPortion::Format( SwTxtFormatInfo &rInf ) sal_Int32 nNextOfst = aExpand.getLength() - nRest; if ( IsQuoVadisPortion() ) - nNextOfst = nNextOfst + ((SwQuoVadisPortion*)this)->GetContTxt().getLength(); + nNextOfst = nNextOfst + static_cast<SwQuoVadisPortion*>(this)->GetContTxt().getLength(); OUString aNew( aExpand.copy( nNextOfst ) ); aExpand = aExpand.copy( 0, nNextOfst ); @@ -634,11 +634,11 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const while ( pTmp && pTmp->InNumberGrp() ) { nSumWidth = nSumWidth + pTmp->Width(); - if ( ((SwNumberPortion*)pTmp)->HasFollow() ) + if ( static_cast<const SwNumberPortion*>(pTmp)->HasFollow() ) pTmp = pTmp->GetPortion(); else { - nOffset = pTmp->Width() - ((SwNumberPortion*)pTmp)->nFixWidth; + nOffset = pTmp->Width() - static_cast<const SwNumberPortion*>(pTmp)->nFixWidth; break; } } @@ -1037,7 +1037,7 @@ void SwTxtFrm::StopAnimation( OutputDevice* pOut ) while( pPor ) { if( pPor->IsGrfNumPortion() ) - ((SwGrfNumPortion*)pPor)->StopAnimation( pOut ); + static_cast<SwGrfNumPortion*>(pPor)->StopAnimation( pOut ); // Die Numerierungsportion sitzt immer vor dem ersten Zeichen, // deshalb koennen wir abbrechen, sobald wir eine Portion mit // einer Laenge > 0 erreicht haben. @@ -1278,7 +1278,7 @@ bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf ) if( bFull ) { if( rInf.GetLineStart() == rInf.GetIdx() && (!rInf.GetLast()->InFldGrp() - || !((SwFldPortion*)rInf.GetLast())->IsFollow() ) ) + || !static_cast<SwFldPortion*>(rInf.GetLast())->IsFollow() ) ) Width( (sal_uInt16)( rInf.Width() - rInf.X() ) ); else { diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx index 66a4396de4cd..77432df5e02b 100644 --- a/sw/source/core/text/porglue.cxx +++ b/sw/source/core/text/porglue.cxx @@ -170,7 +170,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr ) while( pPos ) { if( pPos->InFixMargGrp() ) - pLeft = (SwGluePortion*)pPos; + pLeft = static_cast<SwGluePortion*>(pPos); pPos = pPos->GetPortion(); if( pPos == pRight) pPos = 0; @@ -193,7 +193,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr ) if ( pRight->IsFlyPortion() && pRight->GetLen() ) { - SwFlyPortion *pFly = (SwFlyPortion *)pRight; + SwFlyPortion *pFly = static_cast<SwFlyPortion *>(pRight); if ( pFly->GetBlankWidth() < nRightGlue ) { // Creating new TxtPortion, that takes over the @@ -235,7 +235,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr ) && pPrev->GetPortion()->IsHolePortion() ) { SwHolePortion *pHolePor = - (SwHolePortion*)pPrev->GetPortion(); + static_cast<SwHolePortion*>(pPrev->GetPortion()); if ( !pHolePor->GetPortion() || !pHolePor->GetPortion()->InFixMargGrp() ) { diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 97af17a67a0a..cd59a958973c 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -182,7 +182,7 @@ bool SwLineLayout::Format( SwTxtFormatInfo &rInf ) SwMarginPortion *SwLineLayout::CalcLeftMargin() { SwMarginPortion *pLeft = (GetPortion() && GetPortion()->IsMarginPortion()) ? - (SwMarginPortion *)GetPortion() : 0; + static_cast<SwMarginPortion *>(GetPortion()) : 0; if( !GetPortion() ) SetPortion( new SwTxtPortion( *(SwLinePortion*)this ) ); if( !pLeft ) @@ -207,7 +207,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin() if( pPos->IsFlyPortion() ) { // The FlyPortion get's sucked out ... - pLeft->Join( (SwGluePortion*)pPos ); + pLeft->Join( static_cast<SwGluePortion*>(pPos) ); pPos = pLeft->GetPortion(); if( GetpKanaComp() && !GetKanaComp().empty() ) GetKanaComp().pop_front(); @@ -411,14 +411,14 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf ) Height(nPosHeight); } if( pPos->IsFlyCntPortion() || ( pPos->IsMultiPortion() - && ((SwMultiPortion*)pPos)->HasFlyInCntnt() ) ) + && static_cast<SwMultiPortion*>(pPos)->HasFlyInCntnt() ) ) rLine.SetFlyInCntBase(); if( pPos->IsFlyCntPortion() && - ((SwFlyCntPortion*)pPos)->GetAlign() ) + static_cast<SwFlyCntPortion*>(pPos)->GetAlign() ) { - ((SwFlyCntPortion*)pPos)->SetMax( false ); + static_cast<SwFlyCntPortion*>(pPos)->SetMax( false ); if( !pFlyCnt || pPos->Height() > pFlyCnt->Height() ) - pFlyCnt = (SwFlyCntPortion*)pPos; + pFlyCnt = static_cast<SwFlyCntPortion*>(pPos); } else { @@ -1989,7 +1989,7 @@ const SwDropPortion *SwParaPortion::FindDropPortion() const while ( pPos && !pPos->GetLen() ) pPos = pPos->GetPortion(); if( pPos && pPos->IsDropPortion() ) - return (SwDropPortion *)pPos; + return static_cast<const SwDropPortion *>(pPos); pLay = pLay->GetLen() ? NULL : pLay->GetNext(); } return NULL; @@ -2017,7 +2017,7 @@ SwTwips SwLineLayout::_GetHangingMargin() const { if( pPor->IsHangingPortion() ) { - nDiff = ((SwHangingPortion*)pPor)->GetInnerWidth() - pPor->Width(); + nDiff = static_cast<SwHangingPortion*>(pPor)->GetInnerWidth() - pPor->Width(); if( nDiff ) bFound = true; } @@ -2058,7 +2058,7 @@ void SwScriptInfo::selectHiddenTextProperty(const SwTxtNode& rNode, MultiSelecti const SfxPoolItem* pItem = 0; if( SfxItemState::SET == rNode.GetSwAttrSet().GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) && - ((SvxCharHiddenItem*)pItem)->GetValue() ) + static_cast<const SvxCharHiddenItem*>(pItem)->GetValue() ) { rHiddenMulti.SelectAll(); } diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index d1ef7de685d9..32300d59604b 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -299,7 +299,7 @@ void SwLinePortion::Move( SwTxtPaintInfo &rInf ) else rInf.X( rInf.X() + PrtWidth() ); } - if( IsMultiPortion() && ((SwMultiPortion*)this)->HasTabulator() ) + if( IsMultiPortion() && static_cast<SwMultiPortion*>(this)->HasTabulator() ) rInf.IncSpaceIdx(); rInf.SetIdx( rInf.GetIdx() + GetLen() ); diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 736bbb874864..84740ed2c85f 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -100,7 +100,7 @@ void SwMultiPortion::CalcSize( SwTxtFormatter& rLine, SwTxtFormatInfo &rInf ) } while ( pLay ); if( HasBrackets() ) { - sal_uInt16 nTmp = ((SwDoubleLinePortion*)this)->GetBrackets()->nHeight; + sal_uInt16 nTmp = static_cast<SwDoubleLinePortion*>(this)->GetBrackets()->nHeight; if( nTmp > Height() ) { const sal_uInt16 nAdd = ( nTmp - Height() ) / 2; @@ -108,7 +108,7 @@ void SwMultiPortion::CalcSize( SwTxtFormatter& rLine, SwTxtFormatInfo &rInf ) GetRoot().Height( GetRoot().Height() + nAdd ); Height( nTmp ); } - nTmp = ((SwDoubleLinePortion*)this)->GetBrackets()->nAscent; + nTmp = static_cast<SwDoubleLinePortion*>(this)->GetBrackets()->nAscent; if( nTmp > GetAscent() ) SetAscent( nTmp ); } @@ -153,7 +153,7 @@ void SwMultiPortion::ActualizeTabulator() SwRotatedPortion::SwRotatedPortion( const SwMultiCreator& rCreate, sal_Int32 nEnd, bool bRTL ) : SwMultiPortion( nEnd ) { - const SvxCharRotateItem* pRot = (SvxCharRotateItem*)rCreate.pItem; + const SvxCharRotateItem* pRot = static_cast<const SvxCharRotateItem*>(rCreate.pItem); if( !pRot ) { const SwTxtAttr& rAttr = *rCreate.pAttr; @@ -215,10 +215,10 @@ sal_Int32 SwBidiPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf ) const for( nBlanks = 0; pPor; pPor = pPor->GetPortion() ) { if( pPor->InTxtGrp() ) - nBlanks = nBlanks + ((SwTxtPortion*)pPor)->GetSpaceCnt( rInf, nNull ); + nBlanks = nBlanks + static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nNull ); else if ( pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->IsBidi() ) - nBlanks = nBlanks + ((SwBidiPortion*)pPor)->GetSpaceCnt( rInf ); + static_cast<SwMultiPortion*>(pPor)->IsBidi() ) + nBlanks = nBlanks + static_cast<SwBidiPortion*>(pPor)->GetSpaceCnt( rInf ); ((SwTxtSizeInfo &)rInf).SetIdx( rInf.GetIdx() + pPor->GetLen() ); } @@ -264,7 +264,7 @@ SwDoubleLinePortion::SwDoubleLinePortion(const SwMultiCreator& rCreate, sal_Int3 , nBlank2(0) { SetDouble(); - const SvxTwoLinesItem* pTwo = (SvxTwoLinesItem*)rCreate.pItem; + const SvxTwoLinesItem* pTwo = static_cast<const SvxTwoLinesItem*>(rCreate.pItem); if( pTwo ) pBracket->nStart = 0; else @@ -449,7 +449,7 @@ void SwDoubleLinePortion::CalcBlanks( SwTxtFormatInfo &rInf ) for( nBlank1 = 0; pPor; pPor = pPor->GetPortion() ) { if( pPor->InTxtGrp() ) - nBlank1 = nBlank1 + ((SwTxtPortion*)pPor)->GetSpaceCnt( rInf, nNull ); + nBlank1 = nBlank1 + static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nNull ); rInf.SetIdx( rInf.GetIdx() + pPor->GetLen() ); if( pPor->InTabGrp() ) SetTab1( true ); @@ -463,7 +463,7 @@ void SwDoubleLinePortion::CalcBlanks( SwTxtFormatInfo &rInf ) for( nBlank2 = 0; pPor; pPor = pPor->GetPortion() ) { if( pPor->InTxtGrp() ) - nBlank2 = nBlank2 + ((SwTxtPortion*)pPor)->GetSpaceCnt( rInf, nNull ); + nBlank2 = nBlank2 + static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nNull ); rInf.SetIdx( rInf.GetIdx() + pPor->GetLen() ); if( pPor->InTabGrp() ) SetTab2( true ); @@ -651,7 +651,7 @@ void SwRubyPortion::_Adjust( SwTxtFormatInfo &rInf ) for( pPor = pCurr->GetFirstPortion(); pPor; pPor = pPor->GetPortion() ) { if( pPor->InTxtGrp() ) - ((SwTxtPortion*)pPor)->GetSpaceCnt( rInf, nCharCnt ); + static_cast<SwTxtPortion*>(pPor)->GetSpaceCnt( rInf, nCharCnt ); rInf.SetIdx( rInf.GetIdx() + pPor->GetLen() ); } if( nCharCnt > nSub ) @@ -716,7 +716,7 @@ void SwRubyPortion::CalcRubyOffset() while( pPor ) { if( pPor->InFldGrp() ) - pFld = (SwFldPortion*)pPor; + pFld = static_cast<const SwFldPortion*>(pPor); pPor = pPor->GetPortion(); } if( pFld ) @@ -740,12 +740,12 @@ static bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* &rpRef const SfxPoolItem* pItem = CharFmt::GetItem( rAttr, RES_CHRATR_TWO_LINES ); if( pItem ) { - rValue = ((SvxTwoLinesItem*)pItem)->GetValue(); + rValue = static_cast<const SvxTwoLinesItem*>(pItem)->GetValue(); if( !rpRef ) - rpRef = (SvxTwoLinesItem*)pItem; - else if( ((SvxTwoLinesItem*)pItem)->GetEndBracket() != + rpRef = static_cast<const SvxTwoLinesItem*>(pItem); + else if( static_cast<const SvxTwoLinesItem*>(pItem)->GetEndBracket() != rpRef->GetEndBracket() || - ((SvxTwoLinesItem*)pItem)->GetStartBracket() != + static_cast<const SvxTwoLinesItem*>(pItem)->GetStartBracket() != rpRef->GetStartBracket() ) rValue = false; return true; @@ -766,10 +766,10 @@ static bool lcl_HasRotation( const SwTxtAttr& rAttr, const SfxPoolItem* pItem = CharFmt::GetItem( rAttr, RES_CHRATR_ROTATE ); if ( pItem ) { - rValue = ((SvxCharRotateItem*)pItem)->GetValue(); + rValue = static_cast<const SvxCharRotateItem*>(pItem)->GetValue(); if( !rpRef ) - rpRef = (SvxCharRotateItem*)pItem; - else if( ((SvxCharRotateItem*)pItem)->GetValue() != + rpRef = static_cast<const SvxCharRotateItem*>(pItem); + else if( static_cast<const SvxCharRotateItem*>(pItem)->GetValue() != rpRef->GetValue() ) rValue = false; return true; @@ -798,7 +798,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos, { OSL_ENSURE( pMulti->IsBidi(), "Nested MultiPortion is not BidiPortion" ); // level associated with bidi-portion; - nCurrLevel = ((SwBidiPortion*)pMulti)->GetLevel(); + nCurrLevel = static_cast<SwBidiPortion*>(pMulti)->GetLevel(); } else // no nested bidi portion required @@ -836,8 +836,8 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos, const SfxPoolItem* pRotItem; if( SfxItemState::SET == m_pFrm->GetTxtNode()->GetSwAttrSet(). GetItemState( RES_CHRATR_ROTATE, true, &pRotItem ) && - ((SvxCharRotateItem*)pRotItem)->GetValue() ) - pRotate = (SvxCharRotateItem*)pRotItem; + static_cast<const SvxCharRotateItem*>(pRotItem)->GetValue() ) + pRotate = static_cast<const SvxCharRotateItem*>(pRotItem); else pRotItem = NULL; const SvxTwoLinesItem* p2Lines = NULL; @@ -847,8 +847,8 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos, const SfxPoolItem* pItem; if( SfxItemState::SET == pLclTxtNode->GetSwAttrSet(). GetItemState( RES_CHRATR_TWO_LINES, true, &pItem ) && - ((SvxTwoLinesItem*)pItem)->GetValue() ) - p2Lines = (SvxTwoLinesItem*)pItem; + static_cast<const SvxTwoLinesItem*>(pItem)->GetValue() ) + p2Lines = static_cast<const SvxTwoLinesItem*>(pItem); else pItem = NULL; @@ -921,9 +921,9 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos, if( pItem ) { aEnd.front() = GetTxt().getLength(); - bOn = ((SvxTwoLinesItem*)pItem)->GetEndBracket() == + bOn = static_cast<const SvxTwoLinesItem*>(pItem)->GetEndBracket() == p2Lines->GetEndBracket() && - ((SvxTwoLinesItem*)pItem)->GetStartBracket() == + static_cast<const SvxTwoLinesItem*>(pItem)->GetStartBracket() == p2Lines->GetStartBracket(); } } @@ -1093,7 +1093,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( sal_Int32 &rPos, if( pRotItem ) { aEnd.front() = GetTxt().getLength(); - bOn = ((SvxCharRotateItem*)pRotItem)->GetValue() == + bOn = static_cast<const SvxCharRotateItem*>(pRotItem)->GetValue() == pRotate->GetValue(); } } @@ -1285,8 +1285,8 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, OSL_ENSURE( ! pEnvPor || pEnvPor->IsBidi(), "Oh no, I expected a BidiPortion" ); nFrmDir = GetInfo().GetTxtFrm()->IsRightToLeft() ? 1 : 0; - nEnvDir = pEnvPor ? ((SwBidiPortion*)pEnvPor)->GetLevel() % 2 : nFrmDir; - nThisDir = ((SwBidiPortion&)rMulti).GetLevel() % 2; + nEnvDir = pEnvPor ? static_cast<const SwBidiPortion*>(pEnvPor)->GetLevel() % 2 : nFrmDir; + nThisDir = static_cast<SwBidiPortion&>(rMulti).GetLevel() % 2; } #if OSL_DEBUG_LEVEL > 1 @@ -1333,9 +1333,9 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, if( rMulti.HasBrackets() ) { sal_Int32 nTmpOldIdx = GetInfo().GetIdx(); - GetInfo().SetIdx(((SwDoubleLinePortion&)rMulti).GetBrackets()->nStart); + GetInfo().SetIdx(static_cast<SwDoubleLinePortion&>(rMulti).GetBrackets()->nStart); SeekAndChg( GetInfo() ); - ((SwDoubleLinePortion&)rMulti).PaintBracket( GetInfo(), 0, true ); + static_cast<SwDoubleLinePortion&>(rMulti).PaintBracket( GetInfo(), 0, true ); GetInfo().SetIdx( nTmpOldIdx ); } @@ -1436,7 +1436,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, if( bRest && pPor->InFldGrp() && !pPor->GetLen() ) { - if( ((SwFldPortion*)pPor)->HasFont() ) + if( static_cast<SwFldPortion*>(pPor)->HasFont() ) bSeeked = false; else SeekAndChgBefore( GetInfo() ); @@ -1477,11 +1477,11 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, pTmpFont->SetVertical( 0, GetInfo().GetTxtFrm()->IsVertical() ); } - if( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) + if( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->IsBidi() ) { // but we do allow nested bidi portions OSL_ENSURE( rMulti.IsBidi(), "Only nesting of bidi portions is allowed" ); - PaintMultiPortion( rPaint, (SwMultiPortion&)*pPor, &rMulti ); + PaintMultiPortion( rPaint, static_cast<SwMultiPortion&>(*pPor), &rMulti ); } else pPor->Paint( GetInfo() ); @@ -1558,10 +1558,10 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, if( rMulti.HasBrackets() ) { sal_Int32 nTmpOldIdx = GetInfo().GetIdx(); - GetInfo().SetIdx(((SwDoubleLinePortion&)rMulti).GetBrackets()->nStart); + GetInfo().SetIdx(static_cast<SwDoubleLinePortion&>(rMulti).GetBrackets()->nStart); SeekAndChg( GetInfo() ); GetInfo().X( nOldX ); - ((SwDoubleLinePortion&)rMulti).PaintBracket( GetInfo(), + static_cast<SwDoubleLinePortion&>(rMulti).PaintBracket( GetInfo(), aManip.GetSpaceAdd(), false ); GetInfo().SetIdx( nTmpOldIdx ); } @@ -1585,7 +1585,7 @@ static bool lcl_ExtractFieldFollow( SwLineLayout* pLine, SwLinePortion* &rpFld ) bool bRet = rpFld != 0; if( bRet ) { - if( ((SwFldPortion*)rpFld)->IsFollow() ) + if( static_cast<SwFldPortion*>(rpFld)->IsFollow() ) { rpFld->Truncate(); pLast->SetPortion( NULL ); @@ -1630,10 +1630,10 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, if( rMulti.HasBrackets() ) { sal_Int32 nOldIdx = rInf.GetIdx(); - rInf.SetIdx( ((SwDoubleLinePortion&)rMulti).GetBrackets()->nStart ); + rInf.SetIdx( static_cast<SwDoubleLinePortion&>(rMulti).GetBrackets()->nStart ); SeekAndChg( rInf ); nOldX = GetInfo().X(); - ((SwDoubleLinePortion&)rMulti).FormatBrackets( rInf, nMaxWidth ); + static_cast<SwDoubleLinePortion&>(rMulti).FormatBrackets( rInf, nMaxWidth ); rInf.SetIdx( nOldIdx ); } @@ -1680,7 +1680,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, assert(pUpperFrm); //pFrm is in table but does not have an upper cell frame if (!pUpperFrm) return false; - const SwTableLine* pLine = ((SwRowFrm*)pUpperFrm->GetUpper())->GetTabLine(); + const SwTableLine* pLine = static_cast<const SwRowFrm*>(pUpperFrm->GetUpper())->GetTabLine(); const SwFmtFrmSize& rFrmFmtSize = pLine->GetFrmFmt()->GetFrmSize(); if ( ATT_VAR_SIZE == rFrmFmtSize.GetHeightSizeType() ) pUpperFrm = pPage; @@ -1772,8 +1772,8 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, { OSL_ENSURE( pFirstRest->InFldGrp(), "BuildMulti: Fieldrest expected"); SwFldPortion *pFld = - ((SwFldPortion*)pFirstRest)->Clone( - ((SwFldPortion*)pFirstRest)->GetExp() ); + static_cast<SwFldPortion*>(pFirstRest)->Clone( + static_cast<SwFldPortion*>(pFirstRest)->GetExp() ); pFld->SetFollow( true ); aInf.SetRest( pFld ); } @@ -1818,8 +1818,8 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, if( pSecondRest ) { OSL_ENSURE( pSecondRest->InFldGrp(), "Fieldrest expected"); - SwFldPortion *pFld = ((SwFldPortion*)pSecondRest)->Clone( - ((SwFldPortion*)pSecondRest)->GetExp() ); + SwFldPortion *pFld = static_cast<SwFldPortion*>(pSecondRest)->Clone( + static_cast<SwFldPortion*>(pSecondRest)->GetExp() ); pFld->SetFollow( true ); aTmp.SetRest( pFld ); } @@ -1900,11 +1900,11 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, if( rMulti.IsDouble() ) { - ((SwDoubleLinePortion&)rMulti).CalcBlanks( rInf ); - if( ((SwDoubleLinePortion&)rMulti).GetLineDiff() ) + static_cast<SwDoubleLinePortion&>(rMulti).CalcBlanks( rInf ); + if( static_cast<SwDoubleLinePortion&>(rMulti).GetLineDiff() ) { SwLineLayout* pLine = &rMulti.GetRoot(); - if( ((SwDoubleLinePortion&)rMulti).GetLineDiff() > 0 ) + if( static_cast<SwDoubleLinePortion&>(rMulti).GetLineDiff() > 0 ) { rInf.SetIdx( nStartIdx + pLine->GetLen() ); pLine = pLine->GetNext(); @@ -1926,10 +1926,10 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, } rInf.SetIdx( nStartIdx ); } - if( ((SwDoubleLinePortion&)rMulti).GetBrackets() ) + if( static_cast<SwDoubleLinePortion&>(rMulti).GetBrackets() ) { rMulti.Width( rMulti.Width() + - ((SwDoubleLinePortion&)rMulti).BracketWidth() ); + static_cast<SwDoubleLinePortion&>(rMulti).BracketWidth() ); GetInfo().X( nOldX ); } } @@ -1938,8 +1938,8 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, rMulti.ActualizeTabulator(); if( rMulti.IsRuby() ) { - ((SwRubyPortion&)rMulti).Adjust( rInf ); - ((SwRubyPortion&)rMulti).CalcRubyOffset(); + static_cast<SwRubyPortion&>(rMulti).Adjust( rInf ); + static_cast<SwRubyPortion&>(rMulti).CalcRubyOffset(); } } if( rMulti.HasRotation() ) @@ -1968,7 +1968,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, "BuildMultiPortion: Surprising restportion, field expected" ); SwMultiPortion *pTmp; if( rMulti.IsDouble() ) - pTmp = new SwDoubleLinePortion( ((SwDoubleLinePortion&)rMulti), + pTmp = new SwDoubleLinePortion( static_cast<SwDoubleLinePortion&>(rMulti), nMultiLen + rInf.GetIdx() ); else if( rMulti.IsRuby() ) { @@ -1978,7 +1978,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, if ( rInf.GetIdx() == rInf.GetLineStart() ) { // the ruby portion has to be split in two portions - pTmp = new SwRubyPortion( ((SwRubyPortion&)rMulti), + pTmp = new SwRubyPortion( static_cast<SwRubyPortion&>(rMulti), nMultiLen + rInf.GetIdx() ); if( pNextSecond ) @@ -2029,7 +2029,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, } pTmp = new SwBidiPortion( nMultiLen + rInf.GetIdx(), - ((SwBidiPortion&)rMulti).GetLevel() ); + static_cast<SwBidiPortion&>(rMulti).GetLevel() ); } else pTmp = NULL; @@ -2101,7 +2101,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine, { if( !pHelpMulti ) pTmpMulti = NULL; - pFld = (SwFldPortion*)pPor; + pFld = const_cast<SwFldPortion*>(static_cast<const SwFldPortion*>(pPor)); } else if( pPor->IsMultiPortion() ) { @@ -2109,7 +2109,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine, "Nested multiportions are forbidden." ); pFld = NULL; - pTmpMulti = (SwMultiPortion*)pPor; + pTmpMulti = static_cast<const SwMultiPortion*>(pPor); } pPor = pPor->GetPortion(); // If the last portion is a multi-portion, we enter it @@ -2151,7 +2151,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine, { pRest = NewFldPortion( GetInfo(), pHint ); if( pRest->InFldGrp() ) - ((SwFldPortion*)pRest)->TakeNextOffset( pFld ); + static_cast<SwFldPortion*>(pRest)->TakeNextOffset( pFld ); else { delete pRest; @@ -2177,7 +2177,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine, return pRest; if( pRest || nMultiPos > nPosition || ( pHelpMulti->IsRuby() && - ((SwRubyPortion*)pHelpMulti)->GetRubyOffset() < COMPLETE_STRING ) ) + static_cast<const SwRubyPortion*>(pHelpMulti)->GetRubyOffset() < COMPLETE_STRING ) ) { SwMultiPortion* pTmp; if( pHelpMulti->IsDouble() ) @@ -2202,7 +2202,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine, pTmp = new SwRubyPortion( *pCreate, *GetInfo().GetFont(), *pFrm->GetTxtNode()->getIDocumentSettingAccess(), - nMultiPos, ((SwRubyPortion*)pHelpMulti)->GetRubyOffset(), + nMultiPos, static_cast<const SwRubyPortion*>(pHelpMulti)->GetRubyOffset(), pRubyPos ); } else if( pHelpMulti->HasRotation() ) @@ -2259,13 +2259,13 @@ SwTxtCursorSave::SwTxtCursorSave( SwTxtCursor* pTxtCursor, if ( pMulti->IsDouble() ) { pTxtCursor->SetPropFont( 50 ); - nSpaceCnt = ((SwDoubleLinePortion*)pMulti)->GetSpaceCnt(); + nSpaceCnt = static_cast<SwDoubleLinePortion*>(pMulti)->GetSpaceCnt(); } else { const sal_Int32 nOldIdx = pTxtCursor->GetInfo().GetIdx(); pTxtCursor->GetInfo().SetIdx ( nCurrStart ); - nSpaceCnt = ((SwBidiPortion*)pMulti)->GetSpaceCnt(pTxtCursor->GetInfo()); + nSpaceCnt = static_cast<SwBidiPortion*>(pMulti)->GetSpaceCnt(pTxtCursor->GetInfo()); pTxtCursor->GetInfo().SetIdx ( nOldIdx ); } diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx index 850d323b1d7c..c0af24b5bcf1 100644 --- a/sw/source/core/text/pormulti.hxx +++ b/sw/source/core/text/pormulti.hxx @@ -248,7 +248,7 @@ public: inline bool SwMultiPortion::HasBrackets() const { - return IsDouble() && 0 != ((SwDoubleLinePortion*)this)->GetBrackets(); + return IsDouble() && 0 != static_cast<const SwDoubleLinePortion*>(this)->GetBrackets(); } #endif diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index a00a0a749eb6..345703032737 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -208,7 +208,7 @@ SwTwips SwTxtFrm::EmptyHeight() const if (IsCollapse()) { SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( pSh->IsA( TYPE(SwCrsrShell) ) ) { - SwCrsrShell *pCrSh=(SwCrsrShell*)pSh; + SwCrsrShell *pCrSh = static_cast<SwCrsrShell*>(pSh); SwCntntFrm *pCurrFrm=pCrSh->GetCurrFrm(); if (pCurrFrm==(SwCntntFrm*)this) { // do nothing @@ -359,7 +359,7 @@ bool SwTxtFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff ) pFrm = pFrm->FindPageFrm(); if( pFrm->IsPageFrm() ) { - SwPageDesc* pDesc = ((SwPageFrm*)pFrm)->FindPageDesc(); + SwPageDesc* pDesc = const_cast<SwPageFrm*>(static_cast<const SwPageFrm*>(pFrm))->FindPageDesc(); if( pDesc ) { rRegDiff = pDesc->GetRegHeight(); diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 4f17702621f9..6b14932d9c70 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -389,7 +389,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) ( rInf.GetLast()->InFldGrp() && ! rInf.GetLast()->InNumberGrp() && ! rInf.GetLast()->IsErgoSumPortion() && - lcl_HasContent(*((SwFldPortion*)rInf.GetLast()),rInf ) ) ) ) ) + lcl_HasContent(*static_cast<SwFldPortion*>(rInf.GetLast()),rInf ) ) ) ) ) { if ( rInf.X() + aGuess.BreakWidth() <= rInf.Width() ) Width( aGuess.BreakWidth() ); @@ -420,7 +420,7 @@ bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) aGuess.BreakPos() != rInf.GetLineStart() && ( !bFirstPor || rInf.GetFly() || rInf.GetLast()->IsFlyPortion() || rInf.IsFirstMulti() ) && - ( !rInf.GetLast()->IsBlankPortion() || ((SwBlankPortion*) + ( !rInf.GetLast()->IsBlankPortion() || static_cast<SwBlankPortion*>( rInf.GetLast())->MayUnderflow( rInf, rInf.GetIdx()-1, true ))) { // case C1 (former BreakUnderflow()) BreakUnderflow( rInf ); @@ -485,8 +485,8 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf ) rInf.X( rInf.X() - nBlankSize ); SetLen( GetLen() - nHoleLen ); SwLinePortion *pHole = new SwHolePortion( *this ); - ( (SwHolePortion *)pHole )->SetBlankWidth( nBlankSize ); - ( (SwHolePortion *)pHole )->SetLen( nHoleLen ); + static_cast<SwHolePortion *>( pHole )->SetBlankWidth( nBlankSize ); + static_cast<SwHolePortion *>( pHole )->SetLen( nHoleLen ); Insert( pHole ); } } diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx index b6d1db0377c4..4fd050f61ef9 100644 --- a/sw/source/core/text/txtcache.cxx +++ b/sw/source/core/text/txtcache.cxx @@ -41,10 +41,10 @@ SwParaPortion *SwTxtLineAccess::GetPara() { SwTxtLine *pRet; if ( pObj ) - pRet = (SwTxtLine*)pObj; + pRet = static_cast<SwTxtLine*>(pObj); else { - pRet = (SwTxtLine*)Get(); + pRet = static_cast<SwTxtLine*>(Get()); ((SwTxtFrm*)pOwner)->SetCacheIdx( pRet->GetCachePos() ); } if ( !pRet->GetPara() ) @@ -59,13 +59,13 @@ SwTxtLineAccess::SwTxtLineAccess( const SwTxtFrm *pOwn ) : bool SwTxtLineAccess::IsAvailable() const { - return pObj && ((SwTxtLine*)pObj)->GetPara(); + return pObj && static_cast<SwTxtLine*>(pObj)->GetPara(); } bool SwTxtFrm::_HasPara() const { - SwTxtLine *pTxtLine = (SwTxtLine*)SwTxtFrm::GetTxtCache()-> - Get( this, GetCacheIdx(), false ); + SwTxtLine *pTxtLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()-> + Get( this, GetCacheIdx(), false )); if ( pTxtLine ) { if ( pTxtLine->GetPara() ) @@ -80,8 +80,9 @@ bool SwTxtFrm::_HasPara() const SwParaPortion *SwTxtFrm::GetPara() { if ( GetCacheIdx() != USHRT_MAX ) - { SwTxtLine *pLine = (SwTxtLine*)SwTxtFrm::GetTxtCache()-> - Get( this, GetCacheIdx(), false ); + { + SwTxtLine *pLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()-> + Get( this, GetCacheIdx(), false )); if ( pLine ) return pLine->GetPara(); else @@ -95,8 +96,8 @@ void SwTxtFrm::ClearPara() OSL_ENSURE( !IsLocked(), "+SwTxtFrm::ClearPara: this is locked." ); if ( !IsLocked() && GetCacheIdx() != USHRT_MAX ) { - SwTxtLine *pTxtLine = (SwTxtLine*)SwTxtFrm::GetTxtCache()-> - Get( this, GetCacheIdx(), false ); + SwTxtLine *pTxtLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()-> + Get( this, GetCacheIdx(), false )); if ( pTxtLine ) { delete pTxtLine->GetPara(); @@ -112,8 +113,8 @@ void SwTxtFrm::SetPara( SwParaPortion *pNew, bool bDelete ) if ( GetCacheIdx() != USHRT_MAX ) { // Only change the information, the CacheObj stays there - SwTxtLine *pTxtLine = (SwTxtLine*)SwTxtFrm::GetTxtCache()-> - Get( this, GetCacheIdx(), false ); + SwTxtLine *pTxtLine = static_cast<SwTxtLine*>(SwTxtFrm::GetTxtCache()-> + Get( this, GetCacheIdx(), false )); if ( pTxtLine ) { if( bDelete ) diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx index aca6c89025d6..67c7d82f1a5a 100644 --- a/sw/source/core/text/txtcache.hxx +++ b/sw/source/core/text/txtcache.hxx @@ -60,7 +60,7 @@ public: inline SwTxtLine &SwTxtLineAccess::GetTxtLine() { - return *((SwTxtLine*)Get()); + return *static_cast<SwTxtLine*>(Get()); } #endif diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index eeb8e669d086..3d6c761e80f8 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -210,14 +210,14 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen const SwLinePortion* pFirstPor = pPara->GetFirstPortion(); if (pFirstPor && pFirstPor->IsDropPortion()) { - const SwDropPortion* pDrop = (const SwDropPortion*)pFirstPor; + const SwDropPortion* pDrop = static_cast<const SwDropPortion*>(pFirstPor); rDropHeight = pDrop->GetDropHeight(); rDropDescent = pDrop->GetDropDescent(); if (const SwFont *pFont = pDrop->GetFnt()) rFontHeight = pFont->GetSize(pFont->GetActual()).Height(); else { - const SvxFontHeightItem& rItem = (SvxFontHeightItem&)rSet.Get(RES_CHRATR_FONTSIZE); + const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get(RES_CHRATR_FONTSIZE)); rFontHeight = rItem.GetHeight(); } } @@ -231,7 +231,7 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen { const sal_uInt16 nLines = rDrop.GetLines(); - const SvxFontHeightItem& rItem = (SvxFontHeightItem&)rSet.Get( RES_CHRATR_FONTSIZE ); + const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get( RES_CHRATR_FONTSIZE )); rFontHeight = rItem.GetHeight(); rDropHeight = nLines * rFontHeight; rDropDescent = rFontHeight / 5; diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index f3049fb7c113..a6ed61e92a96 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -123,7 +123,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, case RES_CHAPTERFLD: if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() ) { - ((SwChapterField*)pFld)->ChangeExpansion( pFrame, + static_cast<SwChapterField*>(pFld)->ChangeExpansion( pFrame, &static_txtattr_cast<SwTxtFld const*>(pHint)->GetTxtNode()); } { @@ -137,7 +137,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, case RES_DOCSTATFLD: if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() ) { - ((SwDocStatField*)pFld)->ChangeExpansion( pFrame ); + static_cast<SwDocStatField*>(pFld)->ChangeExpansion( pFrame ); } { OUString const aStr( (bName) @@ -146,14 +146,14 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, pRet = new SwFldPortion( aStr ); } if(pRet) - ((SwFldPortion*)pRet)->m_nAttrFldType= ATTR_PAGECOOUNTFLD; + static_cast<SwFldPortion*>(pRet)->m_nAttrFldType= ATTR_PAGECOOUNTFLD; break; case RES_PAGENUMBERFLD: { if( !bName && pSh && pSh->GetLayout() && !pSh->Imp()->IsUpdateExpFlds() ) { - SwPageNumberFieldType *pPageNr = (SwPageNumberFieldType *)pFld->GetTyp(); + SwPageNumberFieldType *pPageNr = static_cast<SwPageNumberFieldType *>(pFld->GetTyp()); const SwRootFrm* pTmpRootFrm = pSh->GetLayout(); const bool bVirt = pTmpRootFrm->IsVirtPageNum(); @@ -175,14 +175,14 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, pRet = new SwFldPortion( aStr ); } if(pRet) - ((SwFldPortion*)pRet)->m_nAttrFldType= ATTR_PAGENUMBERFLD; + static_cast<SwFldPortion*>(pRet)->m_nAttrFldType= ATTR_PAGENUMBERFLD; break; } case RES_GETEXPFLD: { if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() ) { - SwGetExpField* pExpFld = (SwGetExpField*)pFld; + SwGetExpField* pExpFld = static_cast<SwGetExpField*>(pFld); if( !::lcl_IsInBody( pFrame ) ) { pExpFld->ChgBodyTxtFlag( false ); @@ -209,7 +209,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, { if( !bName ) { - SwDBField* pDBFld = (SwDBField*)pFld; + SwDBField* pDBFld = static_cast<SwDBField*>(pFld); pDBFld->ChgBodyTxtFlag( ::lcl_IsInBody( pFrame ) ); } { @@ -223,7 +223,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, case RES_REFPAGEGETFLD: if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() ) { - ((SwRefPageGetField*)pFld)->ChangeExpansion(pFrame, + static_cast<SwRefPageGetField*>(pFld)->ChangeExpansion(pFrame, static_txtattr_cast<SwTxtFld const*>(pHint)); } { @@ -236,12 +236,12 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, case RES_JUMPEDITFLD: if( !bName ) - pChFmt = ((SwJumpEditField*)pFld)->GetCharFmt(); + pChFmt = static_cast<SwJumpEditField*>(pFld)->GetCharFmt(); bNewFlyPor = true; bPlaceHolder = true; break; case RES_GETREFFLD: - subType = ((SwGetRefField*)pFld)->GetSubType(); + subType = static_cast<SwGetRefField*>(pFld)->GetSubType(); { OUString const str( (bName) ? pFld->GetFieldName() @@ -251,13 +251,13 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, if(pRet) { if( subType == REF_BOOKMARK ) - ((SwFldPortion*)pRet)->m_nAttrFldType = ATTR_BOOKMARKFLD; + static_cast<SwFldPortion*>(pRet)->m_nAttrFldType = ATTR_BOOKMARKFLD; else if( subType == REF_SETREFATTR ) - ((SwFldPortion*)pRet)->m_nAttrFldType = ATTR_SETREFATTRFLD; + static_cast<SwFldPortion*>(pRet)->m_nAttrFldType = ATTR_SETREFATTRFLD; break; } case RES_DATETIMEFLD: - subType = ((SwDateTimeField*)pFld)->GetSubType(); + subType = static_cast<SwDateTimeField*>(pFld)->GetSubType(); { OUString const str( (bName) ? pFld->GetFieldName() @@ -267,9 +267,9 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, if(pRet) { if( subType & DATEFLD ) - ((SwFldPortion*)pRet)->m_nAttrFldType= ATTR_DATEFLD; + static_cast<SwFldPortion*>(pRet)->m_nAttrFldType= ATTR_DATEFLD; else if( subType & TIMEFLD ) - ((SwFldPortion*)pRet)->m_nAttrFldType = ATTR_TIMEFLD; + static_cast<SwFldPortion*>(pRet)->m_nAttrFldType = ATTR_TIMEFLD; break; } default: @@ -496,7 +496,7 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const long nTmpA = rInf.GetLast()->GetAscent(); long nTmpD = rInf.GetLast()->Height() - nTmpA; if( !rInf.IsTest() ) - ((SwGrfNumPortion*)pRet)->SetBase( nTmpA, nTmpD, nTmpA, nTmpD ); + static_cast<SwGrfNumPortion*>(pRet)->SetBase( nTmpA, nTmpD, nTmpA, nTmpD ); } else { diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 43d837341ea2..37f1d5d40c76 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -226,8 +226,8 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, // GetContour() causes the graphic to be loaded, which may cause // the graphic to change its size, call ClrObject() tools::PolyPolygon aPoly; - if( !((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->GetContour( aPoly ) ) - aPoly = tools::PolyPolygon( ((SwVirtFlyDrawObj*)pObj)-> + if( !static_cast<const SwVirtFlyDrawObj*>(pObj)->GetFlyFrm()->GetContour( aPoly ) ) + aPoly = tools::PolyPolygon( static_cast<const SwVirtFlyDrawObj*>(pObj)-> GetFlyFrm()->Frm().SVRect() ); aPolyPolygon.clear(); aPolyPolygon.append(aPoly.getB2DPolyPolygon()); @@ -537,7 +537,7 @@ bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf ) // Except for the content is transparent const SwNoTxtFrm *pNoTxt = rFly.Lower() && rFly.Lower()->IsNoTxtFrm() - ? (SwNoTxtFrm*)rFly.Lower() + ? static_cast<const SwNoTxtFrm*>(rFly.Lower()) : 0; if ( !pNoTxt || (!pNoTxt->IsTransparent() && !rSur.IsContour()) ) @@ -643,7 +643,7 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect, } else { - if(((SvxBrushItem*)-1) != rInf.GetBrushItem()) + if(reinterpret_cast<SvxBrushItem*>(-1) != rInf.GetBrushItem()) { ::DrawGraphic(rInf.GetBrushItem(), pOut, rInf.GetBrushRect(), aRegion[i] ); } @@ -672,8 +672,8 @@ bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // #102344# Ignore connectors which have one or more connections if(pNew && pNew->ISA(SdrEdgeObj)) { - if(((SdrEdgeObj*)pNew)->GetConnectedNode(true) - || ((SdrEdgeObj*)pNew)->GetConnectedNode(false)) + if(static_cast<const SdrEdgeObj*>(pNew)->GetConnectedNode(true) + || static_cast<const SdrEdgeObj*>(pNew)->GetConnectedNode(false)) { return false; } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 90f5d5c98d7d..65fee169f600 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -488,7 +488,7 @@ void SwTxtFrm::HideFootnotes( sal_Int32 nStart, sal_Int32 nEnd ) { if( !pPage ) pPage = FindPageFrm(); - pPage->RemoveFtn( this, (SwTxtFtn*)pHt ); + pPage->RemoveFtn( this, static_cast<const SwTxtFtn*>(pHt) ); } } } @@ -946,8 +946,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) break; case RES_INS_TXT: { - nPos = ((SwInsTxt*)pNew)->nPos; - nLen = ((SwInsTxt*)pNew)->nLen; + nPos = static_cast<const SwInsTxt*>(pNew)->nPos; + nLen = static_cast<const SwInsTxt*>(pNew)->nLen; if( IsIdxInside( nPos, nLen ) ) { if( !nLen ) @@ -970,7 +970,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) break; case RES_DEL_CHR: { - nPos = ((SwDelChr*)pNew)->nPos; + nPos = static_cast<const SwDelChr*>(pNew)->nPos; InvalidateRange( SwCharRange( nPos, 1 ), -1 ); lcl_SetWrong( *this, nPos, -1, true ); lcl_SetScriptInval( *this, nPos ); @@ -981,8 +981,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) break; case RES_DEL_TXT: { - nPos = ((SwDelTxt*)pNew)->nStart; - nLen = ((SwDelTxt*)pNew)->nLen; + nPos = static_cast<const SwDelTxt*>(pNew)->nStart; + nLen = static_cast<const SwDelTxt*>(pNew)->nLen; const sal_Int32 m = -nLen; if( IsIdxInside( nPos, nLen ) ) { @@ -1000,8 +1000,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) break; case RES_UPDATE_ATTR: { - nPos = ((SwUpdateAttr*)pNew)->getStart(); - nLen = ((SwUpdateAttr*)pNew)->getEnd() - nPos; + nPos = static_cast<const SwUpdateAttr*>(pNew)->getStart(); + nLen = static_cast<const SwUpdateAttr*>(pNew)->getEnd() - nPos; if( IsIdxInside( nPos, nLen ) ) { // We need to reformat anyways, even if the invalidated @@ -1014,7 +1014,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) nLen = 1; _InvalidateRange( SwCharRange( nPos, nLen) ); - const sal_uInt16 nTmp = ((SwUpdateAttr*)pNew)->getWhichAttr(); + const sal_uInt16 nTmp = static_cast<const SwUpdateAttr*>(pNew)->getWhichAttr(); if( ! nTmp || RES_TXTATR_CHARFMT == nTmp || RES_TXTATR_AUTOFMT == nTmp || RES_FMT_CHG == nTmp || RES_ATTRSET_CHG == nTmp ) @@ -1024,8 +1024,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } } - if( isA11yRelevantAttribute( ((SwUpdateAttr*)pNew)->getWhichAttr() ) && - hasA11yRelevantAttribute( ((SwUpdateAttr*)pNew)->getFmtAttr() ) ) + if( isA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getWhichAttr() ) && + hasA11yRelevantAttribute( static_cast<const SwUpdateAttr*>(pNew)->getFmtAttr() ) ) { // #i104008# SwViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; @@ -1064,7 +1064,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) case RES_TXTATR_FIELD: case RES_TXTATR_ANNOTATION: { - nPos = ((SwFmtFld*)pNew)->GetTxtFld()->GetStart(); + nPos = static_cast<const SwFmtFld*>(pNew)->GetTxtFld()->GetStart(); if( IsIdxInside( nPos, 1 ) ) { if( pNew == pOld ) @@ -1086,9 +1086,9 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) case RES_TXTATR_FTN : { - nPos = ((SwFmtFtn*)pNew)->GetTxtFtn()->GetStart(); + nPos = static_cast<const SwFmtFtn*>(pNew)->GetTxtFtn()->GetStart(); if( IsInFtn() || IsIdxInside( nPos, 1 ) ) - Prepare( PREP_FTN, ((SwFmtFtn*)pNew)->GetTxtFtn() ); + Prepare( PREP_FTN, static_cast<const SwFmtFtn*>(pNew)->GetTxtFtn() ); break; } @@ -1096,14 +1096,14 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { InvalidateLineNum(); - SwAttrSet& rNewSet = *((SwAttrSetChg*)pNew)->GetChgSet(); + const SwAttrSet& rNewSet = *static_cast<const SwAttrSetChg*>(pNew)->GetChgSet(); const SfxPoolItem* pItem = 0; int nClear = 0; sal_uInt16 nCount = rNewSet.Count(); if( SfxItemState::SET == rNewSet.GetItemState( RES_TXTATR_FTN, false, &pItem )) { - nPos = ((SwFmtFtn*)pItem)->GetTxtFtn()->GetStart(); + nPos = static_cast<const SwFmtFtn*>(pItem)->GetTxtFtn()->GetStart(); if( IsIdxInside( nPos, 1 ) ) Prepare( PREP_FTN, pNew ); nClear = 0x01; @@ -1112,11 +1112,11 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( SfxItemState::SET == rNewSet.GetItemState( RES_TXTATR_FIELD, false, &pItem )) { - nPos = ((SwFmtFld*)pItem)->GetTxtFld()->GetStart(); + nPos = static_cast<const SwFmtFld*>(pItem)->GetTxtFld()->GetStart(); if( IsIdxInside( nPos, 1 ) ) { const SfxPoolItem& rOldItem = - ((SwAttrSetChg*)pOld)->GetChgSet()->Get( RES_TXTATR_FIELD ); + static_cast<const SwAttrSetChg*>(pOld)->GetChgSet()->Get( RES_TXTATR_FIELD ); if( pItem == &rOldItem ) { InvalidatePage(); @@ -1244,8 +1244,8 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( nClear ) { - SwAttrSetChg aOldSet( *(SwAttrSetChg*)pOld ); - SwAttrSetChg aNewSet( *(SwAttrSetChg*)pNew ); + SwAttrSetChg aOldSet( *static_cast<const SwAttrSetChg*>(pOld) ); + SwAttrSetChg aNewSet( *static_cast<const SwAttrSetChg*>(pNew) ); if( 0x01 & nClear ) { @@ -1298,10 +1298,10 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { if( pOld && pNew ) { - const SwDocPosUpdate *pDocPos = (const SwDocPosUpdate*)pOld; + const SwDocPosUpdate *pDocPos = static_cast<const SwDocPosUpdate*>(pOld); if( pDocPos->nDocPos <= maFrm.Top() ) { - const SwFmtFld *pFld = (const SwFmtFld *)pNew; + const SwFmtFld *pFld = static_cast<const SwFmtFld *>(pNew); InvalidateRange( SwCharRange( pFld->GetTxtFld()->GetStart(), 1 ) ); } @@ -1343,7 +1343,7 @@ bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const { if ( RES_VIRTPAGENUM_INFO == rHnt.Which() && IsInDocBody() && ! IsFollow() ) { - SwVirtPageNumInfo &rInfo = (SwVirtPageNumInfo&)rHnt; + SwVirtPageNumInfo &rInfo = static_cast<SwVirtPageNumInfo&>(rHnt); const SwPageFrm *pPage = FindPageFrm(); if ( pPage ) { @@ -2516,7 +2516,7 @@ void SwTxtFrm::RecalcAllLines() if ( bRestart && pPrv && pPrv->FindPageFrm() != FindPageFrm() ) pPrv = 0; - nNewNum = pPrv ? ((SwTxtFrm*)pPrv)->GetAllLines() : 0; + nNewNum = pPrv ? static_cast<SwTxtFrm*>(pPrv)->GetAllLines() : 0; } if ( rLineNum.IsCount() ) nNewNum += GetThisLines(); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 068a41c9458d..62810bb34be0 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -123,7 +123,7 @@ bool SwTxtFrm::CalcPrepFtnAdjust() const SwFtnFrm *pFtn = pBoss->FindFirstFtn( this ); if( pFtn && FTNPOS_CHAPTER != GetNode()->GetDoc()->GetFtnInfo().ePos && ( !pBoss->GetUpper()->IsSctFrm() || - !((SwSectionFrm*)pBoss->GetUpper())->IsFtnAtEnd() ) ) + !static_cast<SwSectionFrm*>(pBoss->GetUpper())->IsFtnAtEnd() ) ) { const SwFtnContFrm *pCont = pBoss->FindFtnCont(); bool bReArrange = true; @@ -181,7 +181,7 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) const SwFrm* pRow = pFrm; while( !pRow->IsRowFrm() || !pRow->GetUpper()->IsTabFrm() ) pRow = pRow->GetUpper(); - const SwTabFrm* pTabFrm = (SwTabFrm*)pRow->GetUpper(); + const SwTabFrm* pTabFrm = static_cast<const SwTabFrm*>(pRow->GetUpper()); OSL_ENSURE( pTabFrm && pRow && pRow->GetUpper()->IsTabFrm(), "Upper of row should be tab" ); @@ -192,7 +192,7 @@ static SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower ) SwTwips nMin = 0; if ( bDontSplit ) nMin = (pTabFrm->Frm().*fnRect->fnGetBottom)(); - else if ( !((SwRowFrm*)pRow)->IsRowSplitAllowed() ) + else if ( !static_cast<const SwRowFrm*>(pRow)->IsRowSplitAllowed() ) nMin = (pRow->Frm().*fnRect->fnGetBottom)(); if ( nMin && (*fnRect->fnYDiff)( nMin, nLower ) > 0 ) @@ -291,7 +291,7 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const OSL_ENSURE( !IsFollow() && IsInFtn(), "SwTxtFrm::SetFtnLine: moon walk" ); const SwFtnFrm *pFtnFrm = FindFtnFrm(); - const SwTxtFrm *pRef = (const SwTxtFrm *)pFtnFrm->GetRef(); + const SwTxtFrm *pRef = static_cast<const SwTxtFrm *>(pFtnFrm->GetRef()); const SwFtnBossFrm *pBoss = FindFtnBossFrm(); if( pBoss != pRef->FindFtnBossFrm( !pFtnFrm->GetAttr()-> GetFtn().IsEndNote() ) ) @@ -335,10 +335,10 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const if ( !pRef->IsInFtnConnect() ) { SwSaveFtnHeight aSave( (SwFtnBossFrm*)pBoss, nHeight ); - nHeight = ((SwFtnContFrm*)pCont)->Grow( LONG_MAX, true ); + nHeight = const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pCont))->Grow( LONG_MAX, true ); } else - nHeight = ((SwFtnContFrm*)pCont)->Grow( LONG_MAX, true ); + nHeight = const_cast<SwFtnContFrm*>(static_cast<const SwFtnContFrm*>(pCont))->Grow( LONG_MAX, true ); nHeight += nTmp; if( nHeight < 0 ) @@ -371,15 +371,15 @@ SwTxtFrm *SwTxtFrm::FindQuoVadisFrm() return 0; // Nun den letzten Cntnt: - const SwCntntFrm *pCnt = pFtnFrm->ContainsCntnt(); + SwCntntFrm *pCnt = pFtnFrm->ContainsCntnt(); if( !pCnt ) return NULL; - const SwCntntFrm *pLast; + SwCntntFrm *pLast; do { pLast = pCnt; pCnt = pCnt->GetNextCntntFrm(); } while( pCnt && pFtnFrm->IsAnLower( pCnt ) ); - return (SwTxtFrm*)pLast; + return static_cast<SwTxtFrm*>(pLast); } void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) @@ -428,7 +428,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) if( nEnd >= nIdx ) { - SwTxtFtn *pFtn = (SwTxtFtn*)pHt; + SwTxtFtn *pFtn = static_cast<SwTxtFtn*>(pHt); const bool bEndn = pFtn->GetFtn().IsEndNote(); if( bEndn ) @@ -443,8 +443,8 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) pFtnBoss = pSource->FindFtnBossFrm( true ); if( pFtnBoss->GetUpper()->IsSctFrm() ) { - SwSectionFrm* pSect = (SwSectionFrm*) - pFtnBoss->GetUpper(); + SwSectionFrm* pSect = static_cast<SwSectionFrm*>( + pFtnBoss->GetUpper()); if( pSect->IsFtnAtEnd() ) bFtnEndDoc = false; } @@ -478,7 +478,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) else if( GetFollow() ) { SwCntntFrm *pDest = GetFollow(); - while( pDest->GetFollow() && ((SwTxtFrm*)pDest-> + while( pDest->GetFollow() && static_cast<SwTxtFrm*>(pDest-> GetFollow())->GetOfst() <= nIdx ) pDest = pDest->GetFollow(); OSL_ENSURE( !SwFtnBossFrm::FindFtn( @@ -505,7 +505,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) pFtnBoss->MoveFtns( this, pDest, pFtn ); bRemove = true; } - ((SwTxtFrm*)pDest)->SetFtn( true ); + static_cast<SwTxtFrm*>(pDest)->SetFtn( true ); OSL_ENSURE( SwFtnBossFrm::FindFtn( pDest, pFtn),"SwTxtFrm::RemoveFtn: footnote ChgRef failed"); @@ -784,8 +784,8 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf, if( !pFrm->IsFtnAllowed() ) return 0; - SwTxtFtn *pFtn = (SwTxtFtn*)pHint; - SwFmtFtn& rFtn = (SwFmtFtn&)pFtn->GetFtn(); + SwTxtFtn *pFtn = static_cast<SwTxtFtn*>(pHint); + const SwFmtFtn& rFtn = static_cast<const SwFmtFtn&>(pFtn->GetFtn()); SwDoc *pDoc = pFrm->GetNode()->GetDoc(); if( rInf.IsTest() ) @@ -866,7 +866,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf, SwFtnContFrm* pFtnC = pTmp->FindFtnCont(); if( pFtnC ) { - SwFtnFrm* pTmpFrm = (SwFtnFrm*)pFtnC->Lower(); + SwFtnFrm* pTmpFrm = static_cast<SwFtnFrm*>(pFtnC->Lower()); if( pTmpFrm && *pTmpFrm < pFtn ) { rInf.SetStop( true ); @@ -1058,8 +1058,8 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset ) while( pPor ) { if ( pPor->IsFlyPortion() ) - nLastLeft = ( (SwFlyPortion*) pPor)->Fix() + - ( (SwFlyPortion*) pPor)->Width(); + nLastLeft = static_cast<SwFlyPortion*>(pPor)->Fix() + + static_cast<SwFlyPortion*>(pPor)->Width(); pPor = pPor->GetPortion(); } // Das alte Spiel: wir wollen, dass die Zeile an einer bestimmten @@ -1110,7 +1110,7 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset ) // die beim erneuten Aufspannen nur Aerger bereiten wuerde. pPor = pCurr->FindLastPortion(); SwGluePortion *pGlue = pPor->IsMarginPortion() ? - (SwMarginPortion*) pPor : 0; + static_cast<SwMarginPortion*>(pPor) : 0; if( pGlue ) { pGlue->Height( 0 ); @@ -1181,7 +1181,7 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 nOffset ) { // pPor->Append deletes the pPortoin pointer of pPor. Therefore // we have to keep a pointer to the next portion - pQuo = (SwQuoVadisPortion*)pCurrPor->GetPortion(); + pQuo = static_cast<SwQuoVadisPortion*>(pCurrPor->GetPortion()); pPor->Append( pCurrPor ); pPor = pPor->GetPortion(); pCurrPor = pQuo; @@ -1280,14 +1280,14 @@ SwFtnSave::SwFtnSave( const SwTxtSizeInfo &rInf, const SfxPoolItem* pItem; if( SfxItemState::SET == rSet.GetItemState( RES_CHRATR_ROTATE, true, &pItem )) - pFnt->SetVertical( ((SvxCharRotateItem*)pItem)->GetValue(), + pFnt->SetVertical( static_cast<const SvxCharRotateItem*>(pItem)->GetValue(), rInf.GetTxtFrm()->IsVertical() ); pFnt->ChgPhysFnt( pInf->GetVsh(), *pInf->GetOut() ); if( SfxItemState::SET == rSet.GetItemState( RES_CHRATR_BACKGROUND, true, &pItem )) - pFnt->SetBackColor( new Color( ((SvxBrushItem*)pItem)->GetColor() ) ); + pFnt->SetBackColor( new Color( static_cast<const SvxBrushItem*>(pItem)->GetColor() ) ); } else pFnt = NULL; @@ -1485,7 +1485,7 @@ void SwParaPortion::SetErgoSumNum( const OUString& rErgo ) while( pPor && !pQuo ) { if ( pPor->IsQuoVadisPortion() ) - pQuo = (SwQuoVadisPortion*)pPor; + pQuo = static_cast<SwQuoVadisPortion*>(pPor); pPor = pPor->GetPortion(); } if( pQuo ) @@ -1505,7 +1505,7 @@ bool SwParaPortion::UpdateQuoVadis( const OUString &rQuo ) while( pPor && !pQuo ) { if ( pPor->IsQuoVadisPortion() ) - pQuo = (SwQuoVadisPortion*)pPor; + pQuo = static_cast<SwQuoVadisPortion*>(pPor); pPor = pPor->GetPortion(); } diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index 0252788fbe10..bf6d143b5045 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -182,7 +182,7 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) if( nWrdStart >= nPamStart && pPos->InHyphGrp() && ( !pPos->IsSoftHyphPortion() - || ((SwSoftHyphPortion*)pPos)->IsExpand() ) ) + || static_cast<SwSoftHyphPortion*>(pPos)->IsExpand() ) ) { nWrdStart = nWrdStart + pPos->GetLen(); break; @@ -202,7 +202,7 @@ bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) if( pOldCurr->IsParaPortion() ) { - SetParaPortion( &rInf, (SwParaPortion*)pOldCurr ); + SetParaPortion( &rInf, static_cast<SwParaPortion*>(pOldCurr) ); OSL_ENSURE( IsParaLine(), "SwTxtFormatter::Hyphenate: even not the first" ); } diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 144bb86ba882..42ae430a6628 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -149,8 +149,8 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) if( USHRT_MAX == nDefTabDist ) { const SvxTabStopItem& rTab = - (const SvxTabStopItem &)pFrm->GetAttrSet()-> - GetPool()->GetDefaultItem( RES_PARATR_TABSTOP ); + static_cast<const SvxTabStopItem &>(pFrm->GetAttrSet()-> + GetPool()->GetDefaultItem( RES_PARATR_TABSTOP )); if( rTab.Count() ) nDefTabDist = (sal_uInt16)rTab[0].GetTabPos(); else @@ -371,7 +371,7 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf ) { if( POR_TABDECIMAL == nWhich ) rInf.SetTabDecimal( - ((SwTabDecimalPortion*)this)->GetTabDecimal()); + static_cast<SwTabDecimalPortion*>(this)->GetTabDecimal()); rInf.SetLastTab( this ); break; } diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx index a3e28097b9bb..89ad3980d21c 100644 --- a/sw/source/core/text/widorp.cxx +++ b/sw/source/core/text/widorp.cxx @@ -47,7 +47,7 @@ namespace inline bool IsNastyFollow( const SwTxtFrm *pFrm ) { OSL_ENSURE( !pFrm->IsFollow() || !pFrm->GetPrev() || - ((const SwTxtFrm*)pFrm->GetPrev())->GetFollow() == pFrm, + static_cast<const SwTxtFrm*>(pFrm->GetPrev())->GetFollow() == pFrm, "IsNastyFollow: Was ist denn hier los?" ); return pFrm->IsFollow() && pFrm->GetPrev(); } diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index e74ecd15a47b..e5865b34d5ff 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -337,7 +337,7 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer ) const // Dump the children if ( IsTxtFrm( ) ) { - SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this; + const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm *>(this); OUString aTxt = pTxtFrm->GetTxt( ); for ( int i = 0; i < 32; i++ ) { @@ -392,13 +392,13 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "lower" ), "%" SAL_PRIuUINT32, GetLower()->GetFrmId() ); if ( IsTxtFrm( ) ) { - SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this; - SwTxtNode *pTxtNode = pTxtFrm->GetTxtNode(); + const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm *>(this); + const SwTxtNode *pTxtNode = pTxtFrm->GetTxtNode(); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "txtNodeIndex" ), TMP_FORMAT, pTxtNode->GetIndex() ); } if (IsHeaderFrm() || IsFooterFrm()) { - SwHeadFootFrm *pHeadFootFrm = (SwHeadFootFrm*)this; + const SwHeadFootFrm *pHeadFootFrm = static_cast<const SwHeadFootFrm*>(this); OUString aFmtName = pHeadFootFrm->GetFmt()->GetName(); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtName" ), "%s", BAD_CAST(OUStringToOString(aFmtName, RTL_TEXTENCODING_UTF8).getStr())); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "fmtPtr" ), "%p", pHeadFootFrm->GetFmt()); diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx index 1ab4ee4562e6..462adbfa483d 100644 --- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx +++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx @@ -48,7 +48,7 @@ DefaultToxTabStopTokenHandler::HandleTabStopToken( // check whether a tab adjustment has been specified. if (SVX_TAB_ADJUST_END > aToken.eTabAlign) { - const SvxLRSpaceItem& rLR = (SvxLRSpaceItem&) targetNode.SwCntntNode::GetAttr(RES_LR_SPACE, true); + const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( targetNode.SwCntntNode::GetAttr(RES_LR_SPACE, true) ); long nTabPosition = aToken.nTabStopPosition; if (!mTabPositionIsRelativeToParagraphIndent && rLR.GetTxtLeft()) { @@ -101,7 +101,7 @@ DefaultToxTabStopTokenHandler::CalculatePageMarginFromPageDescription(const SwTx DefaultToxTabStopTokenHandler::CanUseLayoutRectangle(const SwTxtNode& targetNode, const SwRootFrm *currentLayout) { const SwPageDesc* pageDescription = - ((SwFmtPageDesc&) targetNode.SwCntntNode::GetAttr(RES_PAGEDESC)).GetPageDesc(); + static_cast<const SwFmtPageDesc&>( targetNode.SwCntntNode::GetAttr(RES_PAGEDESC)).GetPageDesc(); if (!pageDescription) { return false; diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 100b83b0b6b2..a66278c5969a 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -142,7 +142,7 @@ void SwTOXMark::RegisterToTOXType(SwTOXType& rType) bool SwTOXMark::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return GetRegisteredIn() == ((SwTOXMark&)rAttr).GetRegisteredIn(); + return GetRegisteredIn() == static_cast<const SwTOXMark&>(rAttr).GetRegisteredIn(); } SfxPoolItem* SwTOXMark::Clone( SfxItemPool* ) const diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 50b576b968b1..9dd601411c0f 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -256,8 +256,8 @@ bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp ) } else if( pFirst && pFirst->IsTxtNode() && pNext && pNext->IsTxtNode() ) - return ::IsFrameBehind( *(SwTxtNode*)pNext, nCntPos, - *(SwTxtNode*)pFirst, nCntPos ); + return ::IsFrameBehind( *static_cast<const SwTxtNode*>(pNext), nCntPos, + *static_cast<const SwTxtNode*>(pFirst), nCntPos ); } } return false; @@ -280,7 +280,7 @@ SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd, bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase ) { - SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase; + const SwTOXIndex& rCmp = static_cast<const SwTOXIndex&>(rCmpBase); // Respect case taking dependencies into account if(GetLevel() != rCmp.GetLevel() || nKeyLevel != rCmp.nKeyLevel) @@ -302,7 +302,7 @@ bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase ) bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase ) { - SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase; + const SwTOXIndex& rCmp = static_cast<const SwTOXIndex&>(rCmpBase); OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword"); @@ -370,7 +370,7 @@ void SwTOXIndex::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) if( pEnd && !pTxtMark->GetTOXMark().IsAlternativeText() && 0 == (GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY)) { - aRet.sText = ((SwTxtNode*)aTOXSources[0].pNd)->GetExpandTxt( + aRet.sText = static_cast<const SwTxtNode*>(aTOXSources[0].pNd)->GetExpandTxt( pTxtMark->GetStart(), *pEnd - pTxtMark->GetStart()); if(nsSwTOIOptions::TOI_INITIAL_CAPS & nOpt && pTOXIntl && !aRet.sText.isEmpty()) @@ -449,7 +449,7 @@ TextAndReading SwTOXContent::GetText_Impl() const if( pEnd && !pTxtMark->GetTOXMark().IsAlternativeText() ) { return TextAndReading( - ((SwTxtNode*)aTOXSources[0].pNd)->GetExpandTxt( + static_cast<const SwTxtNode*>(aTOXSources[0].pNd)->GetExpandTxt( pTxtMark->GetStart(), *pEnd - pTxtMark->GetStart() ), pTxtMark->GetTOXMark().GetTextReading()); @@ -462,7 +462,7 @@ void SwTOXContent::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 { const sal_Int32* pEnd = pTxtMark->End(); if( pEnd && !pTxtMark->GetTOXMark().IsAlternativeText() ) - ((SwTxtNode*)aTOXSources[0].pNd)->GetExpandTxt( rNd, &rInsPos, + static_cast<const SwTxtNode*>(aTOXSources[0].pNd)->GetExpandTxt( rNd, &rInsPos, pTxtMark->GetStart(), *pEnd - pTxtMark->GetStart() ); else @@ -500,7 +500,7 @@ TextAndReading SwTOXPara::GetText_Impl() const case nsSwTOXElement::TOX_TEMPLATE: case nsSwTOXElement::TOX_OUTLINELEVEL: { - return TextAndReading(((SwTxtNode*)pNd)->GetExpandTxt( + return TextAndReading(static_cast<const SwTxtNode*>(pNd)->GetExpandTxt( nStartIndex, nEndIndex == -1 ? -1 : nEndIndex - nStartIndex), OUString()); @@ -534,7 +534,7 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) c { if( nsSwTOXElement::TOX_TEMPLATE == eType || nsSwTOXElement::TOX_SEQUENCE == eType || nsSwTOXElement::TOX_OUTLINELEVEL == eType) { - SwTxtNode* pSrc = (SwTxtNode*)aTOXSources[0].pNd; + const SwTxtNode* pSrc = static_cast<const SwTxtNode*>(aTOXSources[0].pNd); pSrc->GetExpandTxt( rNd, &rInsPos, nStartIndex, nEndIndex == -1 ? -1 : nEndIndex - nStartIndex, false, false, true ); @@ -552,7 +552,7 @@ sal_uInt16 SwTOXPara::GetLevel() const if( nsSwTOXElement::TOX_OUTLINELEVEL == eType && pNd->GetTxtNode() ) { - const int nTmp = ((SwTxtNode*)pNd)->GetAttrOutlineLevel(); + const int nTmp = static_cast<const SwTxtNode*>(pNd)->GetAttrOutlineLevel(); if(nTmp != 0 ) nRet = static_cast<sal_uInt16>(nTmp); } @@ -650,7 +650,7 @@ OUString SwTOXTable::GetURL() const if (!pNd) return OUString(); - const OUString sName = ((SwTableNode*)pNd)->GetTable().GetFrmFmt()->GetName(); + const OUString sName = static_cast<const SwTableNode*>(pNd)->GetTable().GetFrmFmt()->GetName(); if ( sName.isEmpty() ) return OUString(); @@ -668,7 +668,7 @@ SwTOXAuthority::SwTOXAuthority( const SwCntntNode& rNd, sal_uInt16 SwTOXAuthority::GetLevel() const { - OUString sText(((SwAuthorityField*)m_rField.GetField())->GetFieldText(AUTH_FIELD_AUTHORITY_TYPE)); + OUString sText(static_cast<SwAuthorityField*>(m_rField.GetField())->GetFieldText(AUTH_FIELD_AUTHORITY_TYPE)); //#i18655# the level '0' is the heading level therefore the values are incremented here sal_uInt16 nRet = 1; if( pTOXIntl->IsNumeric( sText ) ) @@ -695,12 +695,12 @@ TextAndReading SwTOXAuthority::GetText_Impl() const void SwTOXAuthority::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField ) const { - SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetField(); + SwAuthorityField* pField = static_cast<SwAuthorityField*>(m_rField.GetField()); OUString sText; if(AUTH_FIELD_IDENTIFIER == nAuthField) { sText = lcl_GetText(m_rField); - const SwAuthorityFieldType* pType = (const SwAuthorityFieldType*)pField->GetTyp(); + const SwAuthorityFieldType* pType = static_cast<const SwAuthorityFieldType*>(pField->GetTyp()); sal_Unicode cChar = pType->GetPrefix(); if(cChar && cChar != ' ') sText = sText.copy(1); @@ -722,22 +722,22 @@ void SwTOXAuthority::FillText( SwTxtNode& rNd, bool SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp) { return nType == rCmp.nType && - ((SwAuthorityField*)m_rField.GetField())->GetHandle() == - ((SwAuthorityField*)((SwTOXAuthority&)rCmp).m_rField.GetField())->GetHandle(); + static_cast<SwAuthorityField*>(m_rField.GetField())->GetHandle() == + static_cast<SwAuthorityField*>(static_cast<const SwTOXAuthority&>(rCmp).m_rField.GetField())->GetHandle(); } bool SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase) { bool bRet = false; - SwAuthorityField* pField = (SwAuthorityField*)m_rField.GetField(); - SwAuthorityFieldType* pType = (SwAuthorityFieldType*) - pField->GetTyp(); + SwAuthorityField* pField = static_cast<SwAuthorityField*>(m_rField.GetField()); + SwAuthorityFieldType* pType = static_cast<SwAuthorityFieldType*>( + pField->GetTyp()); if(pType->IsSortByDocument()) bRet = SwTOXSortTabBase::operator<(rBase); else { SwAuthorityField* pCmpField = - (SwAuthorityField*)((SwTOXAuthority&)rBase).m_rField.GetField(); + static_cast<SwAuthorityField*>(static_cast<const SwTOXAuthority&>(rBase).m_rField.GetField()); for(sal_uInt16 i = 0; i < pType->GetSortKeyCount(); i++) { diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 5379f79538ab..6c3c3dcbd6a9 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -43,7 +43,7 @@ class SwGrammarContact : public IGrammarContact, public SwClient Timer aTimer; SwGrammarMarkUp *mpProxyList; bool mbFinished; - SwTxtNode* getMyTxtNode() { return (SwTxtNode*)GetRegisteredIn(); } + SwTxtNode* getMyTxtNode() { return static_cast<SwTxtNode*>(GetRegisteredIn()); } DECL_LINK( TimerRepaint, Timer * ); public: @@ -118,7 +118,7 @@ SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( SwTxtNode& rTxtNode, bool bC if( !mpProxyList ) { if( rTxtNode.GetGrammarCheck() ) - mpProxyList = (SwGrammarMarkUp*)rTxtNode.GetGrammarCheck()->Clone(); + mpProxyList = static_cast<SwGrammarMarkUp*>(rTxtNode.GetGrammarCheck()->Clone()); else { mpProxyList = new SwGrammarMarkUp(); @@ -148,7 +148,7 @@ void SwGrammarContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem * ) if( !pOld || pOld->Which() != RES_OBJECTDYING ) return; - SwPtrMsgPoolItem *pDead = (SwPtrMsgPoolItem *)pOld; + const SwPtrMsgPoolItem *pDead = static_cast<const SwPtrMsgPoolItem *>(pOld); if( pDead->pObject == GetRegisteredIn() ) { // if my current paragraph dies, I throw the proxy list away aTimer.Stop(); diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 73c4d4c2d3ce..bf45bba005c4 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -129,15 +129,15 @@ SwFmtFld::~SwFmtFld() switch( pType->Which() ) { case RES_USERFLD: - bDel = ((SwUserFieldType*)pType)->IsDeleted(); + bDel = static_cast<SwUserFieldType*>(pType)->IsDeleted(); break; case RES_SETEXPFLD: - bDel = ((SwSetExpFieldType*)pType)->IsDeleted(); + bDel = static_cast<SwSetExpFieldType*>(pType)->IsDeleted(); break; case RES_DDEFLD: - bDel = ((SwDDEFieldType*)pType)->IsDeleted(); + bDel = static_cast<SwDDEFieldType*>(pType)->IsDeleted(); break; } @@ -186,10 +186,10 @@ void SwFmtFld::ClearTxtFld() bool SwFmtFld::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return ( ( mpField && ((SwFmtFld&)rAttr).GetField() - && mpField->GetTyp() == ((SwFmtFld&)rAttr).GetField()->GetTyp() - && mpField->GetFormat() == ((SwFmtFld&)rAttr).GetField()->GetFormat() ) ) - || ( !mpField && !((SwFmtFld&)rAttr).GetField() ); + return ( ( mpField && static_cast<const SwFmtFld&>(rAttr).GetField() + && mpField->GetTyp() == static_cast<const SwFmtFld&>(rAttr).GetField()->GetTyp() + && mpField->GetFormat() == static_cast<const SwFmtFld&>(rAttr).GetField()->GetFormat() ) ) + || ( !mpField && !static_cast<const SwFmtFld&>(rAttr).GetField() ); } SfxPoolItem* SwFmtFld::Clone( SfxItemPool* ) const @@ -292,7 +292,7 @@ void SwFmtFld::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) if( RES_USERFLD == GetField()->GetTyp()->Which() ) { - SwUserFieldType* pType = (SwUserFieldType*)GetField()->GetTyp(); + SwUserFieldType* pType = static_cast<SwUserFieldType*>(GetField()->GetTyp()); if(!pType->IsValid()) { SwCalc aCalc( *pTxtNd->GetDoc() ); @@ -309,10 +309,10 @@ bool SwFmtFld::GetInfo( SfxPoolItem& rInfo ) const const SwTxtNode* pTxtNd; if( RES_AUTOFMT_DOCNODE != rInfo.Which() || !mpTxtFld || 0 == ( pTxtNd = mpTxtFld->GetpTxtNode() ) || - &pTxtNd->GetNodes() != ((SwAutoFmtGetDocNode&)rInfo).pNodes ) + &pTxtNd->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes ) return true; - ((SwAutoFmtGetDocNode&)rInfo).pCntntNode = pTxtNd; + static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = pTxtNd; return false; } @@ -377,7 +377,7 @@ void SwTxtFld::ExpandTxtFld(const bool bForceNotify) const // Page count fields to not use aExpand during formatting, // therefore an invalidation of the text frame has to be triggered even if aNewExpand == aExpand: && ( RES_DOCSTATFLD != nWhich || DS_PAGE != static_cast<const SwDocStatField*>(pFld)->GetSubType() ) - && ( RES_GETEXPFLD != nWhich || ((SwGetExpField*)pFld)->IsInBodyTxt() ) ) + && ( RES_GETEXPFLD != nWhich || static_cast<const SwGetExpField*>(pFld)->IsInBodyTxt() ) ) { if( m_pTxtNode->CalcHiddenParaField() ) { @@ -431,9 +431,9 @@ void SwTxtFld::CopyTxtFld( SwTxtFld *pDest ) const { if( rDestFmtFld.GetTxtFld() ) { - ((SwDDEFieldType*)rDestFmtFld.GetField()->GetTyp())->DecRefCnt(); + static_cast<SwDDEFieldType*>(rDestFmtFld.GetField()->GetTyp())->DecRefCnt(); } - ((SwDDEFieldType*)pFldType)->IncRefCnt(); + static_cast<SwDDEFieldType*>(pFldType)->IncRefCnt(); } OSL_ENSURE( pFldType, "unbekannter FieldType" ); @@ -451,12 +451,12 @@ void SwTxtFld::CopyTxtFld( SwTxtFld *pDest ) const } // Tabellenfelder auf externe Darstellung else if( RES_TABLEFLD == nFldWhich - && ((SwTblField*)rDestFmtFld.GetField())->IsIntrnlName() ) + && static_cast<SwTblField*>(rDestFmtFld.GetField())->IsIntrnlName() ) { // erzeuge aus der internen (fuer CORE) die externe (fuer UI) Formel const SwTableNode* pTblNd = m_pTxtNode->FindTableNode(); if( pTblNd ) // steht in einer Tabelle - ((SwTblField*)rDestFmtFld.GetField())->PtrToBoxNm( &pTblNd->GetTable() ); + static_cast<SwTblField*>(rDestFmtFld.GetField())->PtrToBoxNm( &pTblNd->GetTable() ); } } |