diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-01 10:16:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-12-02 09:32:09 +0200 |
commit | 5504035ac07442cc2b77b53f953fcd7d8a4d8648 (patch) | |
tree | da3cb936e02c7b5ecc3f395895da5f075e8d7611 /sw | |
parent | d08c6a829690c984a2f7389c85456e258a99235d (diff) |
loplugin: cstylecast
Change-Id: Ia6d6c5a2821fb5b221fbfcc174a4a661556d4441
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 24 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8gr.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 46 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 46 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 20 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 30 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par4.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 82 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 44 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 12 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 14 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlfmt.cxx | 14 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlfonte.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmliteme.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlitemi.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltble.cxx | 32 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 42 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltext.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 2 |
22 files changed, 224 insertions, 224 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 59aaf3e6171f..134b4aebbfc6 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1543,7 +1543,7 @@ void MSWordExportBase::AppendWordBookmark( const OUString& rName ) void WW8_WrtRedlineAuthor::Write( Writer& rWrt ) { - WW8Export & rWW8Wrt = *(((SwWW8Writer&)rWrt).m_pExport); + WW8Export & rWW8Wrt = *(static_cast<SwWW8Writer&>(rWrt).m_pExport); rWW8Wrt.WriteAsStringTable(maAuthors, rWW8Wrt.pFib->fcSttbfRMark, rWW8Wrt.pFib->lcbSttbfRMark, rWW8Wrt.bWrtWW8 ? 0 : 2); } @@ -1990,12 +1990,12 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR if( pCNd && pCNd->IsTxtNode()) { SfxItemSet aCoreSet(rDoc.GetAttrPool(), RES_CHRATR_ROTATE, RES_CHRATR_ROTATE); - ((SwTxtNode*)pCNd)->GetAttr( aCoreSet, 0, ((SwTxtNode*)pCNd)->GetTxt().getLength()); + static_cast<const SwTxtNode*>(pCNd)->GetAttr( aCoreSet, 0, static_cast<const SwTxtNode*>(pCNd)->GetTxt().getLength()); const SvxCharRotateItem * pRotate = NULL; const SfxPoolItem * pRotItem; if ( SfxItemState::SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, true, &pRotItem)) { - pRotate = (SvxCharRotateItem*)pRotItem; + pRotate = static_cast<const SvxCharRotateItem*>(pRotItem); if(pRotate && pRotate->GetValue() == 900) { nFlags = nFlags | 0x0004 | 0x0008; @@ -2552,7 +2552,7 @@ void MSWordExportBase::WriteText() // output the various types of nodes if ( rNd.IsCntntNode() ) { - SwCntntNode* pCNd = (SwCntntNode*)&rNd; + SwCntntNode* pCNd = static_cast<SwCntntNode*>(&rNd); const SwPageDesc* pTemp = rNd.FindPageDesc(false); if ( pTemp ) @@ -2592,7 +2592,7 @@ void MSWordExportBase::WriteText() { const SfxPoolItem * pTempItem = NULL; if (pTempNext->GetpSwAttrSet() && SfxItemState::SET == pTempNext->GetpSwAttrSet()->GetItemState(RES_PAGEDESC, false, &pTempItem) - && pTempItem && ((SwFmtPageDesc*)pTempItem)->GetRegisteredIn()) + && pTempItem && static_cast<const SwFmtPageDesc*>(pTempItem)->GetRegisteredIn()) { //Next node has a new page style which means this node is a section end. Do not insert another page/section break here bNeedExportBreakHere = false; @@ -2619,11 +2619,11 @@ void MSWordExportBase::WriteText() const SwSectionFmt* pParentFmt = rSect.GetFmt()->GetParent(); if ( !pParentFmt ) - pParentFmt = (SwSectionFmt*)0xFFFFFFFF; + pParentFmt = reinterpret_cast<SwSectionFmt*>(0xFFFFFFFF); sal_uLong nRstLnNum; if ( aIdx.GetNode().IsCntntNode() ) - nRstLnNum = ((SwCntntNode&)aIdx.GetNode()).GetSwAttrSet(). + nRstLnNum = static_cast<SwCntntNode&>(aIdx.GetNode()).GetSwAttrSet(). GetLineNumber().GetStartValue(); else nRstLnNum = 0; @@ -2688,7 +2688,7 @@ void WW8Export::WriteMainText() // annotation usw. const SwTxtNode* pLastNd = pCurPam->GetMark()->nNode.GetNode().GetTxtNode(); if( pLastNd ) - nLastFmtId = GetId( (SwTxtFmtColl&)pLastNd->GetAnyFmtColl() ); + nLastFmtId = GetId( static_cast<SwTxtFmtColl&>(pLastNd->GetAnyFmtColl()) ); SAL_INFO( "sw.ww8.level2", "</WriteMainText>" ); } @@ -2954,8 +2954,8 @@ void MSWordExportBase::CollectOutlineBookmarks(const SwDoc &rDoc) sal_uInt32 n, nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT ); for( n = 0; n < nMaxItems; ++n ) { - if( 0 != (pINetFmt = (SwFmtINetFmt*)rDoc.GetAttrPool().GetItem2( - RES_TXTATR_INETFMT, n ) ) && + if( 0 != (pINetFmt = static_cast<const SwFmtINetFmt*>(rDoc.GetAttrPool().GetItem2( + RES_TXTATR_INETFMT, n ) ) ) && 0 != ( pTxtAttr = pINetFmt->GetTxtINetFmt()) && 0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) && pTxtNd->GetNodes().IsDocNodes() ) @@ -2968,8 +2968,8 @@ void MSWordExportBase::CollectOutlineBookmarks(const SwDoc &rDoc) nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_URL ); for( n = 0; n < nMaxItems; ++n ) { - if( 0 != (pURL = (SwFmtURL*)rDoc.GetAttrPool().GetItem2( - RES_URL, n ) ) ) + if( 0 != (pURL = static_cast<const SwFmtURL*>(rDoc.GetAttrPool().GetItem2( + RES_URL, n ) ) ) ) { AddLinkTarget( pURL->GetURL() ); const ImageMap *pIMap = pURL->GetMap(); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 9bff1195802c..fd2e5b13e7d9 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -436,7 +436,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame) //otherwise a sub/super script hack is employed if (pOutFmtNode && pOutFmtNode->ISA(SwCntntNode) ) { - const SwTxtNode* pTxtNd = (const SwTxtNode*)pOutFmtNode; + const SwTxtNode* pTxtNd = static_cast<const SwTxtNode*>(pOutFmtNode); SwPosition aPos(*pTxtNd); bVert = pDoc->IsInVerticalText(aPos); } @@ -542,7 +542,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly, if (pAttrSet && (SfxItemState::SET == pAttrSet->GetItemState(RES_GRFATR_CROPGRF, false, &pItem))) { - const SwCropGrf& rCr = *(SwCropGrf*)pItem; + const SwCropGrf& rCr = *static_cast<const SwCropGrf*>(pItem); nCropL = (sal_Int16)rCr.GetLeft(); nCropR = (sal_Int16)rCr.GetRight(); nCropT = (sal_Int16)rCr.GetTop(); @@ -562,7 +562,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const sw::Frame &rFly, const SwAttrSet& rAttrSet = rFly.GetFrmFmt().GetAttrSet(); if (SfxItemState::SET == rAttrSet.GetItemState(RES_BOX, false, &pItem)) { - const SvxBoxItem* pBox = (const SvxBoxItem*)pItem; + const SvxBoxItem* pBox = static_cast<const SvxBoxItem*>(pItem); if( pBox ) { bool bShadow = false; // Shadow ? diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 7d7bfc98be73..35f9c9e66658 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -279,7 +279,7 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool AttrOutput().OutputItem( *pItem ); // switch off the numerbering? - if ( ( (SwNumRuleItem*)pItem )->GetValue().isEmpty() && + if ( static_cast<const SwNumRuleItem*>(pItem)->GetValue().isEmpty() && SfxItemState::SET != rSet.GetItemState( RES_LR_SPACE, false) && SfxItemState::SET == rSet.GetItemState( RES_LR_SPACE, true, &pItem ) ) { @@ -1529,7 +1529,7 @@ void WW8AttributeOutput::CharRelief( const SvxCharReliefItem& rRelief ) void WW8AttributeOutput::CharBidiRTL( const SfxPoolItem& rHt ) { - const SfxInt16Item& rAttr = (const SfxInt16Item&)rHt; + const SfxInt16Item& rAttr = static_cast<const SfxInt16Item&>(rHt); if( rAttr.GetValue() == 1 ) { m_rWW8Export.InsUInt16(0x85a); @@ -1539,7 +1539,7 @@ void WW8AttributeOutput::CharBidiRTL( const SfxPoolItem& rHt ) void WW8AttributeOutput::CharIdctHint( const SfxPoolItem& rHt ) { - const SfxInt16Item& rAttr = (const SfxInt16Item&)rHt; + const SfxInt16Item& rAttr = static_cast<const SfxInt16Item&>(rHt); m_rWW8Export.InsUInt16(0x286F); m_rWW8Export.pO->push_back((sal_uInt8)(rAttr.GetValue())); } @@ -2124,7 +2124,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) sStr = FieldString(eCode); { - const SwFmtCol& rCol = (const SwFmtCol&)( rSect.GetFmt()->GetFmtAttr( RES_COL ) ); + const SwFmtCol& rCol = static_cast<const SwFmtCol&>( rSect.GetFmt()->GetFmtAttr( RES_COL ) ); const SwColumns& rColumns = rCol.GetColumns(); sal_Int32 nCol = rColumns.size(); @@ -2457,7 +2457,7 @@ void AttributeOutputBase::EndTOX( const SwSection& rSect,bool bCareEnd ) if ( pTOX->GetType() == TOX_INDEX && GetExport().AddSectionBreaksForTOX() ) { - const SwFmtCol& rCol = (const SwFmtCol&)( rSect.GetFmt()->GetFmtAttr( RES_COL ) ); + const SwFmtCol& rCol = static_cast<const SwFmtCol&>( rSect.GetFmt()->GetFmtAttr( RES_COL ) ); const SwColumns& rColumns = rCol.GetColumns(); sal_Int32 nCol = rColumns.size(); @@ -2590,7 +2590,7 @@ void WW8AttributeOutput::HiddenField( const SwField& rFld ) void WW8AttributeOutput::SetField( const SwField& rFld, ww::eField eType, const OUString& rCmd ) { - const SwSetExpField* pSet=(const SwSetExpField*)(&rFld); + const SwSetExpField* pSet = static_cast<const SwSetExpField*>(&rFld); const OUString &rVar = pSet->GetPar2(); sal_uLong nFrom = m_rWW8Export.Fc2Cp(m_rWW8Export.Strm().Tell()); @@ -2623,7 +2623,7 @@ void WW8AttributeOutput::SetField( const SwField& rFld, ww::eField eType, const void WW8AttributeOutput::PostitField( const SwField* pFld ) { - const SwPostItField *pPFld = (const SwPostItField*)pFld; + const SwPostItField *pPFld = static_cast<const SwPostItField*>(pFld); m_rWW8Export.pAtn->Append( m_rWW8Export.Fc2Cp( m_rWW8Export.Strm().Tell() ), pPFld ); m_rWW8Export.WritePostItBegin( m_rWW8Export.pO ); } @@ -2633,7 +2633,7 @@ bool WW8AttributeOutput::DropdownField( const SwField* pFld ) bool bExpand = true; if ( m_rWW8Export.bWrtWW8 ) { - const SwDropDownField& rFld2 = *(SwDropDownField*)pFld; + const SwDropDownField& rFld2 = *static_cast<const SwDropDownField*>(pFld); uno::Sequence<OUString> aItems = rFld2.GetItemSequence(); GetExport().DoComboBox(rFld2.GetName(), @@ -2693,7 +2693,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) case RES_GETEXPFLD: if (nSubType == nsSwGetSetExpType::GSE_STRING) { - const SwGetExpField *pGet=(const SwGetExpField*)(pFld); + const SwGetExpField *pGet = static_cast<const SwGetExpField*>(pFld); RefField( *pGet, pGet->GetFormula() ); } else @@ -2714,7 +2714,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) { bool bShowAsWell = false; ww::eField eFieldNo; - const SwSetExpField *pSet=(const SwSetExpField*)(pFld); + const SwSetExpField *pSet = static_cast<const SwSetExpField*>(pFld); const OUString sVar = pSet->GetPar2(); OUString sStr; if (pSet->GetInputFlag()) @@ -2957,7 +2957,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) { ww::eField eFld = ww::eNONE; OUString sStr; - const SwGetRefField& rRFld = *(SwGetRefField*)pFld; + const SwGetRefField& rRFld = *static_cast<const SwGetRefField*>(pFld); switch (nSubType) { case REF_SETREFATTR: @@ -3091,7 +3091,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) if (pTxtNd) { - SwChapterField aCopy(*(const SwChapterField*)pFld); + SwChapterField aCopy(*static_cast<const SwChapterField*>(pFld)); aCopy.ChangeExpansion(*pTxtNd, false); WriteExpand( &aCopy ); bWriteExpand = false; @@ -3132,7 +3132,7 @@ void AttributeOutputBase::TextFlyContent( const SwFmtFlyCnt& rFlyContent ) { if ( GetExport().pOutFmtNode && GetExport().pOutFmtNode->ISA( SwCntntNode ) ) { - SwTxtNode* pTxtNd = (SwTxtNode*)GetExport().pOutFmtNode; + const SwTxtNode* pTxtNd = static_cast<const SwTxtNode*>(GetExport().pOutFmtNode); Point aLayPos; aLayPos = pTxtNd->FindLayoutRect( false, &aLayPos ).Pos(); @@ -3473,7 +3473,7 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule ) { if ( GetExport().pOutFmtNode->ISA( SwCntntNode ) ) { - pTxtNd = (SwTxtNode*)GetExport().pOutFmtNode; + pTxtNd = static_cast<const SwTxtNode*>(GetExport().pOutFmtNode); if( pTxtNd->IsCountedInList()) { @@ -3506,7 +3506,7 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule ) } else if ( GetExport().pOutFmtNode->ISA( SwTxtFmtColl ) ) { - const SwTxtFmtColl* pC = (SwTxtFmtColl*)GetExport().pOutFmtNode; + const SwTxtFmtColl* pC = static_cast<const SwTxtFmtColl*>(GetExport().pOutFmtNode); if ( pC && pC->IsAssignedToListLevelOfOutlineStyle() ) nLvl = static_cast< sal_uInt8 >( pC->GetAssignedOutlineStyleLevel() ); } @@ -3707,7 +3707,7 @@ void AttributeOutputBase::FormatPageDescription( const SwFmtPageDesc& rPageDesc { if ( GetExport().bStyDef && GetExport().pOutFmtNode && GetExport().pOutFmtNode->ISA( SwTxtFmtColl ) ) { - const SwTxtFmtColl* pC = (SwTxtFmtColl*)GetExport().pOutFmtNode; + const SwTxtFmtColl* pC = static_cast<const SwTxtFmtColl*>(GetExport().pOutFmtNode); if ( (SfxItemState::SET != pC->GetItemState( RES_BREAK, false ) ) && rPageDesc.KnowsPageDesc() ) FormatBreak( SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ) ); } @@ -4520,7 +4520,7 @@ void WW8AttributeOutput::FormatBox( const SvxBoxItem& rBox ) const SfxPoolItem* pItem = m_rWW8Export.HasItem( RES_SHADOW ); if ( pItem ) { - const SvxShadowItem* p = (const SvxShadowItem*)pItem; + const SvxShadowItem* p = static_cast<const SvxShadowItem*>(pItem); bShadow = ( p->GetLocation() != SVX_SHADOW_NONE ) && ( p->GetWidth() != 0 ); } @@ -4733,12 +4733,12 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) const SwAttrSet *pSet = 0; if ( GetExport().pOutFmtNode && GetExport().pOutFmtNode->ISA( SwFmt ) ) { - const SwFmt *pFmt = (const SwFmt*)( GetExport().pOutFmtNode ); + const SwFmt *pFmt = static_cast<const SwFmt*>( GetExport().pOutFmtNode ); pSet = &pFmt->GetAttrSet(); } else if ( GetExport().pOutFmtNode && GetExport().pOutFmtNode->ISA( SwTxtNode ) ) { - const SwTxtNode* pNd = (const SwTxtNode*)GetExport().pOutFmtNode; + const SwTxtNode* pNd = static_cast<const SwTxtNode*>(GetExport().pOutFmtNode); pSet = &pNd->GetSwAttrSet(); if ( g_pBreakIt->GetBreakIter().is() ) { @@ -4813,13 +4813,13 @@ void WW8AttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust ) short nDirection = FRMDIR_HORI_LEFT_TOP; if ( m_rWW8Export.pOutFmtNode->ISA( SwTxtNode ) ) { - SwPosition aPos(*(const SwCntntNode*)m_rWW8Export.pOutFmtNode); + SwPosition aPos(*static_cast<const SwCntntNode*>(m_rWW8Export.pOutFmtNode)); nDirection = m_rWW8Export.pDoc->GetTextDirection(aPos); } else if ( m_rWW8Export.pOutFmtNode->ISA( SwTxtFmtColl ) ) { const SwTxtFmtColl* pC = - (const SwTxtFmtColl*)m_rWW8Export.pOutFmtNode; + static_cast<const SwTxtFmtColl*>(m_rWW8Export.pOutFmtNode); const SvxFrameDirectionItem &rItem = ItemGet<SvxFrameDirectionItem>(*pC, RES_FRAMEDIR); nDirection = rItem.GetValue(); @@ -4862,12 +4862,12 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir if ( m_rWW8Export.bOutFlyFrmAttrs ) //frame { nDir = m_rWW8Export.TrueFrameDirection( - *(const SwFrmFmt*)m_rWW8Export.pOutFmtNode ); + *static_cast<const SwFrmFmt*>(m_rWW8Export.pOutFmtNode) ); } else if ( m_rWW8Export.pOutFmtNode->ISA( SwCntntNode ) ) //pagagraph { const SwCntntNode* pNd = - (const SwCntntNode*)m_rWW8Export.pOutFmtNode; + static_cast<const SwCntntNode*>(m_rWW8Export.pOutFmtNode); SwPosition aPos( *pNd ); nDir = m_rWW8Export.pDoc->GetTextDirection( aPos ); } diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index ae4a61843c00..0ab8038f7c26 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -677,7 +677,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, if (nWhich == RES_TXTATR_INETFMT) { const SwFmtINetFmt *pURL = - (const SwFmtINetFmt *)pItem; + static_cast<const SwFmtINetFmt *>(pItem); sURL = pURL->GetValue(); } pCtrlStck->DeleteAndDestroy(nI-1); @@ -1666,7 +1666,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, } else // If a size is set, adjust it to consider border thickness { - SwFmtFrmSize aSize = (const SwFmtFrmSize &)(rFlySet.Get(RES_FRM_SIZE)); + SwFmtFrmSize aSize = static_cast<const SwFmtFrmSize &>(rFlySet.Get(RES_FRM_SIZE)); SwFmtFrmSize aNewSize = SwFmtFrmSize(bFixSize ? ATT_FIX_SIZE : ATT_VAR_SIZE, aSize.GetWidth() + 2*nOutside, @@ -1679,12 +1679,12 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj, // graphic in relation to the top left inside the border. We don't if (nOutside) { - SwFmtHoriOrient aHori = (const SwFmtHoriOrient &)(rFlySet.Get( + SwFmtHoriOrient aHori = static_cast<const SwFmtHoriOrient &>(rFlySet.Get( RES_HORI_ORIENT)); aHori.SetPos(MakeSafePositioningValue(aHori.GetPos()-nOutside)); rFlySet.Put(aHori); - SwFmtVertOrient aVert = (const SwFmtVertOrient &)(rFlySet.Get( + SwFmtVertOrient aVert = static_cast<const SwFmtVertOrient &>(rFlySet.Get( RES_VERT_ORIENT)); aVert.SetPos(aVert.GetPos()-nOutside); rFlySet.Put(aVert); @@ -2959,7 +2959,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject, pRetFrmFmt = InsertOle(*static_cast<SdrOle2Obj*>(rpObject), rFlySet, aGrSet); else { - const SdrGrafObj *pGrf= (const SdrGrafObj*)rpObject; + const SdrGrafObj *pGrf = static_cast<const SdrGrafObj*>(rpObject); bool bDone = false; if (pGrf->IsLinkedGraphic() && !pGrf->GetFileName().isEmpty()) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index d069e20224d5..bddd82e883b8 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -989,7 +989,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, if ( !::basegfx::fTools::equalZero( fExtraTextRotation ) ) { fExtraTextRotation /= 100.0; - SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); + SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) ); const OUString sTextRotateAngle( "TextRotateAngle" ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sTextRotateAngle; @@ -1423,7 +1423,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwPaM aRegion(rTmpPos); if (rEntry.MakeRegion(pDoc, aRegion, false)) { - SvxLRSpaceItem aNewLR( *(SvxLRSpaceItem*)rEntry.pAttr ); + SvxLRSpaceItem aNewLR( *static_cast<SvxLRSpaceItem*>(rEntry.pAttr) ); sal_uLong nStart = aRegion.Start()->nNode.GetIndex(); sal_uLong nEnd = aRegion.End()->nNode.GetIndex(); for(; nStart <= nEnd; ++nStart) @@ -1432,10 +1432,10 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, if (!pNode || !pNode->IsTxtNode()) continue; - SwCntntNode* pNd = (SwCntntNode*)pNode; - SvxLRSpaceItem aOldLR = (const SvxLRSpaceItem&)pNd->GetAttr(RES_LR_SPACE); + SwCntntNode* pNd = static_cast<SwCntntNode*>(pNode); + SvxLRSpaceItem aOldLR = static_cast<const SvxLRSpaceItem&>(pNd->GetAttr(RES_LR_SPACE)); - SwTxtNode *pTxtNode = (SwTxtNode*)pNode; + SwTxtNode *pTxtNode = static_cast<SwTxtNode*>(pNode); const SwNumFmt *pNum = 0; pNum = GetNumFmtFromStack( *aRegion.GetPoint(), *pTxtNode ); @@ -1495,8 +1495,8 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, // the frames hyperlink field attribute directly. if (0 != (pFrm = rReader.ContainsSingleInlineGraphic(aRegion))) { - const SwFmtINetFmt *pAttr = (const SwFmtINetFmt *) - rEntry.pAttr; + const SwFmtINetFmt *pAttr = static_cast<const SwFmtINetFmt *>( + rEntry.pAttr); SwFmtURL aURL; aURL.SetURL(pAttr->GetValue(), false); aURL.SetTargetFrameName(pAttr->GetTargetFrame()); @@ -1631,7 +1631,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos, SwNodeIndex aIdx(rEntry.m_aMkPos.m_nNode, 1); SwPaM aPaM(aIdx, rEntry.m_aMkPos.m_nCntnt); - SwFmtFld& rFmtFld = *(SwFmtFld*)rEntry.pAttr; + SwFmtFld& rFmtFld = *static_cast<SwFmtFld*>(rEntry.pAttr); SwField* pFld = rFmtFld.GetField(); if (!RefToVar(pFld, rEntry)) @@ -1719,13 +1719,13 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) { nTabBase = vColl[nAktColl].nBase; if (nTabBase < vColl.size()) // Based On - pSty = (const SwTxtFmtColl*)vColl[nTabBase].pFmt; + pSty = static_cast<const SwTxtFmtColl*>(vColl[nTabBase].pFmt); } else { // Text nTabBase = nAktColl; if (nAktColl < vColl.size()) - pSty = (const SwTxtFmtColl*)vColl[nAktColl].pFmt; + pSty = static_cast<const SwTxtFmtColl*>(vColl[nAktColl].pFmt); //TODO: figure out else here } @@ -1755,7 +1755,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) // current one (prevent loop) aLoopWatch.insert(reinterpret_cast<size_t>(pSty)); if (nTabBase < vColl.size()) - pSty = (const SwTxtFmtColl*)vColl[nTabBase].pFmt; + pSty = static_cast<const SwTxtFmtColl*>(vColl[nTabBase].pFmt); //TODO figure out the else branch if (aLoopWatch.find(reinterpret_cast<size_t>(pSty)) != @@ -2277,7 +2277,7 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) this->pFmtOfJustInsertedApo = 0; SwPostItField aPostIt( - (SwPostItFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD), sAuthor, + static_cast<SwPostItFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), sAuthor, sTxt, sInitials, OUString(), aDate ); aPostIt.SetTextObject(pOutliner); @@ -2587,7 +2587,7 @@ bool SwWW8ImplReader::SetSpacing(SwPaM &rMyPam, int nSpace, bool bIsUpper ) bool bRet = false; const SwPosition* pSpacingPos = rMyPam.GetPoint(); - const SvxULSpaceItem* pULSpaceItem = (const SvxULSpaceItem*)pCtrlStck->GetFmtAttr(*pSpacingPos, RES_UL_SPACE); + const SvxULSpaceItem* pULSpaceItem = static_cast<const SvxULSpaceItem*>(pCtrlStck->GetFmtAttr(*pSpacingPos, RES_UL_SPACE)); if(pULSpaceItem != 0) { @@ -2825,7 +2825,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCharSetFromLanguage() correctly set in the character runs involved, so its hard to reproduce documents that require this to be sure of the process involved. */ - const SvxLanguageItem *pLang = (const SvxLanguageItem*)GetFmtAttr(RES_CHRATR_LANGUAGE); + const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFmtAttr(RES_CHRATR_LANGUAGE)); LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM; ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang)); return msfilter::util::getBestTextEncodingFromLocale(aLocale); @@ -2843,7 +2843,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCJKCharSetFromLanguage() correctly set in the character runs involved, so its hard to reproduce documents that require this to be sure of the process involved. */ - const SvxLanguageItem *pLang = (const SvxLanguageItem*)GetFmtAttr(RES_CHRATR_CJK_LANGUAGE); + const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFmtAttr(RES_CHRATR_CJK_LANGUAGE)); LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM; ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang)); return msfilter::util::getBestTextEncodingFromLocale(aLocale); @@ -3384,9 +3384,9 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString } else { - const SvxFontItem *pSourceFont = (const SvxFontItem*)GetFmtAttr(nForceFromFontId); + const SvxFontItem *pSourceFont = static_cast<const SvxFontItem*>(GetFmtAttr(nForceFromFontId)); sal_uInt16 nDestId = aIds[nWriterScript-1]; - const SvxFontItem *pDestFont = (const SvxFontItem*)GetFmtAttr(nDestId); + const SvxFontItem *pDestFont = static_cast<const SvxFontItem*>(GetFmtAttr(nDestId)); bWriterWillUseSameFontAsWordAutomatically = sameFontIgnoringIrrelevantFields(*pSourceFont, *pDestFont); } } @@ -3394,16 +3394,16 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const OUString& rAddString // Writer won't use the same font as word, so force the issue if (!bWriterWillUseSameFontAsWordAutomatically) { - const SvxFontItem *pSourceFont = (const SvxFontItem*)GetFmtAttr(nForceFromFontId); + const SvxFontItem *pSourceFont = static_cast<const SvxFontItem*>(GetFmtAttr(nForceFromFontId)); for (size_t i = 0; i < SAL_N_ELEMENTS(aIds); ++i) { - const SvxFontItem *pDestFont = (const SvxFontItem*)GetFmtAttr(aIds[i]); + const SvxFontItem *pDestFont = static_cast<const SvxFontItem*>(GetFmtAttr(aIds[i])); aForced[i] = aIds[i] != nForceFromFontId && *pSourceFont != *pDestFont; if (aForced[i]) { pOverriddenItems[i] = - (const SvxFontItem*)pCtrlStck->GetStackAttr(*pPaM->GetPoint(), aIds[i]); + static_cast<const SvxFontItem*>(pCtrlStck->GetStackAttr(*pPaM->GetPoint(), aIds[i])); SvxFontItem aForceFont(*pSourceFont); aForceFont.SetWhich(aIds[i]); @@ -3583,8 +3583,8 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) { // Page number SwPageNumberField aFld( - (SwPageNumberFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType( - RES_PAGENUMBERFLD ), PG_RANDOM, SVX_NUM_ARABIC); + static_cast<SwPageNumberFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( + RES_PAGENUMBERFLD )), PG_RANDOM, SVX_NUM_ARABIC); rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0); } break; @@ -4066,7 +4066,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType) // Get the default document dropcap which we can use as our template const SwFmtDrop* defaultDrop = - (const SwFmtDrop*) GetFmtAttr(RES_PARATR_DROP); + static_cast<const SwFmtDrop*>( GetFmtAttr(RES_PARATR_DROP)); SwFmtDrop aDrop(*defaultDrop); aDrop.GetLines() = nDropLines; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index f3c154d19b10..ca804428b2e1 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -314,10 +314,10 @@ sal_uInt16 SwWW8ImplReader::End_Ftn() pPlcxMan->SaveAllPLCFx( aSave ); WW8PLCFMan* pOldPlcxMan = pPlcxMan; - const SwNodeIndex* pSttIdx = ((SwTxtFtn*)pFN)->GetStartNode(); + const SwNodeIndex* pSttIdx = static_cast<SwTxtFtn*>(pFN)->GetStartNode(); OSL_ENSURE(pSttIdx, "Probleme beim Anlegen des Fussnoten-Textes"); - ((SwTxtFtn*)pFN)->SetSeqNo( rDoc.GetFtnIdxs().size() ); + static_cast<SwTxtFtn*>(pFN)->SetSeqNo( rDoc.GetFtnIdxs().size() ); bool bOld = bFtnEdn; bFtnEdn = true; @@ -333,7 +333,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn() // If no automatic numbering use the following char from the main text // as the footnote number if (!rDesc.mbAutoNum) - ((SwTxtFtn*)pFN)->SetNumber(0, sChar); + static_cast<SwTxtFtn*>(pFN)->SetNumber(0, sChar); /* Delete the footnote char from the footnote if its at the beginning @@ -775,7 +775,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const sal_uInt8* pData, short { nSwNumLevel = *pData - 1; if (!bNoAttrImport) - ((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); + static_cast<SwTxtFmtColl*>(pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); // For WW-NoNumbering also NO_NUMBERING could be used. // ( For normal numberierung NO_NUM has to be used: // NO_NUM : pauses numbering, @@ -2389,7 +2389,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem) const SfxPoolItem* pItem; if (SfxItemState::SET == pSet->GetItemState(RES_BREAK, false, &pItem)) { - pSetAttr = new SvxFmtBreakItem( *(SvxFmtBreakItem*)pItem ); + pSetAttr = new SvxFmtBreakItem( *static_cast<const SvxFmtBreakItem*>(pItem) ); pNd->ResetAttr( RES_BREAK ); } @@ -2884,7 +2884,7 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam) if(SwTxtNode *pNd = pIo->pPaM->GetNode().GetTxtNode()) { const SfxPoolItem &rItm = pNd->SwCntntNode::GetAttr(RES_PARATR_SNAPTOGRID); - SvxParaGridItem &rSnapToGrid = (SvxParaGridItem&)(rItm); + const SvxParaGridItem &rSnapToGrid = static_cast<const SvxParaGridItem&>(rItm); if(rSnapToGrid.GetValue()) { @@ -2912,7 +2912,7 @@ void WW8TabDesc::InsertCells( short nIns ) pTabBoxes = &pTabLine->GetTabBoxes(); pTabBox = (*pTabBoxes)[0]; - pIo->rDoc.GetNodes().InsBoxen( pTblNd, pTabLine, (SwTableBoxFmt*)pTabBox->GetFrmFmt(), + pIo->rDoc.GetNodes().InsBoxen( pTblNd, pTabLine, static_cast<SwTableBoxFmt*>(pTabBox->GetFrmFmt()), (SwTxtFmtColl*)pIo->pDfltTxtFmtColl, 0, pTabBoxes->size(), nIns ); // The third parameter contains the FrmFmt of the boxes. // Here it is possible to optimize to save (reduce) FrmFmts. @@ -4440,8 +4440,8 @@ void WW8RStyle::Import() && pj->pFmt // Derived-Format ok ? && pi->bColl // only possible for paragraph templates (WW) && pj->bColl ){ // identical Typ ? - ( (SwTxtFmtColl*)pi->pFmt )->SetNextTxtFmtColl( - *(SwTxtFmtColl*)pj->pFmt ); // ok, register + static_cast<SwTxtFmtColl*>(pi->pFmt)->SetNextTxtFmtColl( + *static_cast<SwTxtFmtColl*>(pj->pFmt) ); // ok, register } } } @@ -4457,7 +4457,7 @@ void WW8RStyle::Import() if( pIo->StyleExists(0) && !pIo->vColl.empty() && pIo->vColl[0].pFmt && pIo->vColl[0].bColl && pIo->vColl[0].bValid ) - pIo->pDfltTxtFmtColl = (SwTxtFmtColl*)pIo->vColl[0].pFmt; + pIo->pDfltTxtFmtColl = static_cast<SwTxtFmtColl*>(pIo->vColl[0].pFmt); else pIo->pDfltTxtFmtColl = pIo->rDoc.GetDfltTxtFmtColl(); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index a21ac058c8a4..19a6f004adf8 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -243,7 +243,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr) if (!bUseEnhFields) { - SwDropDownField aFld((SwDropDownFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DROPDOWN)); + SwDropDownField aFld(static_cast<SwDropDownFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DROPDOWN))); aFld.SetName(aFormula.sTitle); aFld.SetHelp(aFormula.sHelp); @@ -1650,7 +1650,7 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg, bool bRes = true; if( rStyleInfo.pFmt && rStyleInfo.bColl ) { - bRes = rDoc.SetTxtFmtColl(rRg, (SwTxtFmtColl*)rStyleInfo.pFmt); + bRes = rDoc.SetTxtFmtColl(rRg, static_cast<SwTxtFmtColl*>(rStyleInfo.pFmt)); SwTxtNode* pTxtNode = pPaM->GetNode().GetTxtNode(); OSL_ENSURE( pTxtNode, "No Text-Node at PaM-Position" ); if ( !pTxtNode ) @@ -1855,7 +1855,7 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO, { SfxItemSet aListIndent(rDoc.GetAttrPool(), RES_LR_SPACE, RES_LR_SPACE); - const SvxLRSpaceItem *pItem = (const SvxLRSpaceItem*)( + const SvxLRSpaceItem *pItem = static_cast<const SvxLRSpaceItem*>( GetFmtAttr(RES_LR_SPACE)); OSL_ENSURE(pItem, "impossible"); if (pItem) @@ -2292,15 +2292,15 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, OUString pNm; if (xPropSetInfo->hasPropertyByName(pNm = "TextColor")) { - aTmp <<= (sal_Int32)((SvxColorItem*)pItem)->GetValue().GetColor(); + aTmp <<= (sal_Int32)static_cast<const SvxColorItem*>(pItem)->GetValue().GetColor(); rPropSet->setPropertyValue(pNm, aTmp); } } - aFont.SetColor(((SvxColorItem*)pItem)->GetValue()); + aFont.SetColor(static_cast<const SvxColorItem*>(pItem)->GetValue()); break; case RES_CHRATR_FONT: { - const SvxFontItem *pFontItem = (SvxFontItem *)pItem; + const SvxFontItem *pFontItem = static_cast<const SvxFontItem *>(pItem); OUString pNm; if (xPropSetInfo->hasPropertyByName(pNm = "FontStyleName")) { @@ -2335,7 +2335,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, case RES_CHRATR_FONTSIZE: { Size aSize( aFont.GetSize().Width(), - ((SvxFontHeightItem*)pItem)->GetHeight() ); + static_cast<const SvxFontHeightItem*>(pItem)->GetHeight() ); aTmp <<= ((float)aSize.Height()) / 20.0; aFont.SetSize(OutputDevice::LogicToLogic(aSize, MAP_TWIP, @@ -2345,23 +2345,23 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, case RES_CHRATR_WEIGHT: aTmp <<= (float)VCLUnoHelper::ConvertFontWeight( - ((SvxWeightItem*)pItem)->GetWeight() ); - aFont.SetWeight( ((SvxWeightItem*)pItem)->GetWeight() ); + static_cast<const SvxWeightItem*>(pItem)->GetWeight() ); + aFont.SetWeight( static_cast<const SvxWeightItem*>(pItem)->GetWeight() ); break; case RES_CHRATR_UNDERLINE: - aTmp <<= (sal_Int16)(((SvxUnderlineItem*)pItem)->GetLineStyle()); - aFont.SetUnderline(((SvxUnderlineItem*)pItem)->GetLineStyle()); + aTmp <<= (sal_Int16)(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); + aFont.SetUnderline(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); break; case RES_CHRATR_CROSSEDOUT: - aTmp <<= (sal_Int16)( ((SvxCrossedOutItem*)pItem)->GetStrikeout() ); - aFont.SetStrikeout( ((SvxCrossedOutItem*)pItem)->GetStrikeout() ); + aTmp <<= (sal_Int16)( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); + aFont.SetStrikeout( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); break; case RES_CHRATR_POSTURE: - aTmp <<= (sal_Int16)( ((SvxPostureItem*)pItem)->GetPosture() ); - aFont.SetItalic( ((SvxPostureItem*)pItem)->GetPosture() ); + aTmp <<= (sal_Int16)( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); + aFont.SetItalic( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); break; default: diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 7c5f5f5b05a0..bc48b2932b41 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -384,7 +384,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, if (pFlySet) { if (const SwFmtFrmSize* pSize = - (const SwFmtFrmSize*)pFlySet->GetItem(RES_FRM_SIZE, false)) + static_cast<const SwFmtFrmSize*>(pFlySet->GetItem(RES_FRM_SIZE, false))) { aRect.SetSize(pSize->GetSize()); } diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index fb2251f5be2e..a94b5032056b 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -350,7 +350,7 @@ bool SwWW8ImplReader::ForceFieldLanguage(SwField &rFld, sal_uInt16 nLang) bool bRet(false); const SvxLanguageItem *pLang = - (const SvxLanguageItem*)GetFmtAttr(RES_CHRATR_LANGUAGE); + static_cast<const SvxLanguageItem*>(GetFmtAttr(RES_CHRATR_LANGUAGE)); OSL_ENSURE(pLang, "impossible"); sal_uInt16 nDefault = pLang ? pLang->GetValue() : LANGUAGE_ENGLISH_US; @@ -398,7 +398,7 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat, bRTL = true; } RES_CHRATR eLang = bRTL ? RES_CHRATR_CTL_LANGUAGE : RES_CHRATR_LANGUAGE; - const SvxLanguageItem *pLang = (SvxLanguageItem*)GetFmtAttr( static_cast< sal_uInt16 >(eLang)); + const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFmtAttr( static_cast< sal_uInt16 >(eLang))); OSL_ENSURE(pLang, "impossible"); rLang = pLang ? pLang->GetValue() : LANGUAGE_ENGLISH_US; @@ -1037,7 +1037,7 @@ void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const OUString& rTag SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( SwSetExpFieldType( &rDoc, aName, nsSwGetSetExpType::GSE_STRING ) ); - SwSetExpField aFld( (SwSetExpFieldType*)pFT, rTagText ); // SUB_INVISIBLE + SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pFT), rTagText ); // SUB_INVISIBLE sal_uInt16 nSubType = ( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_VISIBLE ) ) ? 0 : nsSwExtendedSubType::SUB_INVISIBLE; aFld.SetSubType(nSubType | nsSwGetSetExpType::GSE_STRING); @@ -1220,8 +1220,8 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pFld, if (aResult != aFieldVarNames.end()) { - SwGetExpField aFld( (SwGetExpFieldType*) - pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_GETEXPFLD), sName, nsSwGetSetExpType::GSE_STRING, 0); + SwGetExpField aFld( static_cast<SwGetExpFieldType*>( + pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_GETEXPFLD)), sName, nsSwGetSetExpType::GSE_STRING, 0); delete rEntry.pAttr; SwFmtFld aTmp(aFld); rEntry.pAttr = aTmp.Clone(); @@ -1289,8 +1289,8 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, OUString& rStr ) const long nNo = MapBookmarkVariables(pF, sOrigName, aResult); - SwSetExpFieldType* pFT = (SwSetExpFieldType*)rDoc.getIDocumentFieldsAccess().InsertFldType( - SwSetExpFieldType(&rDoc, sOrigName, nsSwGetSetExpType::GSE_STRING)); + SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFldType( + SwSetExpFieldType(&rDoc, sOrigName, nsSwGetSetExpType::GSE_STRING))); SwSetExpField aFld(pFT, aResult); aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING); aFld.SetInputFlag(true); @@ -1309,7 +1309,7 @@ eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, OUString& rStr ) SwSetExpFieldType aT( &rDoc, OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ ); pNumFldType = rDoc.getIDocumentFieldsAccess().InsertFldType( aT ); } - SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, OUString(), + SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pNumFldType), OUString(), GetNumberPara( rStr ) ); aFld.SetValue( ++nFldNum ); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); @@ -1376,8 +1376,8 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, OUString& rStr ) if (aSequenceName.isEmpty() && aBook.isEmpty()) return FLD_TAGIGN; - SwSetExpFieldType* pFT = (SwSetExpFieldType*)rDoc.getIDocumentFieldsAccess().InsertFldType( - SwSetExpFieldType( &rDoc, aSequenceName, nsSwGetSetExpType::GSE_SEQ ) ); + SwSetExpFieldType* pFT = static_cast<SwSetExpFieldType*>(rDoc.getIDocumentFieldsAccess().InsertFldType( + SwSetExpFieldType( &rDoc, aSequenceName, nsSwGetSetExpType::GSE_SEQ ) ) ); SwSetExpField aFld( pFT, OUString(), eNumFormat ); //#i120654# Add bHidden for /h flag (/h: Hide the field result.) @@ -1508,8 +1508,8 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr ) if( !bFldFound ) { - SwDocInfoField aFld( (SwDocInfoFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD ), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) ); + SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) ); rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0); return FLD_OK; @@ -1615,8 +1615,8 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr ) aData = comphelper::string::remove(aData, '"'); } - SwDocInfoField aFld( (SwDocInfoFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD ), nSub|nReg, aData, nFormat ); + SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), nSub|nReg, aData, nFormat ); if (bDateTime) ForceFieldLanguage(aFld, nLang); rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0); @@ -1628,8 +1628,8 @@ eF_ResT SwWW8ImplReader::Read_F_Author( WW8FieldDesc*, OUString& ) { // SH: Das SwAuthorField bezeichnet nicht den urspruenglichen // Autor, sondern den aktuellen Benutzer, also besser ueber DocInfo - SwDocInfoField aFld( (SwDocInfoFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD ), + SwDocInfoField aFld( static_cast<SwDocInfoFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )), DI_CREATE|DI_SUB_AUTHOR, OUString() ); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); return FLD_OK; @@ -1637,8 +1637,8 @@ eF_ResT SwWW8ImplReader::Read_F_Author( WW8FieldDesc*, OUString& ) eF_ResT SwWW8ImplReader::Read_F_TemplName( WW8FieldDesc*, OUString& ) { - SwTemplNameField aFld( (SwTemplNameFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD ), FF_NAME ); + SwTemplNameField aFld( static_cast<SwTemplNameFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )), FF_NAME ); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); return FLD_OK; } @@ -1692,15 +1692,15 @@ eF_ResT SwWW8ImplReader::Read_F_DateTime( WW8FieldDesc*pF, OUString& rStr ) if (nDT & NUMBERFORMAT_DATE) { - SwDateTimeField aFld((SwDateTimeFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD ), DATEFLD, nFormat); + SwDateTimeField aFld(static_cast<SwDateTimeFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD )), DATEFLD, nFormat); ForceFieldLanguage(aFld, nLang); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); } else if (nDT == NUMBERFORMAT_TIME) { - SwDateTimeField aFld((SwDateTimeFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD), TIMEFLD, nFormat); + SwDateTimeField aFld(static_cast<SwDateTimeFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DATETIMEFLD)), TIMEFLD, nFormat); ForceFieldLanguage(aFld, nLang); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); } @@ -1733,7 +1733,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, OUString &rStr) } SwFileNameField aFld( - (SwFileNameFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_FILENAMEFLD), eType); + static_cast<SwFileNameFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_FILENAMEFLD)), eType); rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0); return FLD_OK; } @@ -1745,8 +1745,8 @@ eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr ) case 27: nSub = DS_WORD; break; // number of words case 28: nSub = DS_CHAR; break; // number of characters } - SwDocStatField aFld( (SwDocStatFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCSTATFLD ), nSub, + SwDocStatField aFld( static_cast<SwDocStatFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCSTATFLD )), nSub, GetNumberPara( rStr ) ); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); return FLD_OK; @@ -1755,8 +1755,8 @@ eF_ResT SwWW8ImplReader::Read_F_Anz( WW8FieldDesc* pF, OUString& rStr ) eF_ResT SwWW8ImplReader::Read_F_CurPage( WW8FieldDesc*, OUString& rStr ) { // page number - SwPageNumberField aFld( (SwPageNumberFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_PAGENUMBERFLD ), PG_RANDOM, + SwPageNumberField aFld( static_cast<SwPageNumberFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_PAGENUMBERFLD )), PG_RANDOM, GetNumberPara(rStr, true)); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); @@ -1885,7 +1885,7 @@ eF_ResT SwWW8ImplReader::Read_F_Set( WW8FieldDesc* pF, OUString& rStr ) SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( SwSetExpFieldType( &rDoc, sOrigName, nsSwGetSetExpType::GSE_STRING ) ); - SwSetExpField aFld( (SwSetExpFieldType*)pFT, sVal, ULONG_MAX ); + SwSetExpField aFld( static_cast<SwSetExpFieldType*>(pFT), sVal, ULONG_MAX ); aFld.SetSubType(nsSwExtendedSubType::SUB_INVISIBLE | nsSwGetSetExpType::GSE_STRING); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); @@ -1948,7 +1948,7 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr ) OUString sBkmName(GetMappedBookmark(sOrigBkmName)); SwGetRefField aFld( - (SwGetRefFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD ), + static_cast<SwGetRefFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )), sBkmName,REF_BOOKMARK,0,eFormat); if (eFormat == REF_CONTENT) @@ -2003,15 +2003,15 @@ eF_ResT SwWW8ImplReader::Read_F_NoteReference( WW8FieldDesc*, OUString& rStr ) // set Sequence No of corresponding Foot-/Endnote to Zero // (will be corrected in - SwGetRefField aFld( (SwGetRefFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD ), aBkmName, REF_FOOTNOTE, 0, + SwGetRefField aFld( static_cast<SwGetRefFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )), aBkmName, REF_FOOTNOTE, 0, REF_ONLYNUMBER ); pReffingStck->NewAttr(*pPaM->GetPoint(), SwFmtFld(aFld)); pReffingStck->SetAttr(*pPaM->GetPoint(), RES_TXTATR_FIELD); if (bAboveBelow) { - SwGetRefField aFld2( (SwGetRefFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD ),aBkmName, REF_FOOTNOTE, 0, + SwGetRefField aFld2( static_cast<SwGetRefFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )),aBkmName, REF_FOOTNOTE, 0, REF_UPDOWN ); pReffingStck->NewAttr(*pPaM->GetPoint(), SwFmtFld(aFld2)); pReffingStck->SetAttr(*pPaM->GetPoint(), RES_TXTATR_FIELD); @@ -2086,7 +2086,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, OUString& rStr ) { sPageRefBookmarkName = sName; } - SwGetRefField aFld( (SwGetRefFieldType*)rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD ), + SwGetRefField aFld( static_cast<SwGetRefFieldType*>(rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_GETREFFLD )), sPageRefBookmarkName, REF_BOOKMARK, 0, REF_PAGE ); rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); @@ -2165,8 +2165,8 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr) bool bApplyWingdings = ConvertMacroSymbol( aName, aVText ); aName = "StarOffice.Standard.Modul1." + aName; - SwMacroField aFld( (SwMacroFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_MACROFLD ), aName, aVText ); + SwMacroField aFld( static_cast<SwMacroFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_MACROFLD )), aName, aVText ); if( !bApplyWingdings ) { @@ -2404,7 +2404,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, OUString& rStr ) SwDBFieldType aD( &rDoc, aName, SwDBData() ); // Datenbank: Nichts SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( aD ); - SwDBField aFld( (SwDBFieldType*)pFT ); + SwDBField aFld( static_cast<SwDBFieldType*>(pFT) ); aFld.SetFieldCode( rStr ); OUString aResult; @@ -2426,7 +2426,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBNext( WW8FieldDesc*, OUString& ) #if HAVE_FEATURE_DBCONNECTIVITY SwDBNextSetFieldType aN; SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( aN ); - SwDBNextSetField aFld( (SwDBNextSetFieldType*)pFT, OUString(), OUString(), + SwDBNextSetField aFld( static_cast<SwDBNextSetFieldType*>(pFT), OUString(), OUString(), SwDBData() ); // Datenbank: Nichts rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); #endif @@ -2439,7 +2439,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBNum( WW8FieldDesc*, OUString& ) #if HAVE_FEATURE_DBCONNECTIVITY SwDBSetNumberFieldType aN; SwFieldType* pFT = rDoc.getIDocumentFieldsAccess().InsertFldType( aN ); - SwDBSetNumberField aFld( (SwDBSetNumberFieldType*)pFT, + SwDBSetNumberField aFld( static_cast<SwDBSetNumberFieldType*>(pFT), SwDBData() ); // Datenbank: Nichts rDoc.getIDocumentContentOperations().InsertPoolItem( *pPaM, SwFmtFld( aFld ), 0 ); #endif @@ -2471,8 +2471,8 @@ eF_ResT SwWW8ImplReader::Read_F_Equation( WW8FieldDesc*, OUString& rStr ) } else if (aResult.sType == "CombinedCharacters") { - SwCombinedCharField aFld((SwCombinedCharFieldType*) - rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_COMBINED_CHARS), aResult.sType); + SwCombinedCharField aFld(static_cast<SwCombinedCharFieldType*>( + rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_COMBINED_CHARS)), aResult.sType); rDoc.getIDocumentContentOperations().InsertPoolItem(*pPaM, SwFmtFld(aFld), 0); } } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index cad7b49767f2..9310ff9d3c6f 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -741,7 +741,7 @@ void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection) { SwFmtLineNumber aLN; if (const SwFmtLineNumber* pLN - = (const SwFmtLineNumber*)GetFmtAttr(RES_LINENUMBER)) + = static_cast<const SwFmtLineNumber*>(GetFmtAttr(RES_LINENUMBER))) { aLN.SetCountLines( pLN->IsCount() ); } @@ -2487,7 +2487,7 @@ void SwWW8ImplReader::StopApo() works */ const SfxPoolItem &rItm = pNd->SwCntntNode::GetAttr(RES_BACKGROUND); - const SvxBrushItem &rBrush = (const SvxBrushItem&)(rItm); + const SvxBrushItem &rBrush = static_cast<const SvxBrushItem&>(rItm); if (rBrush.GetColor().GetColor() != COL_AUTO) aBg = rBrush.GetColor(); @@ -3200,7 +3200,7 @@ void SwWW8ImplReader::Read_SubSuperProp( sal_uInt16, const sal_uInt8* pData, sho short nPos = eVersion <= ww::eWW2 ? static_cast< sal_Int8 >( *pData ) : SVBT16ToShort( pData ); sal_Int32 nPos2 = nPos * ( 10 * 100 ); // HalfPoints in 100 * tw const SvxFontHeightItem* pF - = (const SvxFontHeightItem*)GetFmtAttr(RES_CHRATR_FONTSIZE); + = static_cast<const SvxFontHeightItem*>(GetFmtAttr(RES_CHRATR_FONTSIZE)); OSL_ENSURE(pF, "Expected to have the fontheight available here"); // #i59022: Check ensure nHeight != 0. Div by zero otherwise. @@ -3358,7 +3358,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh { const SwAttrSet& aSet = pAktColl->GetAttrSet(); SvxUnderlineItem *pUnderline - = (SvxUnderlineItem *)(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone()); + = static_cast<SvxUnderlineItem *>(aSet.Get( RES_CHRATR_UNDERLINE, false ).Clone()); if(pUnderline){ pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) ); pAktColl->SetFmtAttr( *pUnderline ); @@ -3371,7 +3371,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh if ( SfxItemState::SET == pAktItemSet->GetItemState( RES_CHRATR_UNDERLINE, false ) ) { SvxUnderlineItem *pUnderline - = (SvxUnderlineItem *)(pAktItemSet->Get( RES_CHRATR_UNDERLINE, false ) .Clone()); + = static_cast<SvxUnderlineItem *>(pAktItemSet->Get( RES_CHRATR_UNDERLINE, false ) .Clone()); if(pUnderline){ pUnderline->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)) ) ); pAktItemSet->Put( *pUnderline ); @@ -3381,7 +3381,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh } else { - SvxUnderlineItem* pUnderlineAttr = (SvxUnderlineItem*)pCtrlStck->GetOpenStackAttr( *pPaM->GetPoint(), RES_CHRATR_UNDERLINE ); + SvxUnderlineItem* pUnderlineAttr = const_cast<SvxUnderlineItem*>(static_cast<const SvxUnderlineItem*>(pCtrlStck->GetOpenStackAttr( *pPaM->GetPoint(), RES_CHRATR_UNDERLINE ))); if( pUnderlineAttr != NULL ) pUnderlineAttr->SetColor( Color( msfilter::util::BGRToRGB(SVBT32ToUInt32( pData )))); } @@ -3764,7 +3764,7 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen return; } - NewAttr( SwFmtCharFmt( (SwCharFmt*)vColl[nId].pFmt ) ); + NewAttr( SwFmtCharFmt( static_cast<SwCharFmt*>(vColl[nId].pFmt) ) ); nCharFmt = (short) nId; } @@ -3869,7 +3869,7 @@ void SwWW8ImplReader::Read_NoLineNumb(sal_uInt16 , const sal_uInt8* pData, short } SwFmtLineNumber aLN; if (const SwFmtLineNumber* pLN - = (const SwFmtLineNumber*)GetFmtAttr(RES_LINENUMBER)) + = static_cast<const SwFmtLineNumber*>(GetFmtAttr(RES_LINENUMBER))) { aLN.SetStartValue( pLN->GetStartValue() ); } @@ -4011,7 +4011,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe aLR.SetTxtLeft(pNumFmt->GetIndentAt()); // If have not explicit left, set number format list tab position is doc default tab - const SvxTabStopItem *pDefaultStopItem = (const SvxTabStopItem *)rDoc.GetAttrPool().GetPoolDefaultItem(RES_PARATR_TABSTOP); + const SvxTabStopItem *pDefaultStopItem = static_cast<const SvxTabStopItem *>(rDoc.GetAttrPool().GetPoolDefaultItem(RES_PARATR_TABSTOP)); if ( pDefaultStopItem && pDefaultStopItem->Count() > 0 ) ((SwNumFmt*)(pNumFmt))->SetListtabPos( ((SvxTabStop&)(*pDefaultStopItem)[0]).GetTabPos() ); } @@ -4086,8 +4086,8 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short // nach Absprache mit AMA ist die Begrenzung unsinnig if( n>200 ) n = 200; // SW_UI-Maximum aLSpc.SetPropLineSpace( (const sal_uInt8)n ); - const SvxFontHeightItem* pH = (const SvxFontHeightItem*) - GetFmtAttr( RES_CHRATR_FONTSIZE ); + const SvxFontHeightItem* pH = static_cast<const SvxFontHeightItem*>( + GetFmtAttr( RES_CHRATR_FONTSIZE )); nSpaceTw = (sal_uInt16)( n * pH->GetHeight() / 100 ); } else // Fixed / Minimum @@ -4121,7 +4121,7 @@ void SwWW8ImplReader::Read_ParaAutoBefore(sal_uInt16, const sal_uInt8 *pData, sh if (*pData) { - SvxULSpaceItem aUL(*(const SvxULSpaceItem*)GetFmtAttr(RES_UL_SPACE)); + SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFmtAttr(RES_UL_SPACE))); aUL.SetUpper(GetParagraphAutoSpace(pWDop->fDontUseHTMLAutoSpacing)); NewAttr(aUL); if (pAktColl && nAktColl < vColl.size()) @@ -4148,7 +4148,7 @@ void SwWW8ImplReader::Read_ParaAutoAfter(sal_uInt16, const sal_uInt8 *pData, sho if (*pData) { - SvxULSpaceItem aUL(*(const SvxULSpaceItem*)GetFmtAttr(RES_UL_SPACE)); + SvxULSpaceItem aUL(*static_cast<const SvxULSpaceItem*>(GetFmtAttr(RES_UL_SPACE))); aUL.SetLower(GetParagraphAutoSpace(pWDop->fDontUseHTMLAutoSpacing)); NewAttr(aUL); if (pAktColl && nAktColl < vColl.size()) @@ -4190,7 +4190,7 @@ void SwWW8ImplReader::Read_UL( sal_uInt16 nId, const sal_uInt8* pData, short nLe if( nPara < 0 ) nPara = -nPara; - SvxULSpaceItem aUL( *(const SvxULSpaceItem*)GetFmtAttr( RES_UL_SPACE )); + SvxULSpaceItem aUL( *static_cast<const SvxULSpaceItem*>(GetFmtAttr( RES_UL_SPACE ))); switch( nId ) { @@ -4218,7 +4218,7 @@ void SwWW8ImplReader::Read_ParaContextualSpacing( sal_uInt16, const sal_uInt8* p pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE ); return; } - SvxULSpaceItem aUL( *(const SvxULSpaceItem*)GetFmtAttr( RES_UL_SPACE )); + SvxULSpaceItem aUL( *static_cast<const SvxULSpaceItem*>(GetFmtAttr( RES_UL_SPACE ))); aUL.SetContextValue(*pData); NewAttr( aUL ); } @@ -4287,7 +4287,7 @@ bool SwWW8ImplReader::IsRightToLeft() else { const SvxFrameDirectionItem* pItem= - (const SvxFrameDirectionItem*)GetFmtAttr(RES_FRAMEDIR); + static_cast<const SvxFrameDirectionItem*>(GetFmtAttr(RES_FRAMEDIR)); if (pItem && (pItem->GetValue() == FRMDIR_HORI_RIGHT_TOP)) bRTL = true; } @@ -4359,7 +4359,7 @@ void SwWW8ImplReader::Read_BoolItem( sal_uInt16 nId, const sal_uInt8* pData, sho pCtrlStck->SetAttr( *pPaM->GetPoint(), nId ); else { - SfxBoolItem* pI = (SfxBoolItem*)GetDfltAttr( nId )->Clone(); + SfxBoolItem* pI = static_cast<SfxBoolItem*>(GetDfltAttr( nId )->Clone()); pI->SetValue( 0 != *pData ); NewAttr( *pI ); delete pI; @@ -4449,8 +4449,8 @@ void SwWW8ImplReader::Read_Relief( sal_uInt16 nId, const sal_uInt8* pData, short // 2 x emboss on -> no emboss !!! // the actual value must be searched over the stack / template - const SvxCharReliefItem* pOld = (const SvxCharReliefItem*) - GetFmtAttr( RES_CHRATR_RELIEF ); + const SvxCharReliefItem* pOld = static_cast<const SvxCharReliefItem*>( + GetFmtAttr( RES_CHRATR_RELIEF )); FontRelief nNewValue = 0x854 == nId ? RELIEF_ENGRAVED : ( 0x858 == nId ? RELIEF_EMBOSSED : RELIEF_NONE ); @@ -4732,7 +4732,7 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen) // werden, sonst ist kein hartes Ausschalten von Style-Attrs // moeglich const SvxBoxItem* pBox - = (const SvxBoxItem*)GetFmtAttr( RES_BOX ); + = static_cast<const SvxBoxItem*>(GetFmtAttr( RES_BOX )); SvxBoxItem aBox(RES_BOX); if (pBox) aBox = *pBox; @@ -4779,7 +4779,7 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh else { const SvxBoxItem* pBox - = (const SvxBoxItem*)GetFmtAttr( RES_CHRATR_BOX ); + = static_cast<const SvxBoxItem*>(GetFmtAttr( RES_CHRATR_BOX )); if( pBox ) { SvxBoxItem aBoxItem(RES_CHRATR_BOX); @@ -4816,7 +4816,7 @@ void SwWW8ImplReader::Read_Hyphenation( sal_uInt16, const sal_uInt8* pData, shor else { SvxHyphenZoneItem aAttr( - *(const SvxHyphenZoneItem*)GetFmtAttr( RES_PARATR_HYPHENZONE ) ); + *static_cast<const SvxHyphenZoneItem*>(GetFmtAttr( RES_PARATR_HYPHENZONE ) )); aAttr.SetHyphen( 0 == *pData ); // sic ! diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 28525bde172c..145886d2172b 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4811,7 +4811,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) (pPcd->nEndPos != p->nStartPos)) { pPcd->nEndPos = p->nStartPos; - ((WW8PLCFx_PCD *)(pPcd->pPLCFx))->SetClipStart( + static_cast<WW8PLCFx_PCD *>(pPcd->pPLCFx)->SetClipStart( p->nStartPos); } @@ -4847,7 +4847,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) { if (aD[nIdx+1].pIdStk->empty()) { - WW8PLCFx_PCD *pTemp = (WW8PLCFx_PCD*)(pPcd->pPLCFx); + WW8PLCFx_PCD *pTemp = static_cast<WW8PLCFx_PCD*>(pPcd->pPLCFx); /* #i2325# As per normal, go on to the next set of properties, i.e. we @@ -4958,23 +4958,23 @@ sal_uInt16 WW8PLCFMan::GetColl() const WW8PLCFx_FLD* WW8PLCFMan::GetFld() const { - return (WW8PLCFx_FLD*)pFld->pPLCFx; + return static_cast<WW8PLCFx_FLD*>(pFld->pPLCFx); } const sal_uInt8* WW8PLCFMan::HasParaSprm( sal_uInt16 nId ) const { - return ((WW8PLCFx_Cp_FKP*)pPap->pPLCFx)->HasSprm( nId ); + return static_cast<WW8PLCFx_Cp_FKP*>(pPap->pPLCFx)->HasSprm( nId ); } const sal_uInt8* WW8PLCFMan::HasCharSprm( sal_uInt16 nId ) const { - return ((WW8PLCFx_Cp_FKP*)pChp->pPLCFx)->HasSprm( nId ); + return static_cast<WW8PLCFx_Cp_FKP*>(pChp->pPLCFx)->HasSprm( nId ); } bool WW8PLCFMan::HasCharSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult) const { - return ((WW8PLCFx_Cp_FKP*)pChp->pPLCFx)->HasSprm(nId, rResult); + return static_cast<WW8PLCFx_Cp_FKP*>(pChp->pPLCFx)->HasSprm(nId, rResult); } #endif // !DUMP diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index a3ce96fefd72..afcb415e678b 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -907,10 +907,10 @@ public: void advance(); sal_uInt16 GetColl() const; // index of actual Style WW8PLCFx_FLD* GetFld() const; - WW8PLCFx_SubDoc* GetEdn() const { return (WW8PLCFx_SubDoc*)pEdn->pPLCFx; } - WW8PLCFx_SubDoc* GetFtn() const { return (WW8PLCFx_SubDoc*)pFtn->pPLCFx; } - WW8PLCFx_SubDoc* GetAtn() const { return (WW8PLCFx_SubDoc*)pAnd->pPLCFx; } - WW8PLCFx_Book* GetBook() const { return (WW8PLCFx_Book*)pBkm->pPLCFx; } + WW8PLCFx_SubDoc* GetEdn() const { return static_cast<WW8PLCFx_SubDoc*>(pEdn->pPLCFx); } + WW8PLCFx_SubDoc* GetFtn() const { return static_cast<WW8PLCFx_SubDoc*>(pFtn->pPLCFx); } + WW8PLCFx_SubDoc* GetAtn() const { return static_cast<WW8PLCFx_SubDoc*>(pAnd->pPLCFx); } + WW8PLCFx_Book* GetBook() const { return static_cast<WW8PLCFx_Book*>(pBkm->pPLCFx); } long GetCpOfs() const { return pChp->nCpOfs; } // for Header/Footer... /* fragt, ob *aktueller Absatz* einen Sprm diesen Typs hat */ @@ -921,11 +921,11 @@ public: bool HasCharSprm(sal_uInt16 nId, std::vector<const sal_uInt8 *> &rResult) const; WW8PLCFx_Cp_FKP* GetChpPLCF() const - { return (WW8PLCFx_Cp_FKP*)pChp->pPLCFx; } + { return static_cast<WW8PLCFx_Cp_FKP*>(pChp->pPLCFx); } WW8PLCFx_Cp_FKP* GetPapPLCF() const - { return (WW8PLCFx_Cp_FKP*)pPap->pPLCFx; } + { return static_cast<WW8PLCFx_Cp_FKP*>(pPap->pPLCFx); } WW8PLCFx_SEPX* GetSepPLCF() const - { return (WW8PLCFx_SEPX*)pSep->pPLCFx; } + { return static_cast<WW8PLCFx_SEPX*>(pSep->pPLCFx); } WW8PLCFxDesc* GetPap() const { return pPap; } bool TransferOpenSprms(std::stack<sal_uInt16> &rStack); void SeekPos( long nNewCp ); diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 9a638be8d110..8cf6b00bc780 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -439,7 +439,7 @@ protected: const OUString& rLocalName, const OUString& rValue ) SAL_OVERRIDE; - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } public: @@ -657,8 +657,8 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc() if( SfxItemState::SET == pItemSet->GetItemState( RES_PAGEDESC, false, &pItem ) ) { - if( ((SwFmtPageDesc *)pItem)->GetPageDesc() != pPageDesc ) - pFmtPageDesc = new SwFmtPageDesc( *(SwFmtPageDesc *)pItem ); + if( static_cast<const SwFmtPageDesc *>(pItem)->GetPageDesc() != pPageDesc ) + pFmtPageDesc = new SwFmtPageDesc( *static_cast<const SwFmtPageDesc *>(pItem) ); } else pFmtPageDesc = new SwFmtPageDesc(); @@ -707,9 +707,9 @@ bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName() class SwXMLStylesContext_Impl : public SvXMLStylesContext { - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } const SwXMLImport& GetSwImport() const - { return (const SwXMLImport&)GetImport(); } + { return static_cast<const SwXMLImport&>(GetImport()); } protected: @@ -906,9 +906,9 @@ class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext protected: virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } const SwXMLImport& GetSwImport() const - { return (const SwXMLImport&)GetImport(); } + { return static_cast<const SwXMLImport&>(GetImport()); } public: diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index 154a9e96caf5..8574cd7ddcd7 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -51,7 +51,7 @@ SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl( const sal_uInt16 nWhichId = aWhichIds[i]; const SvxFontItem& rFont = - (const SvxFontItem&)rPool.GetDefaultItem( nWhichId ); + static_cast<const SvxFontItem&>(rPool.GetDefaultItem( nWhichId )); Add( rFont.GetFamilyName(), rFont.GetStyleName(), rFont.GetFamily(), rFont.GetPitch(), rFont.GetCharSet() ); @@ -61,7 +61,7 @@ SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl( if( 0 != (pItem = rPool.GetItem2( nWhichId, j ) ) ) { const SvxFontItem *pFont = - (const SvxFontItem *)pItem; + static_cast<const SvxFontItem *>(pItem); Add( pFont->GetFamilyName(), pFont->GetStyleName(), pFont->GetFamily(), pFont->GetPitch(), pFont->GetCharSet() ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index b5027d50e70f..4d276919abde 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -116,7 +116,7 @@ static SvXMLTokenMapEntry aDocTokenMap[] = class SwXMLBodyContext_Impl : public SvXMLImportContext { - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } public: @@ -161,7 +161,7 @@ class SwXMLDocContext_Impl : public virtual SvXMLImportContext { protected: // #i69629# - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } public: diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index b13d83ecb163..a740898ba094 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -202,8 +202,8 @@ void SwXMLTableItemMapper_Impl::handleElementItem( { case RES_BACKGROUND: { - ((SwXMLTableItemMapper_Impl *)this)->aBrushItemExport.exportXML( - (const SvxBrushItem&)rItem ); + const_cast<SwXMLTableItemMapper_Impl *>(this)->aBrushItemExport.exportXML( + static_cast<const SvxBrushItem&>(rItem) ); } break; } @@ -234,7 +234,7 @@ void SwXMLExport::_FinitItemExport() void SwXMLExport::ExportTableFmt( const SwFrmFmt& rFmt, sal_uInt32 nAbsWidth ) { - ((SwXMLTableItemMapper_Impl *)pTableItemMapper) + static_cast<SwXMLTableItemMapper_Impl *>(pTableItemMapper) ->SetAbsWidth( nAbsWidth ); ExportFmt( rFmt, XML_TABLE ); } diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 271e337ac05d..fe6d09dffbb1 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -306,7 +306,7 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext( { pContext = new SwXMLBrushItemImportContext( GetImport(), nPrefix, rLocalName, xAttrList, - _rUnitConv, *(const SvxBrushItem *)pItem ); + _rUnitConv, *static_cast<const SvxBrushItem *>(pItem) ); } else { diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index a82450903b33..d4267871a0ec 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -198,13 +198,13 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); const SfxPoolItem *pItem; if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, false, &pItem ) ) - pFrmSize = (const SwFmtFrmSize *)pItem; + pFrmSize = static_cast<const SwFmtFrmSize *>(pItem); if( SfxItemState::SET == rItemSet.GetItemState( RES_ROW_SPLIT, false, &pItem ) ) - pRowSplit = (const SwFmtRowSplit *)pItem; + pRowSplit = static_cast<const SwFmtRowSplit *>(pItem); if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) - pBrush = (const SvxBrushItem *)pItem; + pBrush = static_cast<const SvxBrushItem *>(pItem); // empty styles have not to be exported if( !pFrmSize && !pBrush && !pRowSplit ) @@ -226,7 +226,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, if( !pFrmSize ) break; - pTestFrmSize = (const SwFmtFrmSize *)pItem; + pTestFrmSize = static_cast<const SwFmtFrmSize *>(pItem); } else { @@ -240,7 +240,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, if( !pBrush ) break; - pTestBrush = (const SvxBrushItem *)pItem; + pTestBrush = static_cast<const SvxBrushItem *>(pItem); } else { @@ -254,7 +254,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt, if( !pRowSplit ) break; - pTestRowSplit = (const SwFmtRowSplit *)pItem; + pTestRowSplit = static_cast<const SwFmtRowSplit *>(pItem); } else { @@ -317,20 +317,20 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, const SfxPoolItem *pItem; if( SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) ) - pVertOrient = (const SwFmtVertOrient *)pItem; + pVertOrient = static_cast<const SwFmtVertOrient *>(pItem); if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) - pBrush = (const SvxBrushItem *)pItem; + pBrush = static_cast<const SvxBrushItem *>(pItem); if( SfxItemState::SET == rItemSet.GetItemState( RES_BOX, false, &pItem ) ) - pBox = (const SvxBoxItem *)pItem; + pBox = static_cast<const SvxBoxItem *>(pItem); if ( SfxItemState::SET == rItemSet.GetItemState( RES_BOXATR_FORMAT, false, &pItem ) ) - pNumFmt = (const SwTblBoxNumFormat *)pItem; + pNumFmt = static_cast<const SwTblBoxNumFormat *>(pItem); if ( SfxItemState::SET == rItemSet.GetItemState( RES_FRAMEDIR, false, &pItem ) ) - pFrameDir = (const SvxFrameDirectionItem *)pItem; + pFrameDir = static_cast<const SvxFrameDirectionItem *>(pItem); // empty styles have not to be exported if( !pVertOrient && !pBrush && !pBox && !pNumFmt && !pFrameDir ) @@ -359,7 +359,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, if( !pVertOrient ) break; - pTestVertOrient = (const SwFmtVertOrient *)pItem; + pTestVertOrient = static_cast<const SwFmtVertOrient *>(pItem); } else { @@ -373,7 +373,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, if( !pBrush ) break; - pTestBrush = (const SvxBrushItem *)pItem; + pTestBrush = static_cast<const SvxBrushItem *>(pItem); } else { @@ -386,7 +386,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, if( !pBox ) break; - pTestBox = (const SvxBoxItem *)pItem; + pTestBox = static_cast<const SvxBoxItem *>(pItem); } else { @@ -400,7 +400,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, if( !pNumFmt ) break; - pTestNumFmt = (const SwTblBoxNumFormat *)pItem; + pTestNumFmt = static_cast<const SwTblBoxNumFormat *>(pItem); } else { @@ -415,7 +415,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, if( !pFrameDir ) break; - pTestFrameDir = (const SvxFrameDirectionItem *)pItem; + pTestFrameDir = static_cast<const SvxFrameDirectionItem *>(pItem); } else { diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 673027b58e04..b6d3bdd380d7 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -274,7 +274,7 @@ inline void SwXMLTableCell_Impl::SetStartNode( const SwStartNode *pSttNd ) inline SwXMLTableContext *SwXMLTableCell_Impl::GetSubTable() const { - return (SwXMLTableContext *)&xSubTable; + return static_cast<SwXMLTableContext *>(&xSubTable); } inline void SwXMLTableCell_Impl::Dispose() @@ -407,7 +407,7 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext bool bHasTextContent : 1; bool bHasTableContent : 1; - SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } + SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(&xMyTable); } bool HasContent() const { return bHasTextContent || bHasTableContent; } inline void _InsertContent(); @@ -429,7 +429,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( @@ -733,7 +733,7 @@ class SwXMLTableColContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; - SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } + SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(&xMyTable); } public: @@ -744,7 +744,7 @@ public: virtual ~SwXMLTableColContext_Impl(); - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( @@ -818,7 +818,7 @@ class SwXMLTableColsContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; - SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } + SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(&xMyTable); } public: @@ -834,7 +834,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl( @@ -876,7 +876,7 @@ class SwXMLTableRowContext_Impl : public SvXMLImportContext sal_uInt32 nRowRepeat; - SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } + SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(&xMyTable); } public: @@ -893,7 +893,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport, @@ -996,7 +996,7 @@ class SwXMLTableRowsContext_Impl : public SvXMLImportContext bool bHeader; - SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } + SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(&xMyTable); } public: @@ -1012,7 +1012,7 @@ public: const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport, @@ -1194,7 +1194,7 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext, else { // check for existing DDE field type with the same name - SwDDEFieldType* pOldType = (SwDDEFieldType*)pTableNode->GetDoc()->getIDocumentFieldsAccess().GetFldType(RES_DDEFLD, sName, false); + SwDDEFieldType* pOldType = static_cast<SwDDEFieldType*>(pTableNode->GetDoc()->getIDocumentFieldsAccess().GetFldType(RES_DDEFLD, sName, false)); if (NULL != pOldType) { // same values -> return old type @@ -1219,8 +1219,8 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext, { // create new field type and return SwDDEFieldType aDDEFieldType(sName, sCommand, nType); - pType = (SwDDEFieldType*)pTableNode-> - GetDoc()->getIDocumentFieldsAccess().InsertFldType(aDDEFieldType); + pType = static_cast<SwDDEFieldType*>(pTableNode-> + GetDoc()->getIDocumentFieldsAccess().InsertFldType(aDDEFieldType)); } OSL_ENSURE(NULL != pType, "We really want a SwDDEFieldType here!"); @@ -1829,7 +1829,7 @@ SwTableBox *SwXMLTableContext::NewTableBox( const SwStartNode *pStNd, // The topmost table is the only table that maintains the two members // pBox1 and bFirstSection. if( xParentTable.Is() ) - return ((SwXMLTableContext *)&xParentTable)->NewTableBox( pStNd, + return static_cast<SwXMLTableContext *>(&xParentTable)->NewTableBox( pStNd, pUpper ); SwTableBox *pBox; @@ -1871,7 +1871,7 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat( // get the old format, and reset all attributes // (but preserve FillOrder) - pBoxFmt2 = (SwTableBoxFmt*)pBox->ClaimFrmFmt(); + pBoxFmt2 = static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt()); SwFmtFillOrder aFillOrder( pBoxFmt2->GetFillOrder() ); pBoxFmt2->ResetAllFmtAttr(); // #i73790# - method renamed pBoxFmt2->SetFmtAttr( aFillOrder ); @@ -1890,7 +1890,7 @@ SwTableBoxFmt* SwXMLTableContext::GetSharedBoxFormat( // claim it, if we are not allowed to share if ( !bMayShare ) - pBoxFmt2 = (SwTableBoxFmt*)pBox->ClaimFrmFmt(); + pBoxFmt2 = static_cast<SwTableBoxFmt*>(pBox->ClaimFrmFmt()); } // lock format (if so desired) @@ -2671,7 +2671,7 @@ void SwXMLTableContext::MakeTable() const SvxLRSpaceItem *pLRSpace = 0; if( SfxItemState::SET == pAutoItemSet->GetItemState( RES_LR_SPACE, false, &pItem ) ) - pLRSpace = (const SvxLRSpaceItem *)pItem; + pLRSpace = static_cast<const SvxLRSpaceItem *>(pItem); if( SfxItemState::SET == pAutoItemSet->GetItemState( RES_HORI_ORIENT, false, &pItem ) ) @@ -2705,7 +2705,7 @@ void SwXMLTableContext::MakeTable() const SwFmtFrmSize *pSize = 0; if( SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false, &pItem ) ) - pSize = (const SwFmtFrmSize *)pItem; + pSize = static_cast<const SwFmtFrmSize *>(pItem); switch( eHoriOrient ) { @@ -2765,8 +2765,8 @@ void SwXMLTableContext::MakeTable() pBox1->pSttNd = pSttNd1; pLine1->GetTabBoxes().erase( pLine1->GetTabBoxes().begin() ); - pLineFmt = (SwTableLineFmt*)pLine1->GetFrmFmt(); - pBoxFmt = (SwTableBoxFmt*)pBox1->GetFrmFmt(); + pLineFmt = static_cast<SwTableLineFmt*>(pLine1->GetFrmFmt()); + pBoxFmt = static_cast<SwTableBoxFmt*>(pBox1->GetFrmFmt()); _MakeTable( 0 ); diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 9aff5f9e40c3..c3d303556193 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -149,7 +149,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } void InsertColumn( sal_Int32 nWidth, bool bRelWidth, const OUString *pDfltCellStyleName = 0 ); @@ -194,7 +194,7 @@ public: inline SwXMLTableContext *SwXMLTableContext::GetParentTable() const { - return (SwXMLTableContext *)&xParentTable; + return static_cast<SwXMLTableContext *>(&xParentTable); } inline sal_uInt32 SwXMLTableContext::GetColumnCount() const diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index f9721fafbd24..f5e1e35561a9 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star::text; class SwXMLBodyContentContext_Impl : public SvXMLImportContext { - SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } + SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } public: diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 63d8927c494e..f048effd4476 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -178,7 +178,7 @@ SvXMLImportContext *SwXMLTextImportHelper::CreateTableChildContext( const uno::Reference< XAttributeList > & xAttrList ) { return new SwXMLTableContext( - (SwXMLImport&)rImport, nPrefix, rLocalName, xAttrList ); + static_cast<SwXMLImport&>(rImport), nPrefix, rLocalName, xAttrList ); } bool SwXMLTextImportHelper::IsInHeaderFooter() const |