diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-05-11 09:18:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-11 09:46:09 +0100 |
commit | 2db379e22a7854dc16cc0066af70f16d5662d7e8 (patch) | |
tree | c11858145880cde24de8a6af6819c57799eff8fd /sw | |
parent | 951b128011db6bdf1050485b461d9af84a2ae367 (diff) |
cppcheck: cstyleCast
Change-Id: Id3ffa264ba7990b53d264745eaf0726f1468577b
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/text/porglue.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/porlay.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/text/txtfld.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/txtftn.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 2 |
11 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx index a0e5af1b4513..bcad1ebb2a59 100644 --- a/sw/source/core/text/porglue.cxx +++ b/sw/source/core/text/porglue.cxx @@ -169,7 +169,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr ) { // 1) We search for the left Glue - SwLinePortion *pPos = (SwLinePortion*)this; + SwLinePortion *pPos = this; SwGluePortion *pLeft = 0; while( pPos ) { @@ -254,7 +254,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr ) } } // If no left Glue remaines we set the break condition. - pRight = pLeft ? pLeft : (SwGluePortion*)this; + pRight = pLeft ? pLeft : this; } } diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 0fad655ed38b..a450b2a177db 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -139,7 +139,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns ) { if( GetLen() ) { - pPortion = new SwTxtPortion( *(SwLinePortion*)this ); + pPortion = new SwTxtPortion(*this); if( IsBlinking() && pBlink ) { SetBlinking( false ); @@ -161,7 +161,7 @@ SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns ) // First attribute change: copy mass and length from *pIns into the first // text portion if( !pPortion ) - pPortion = new SwTxtPortion( *(SwLinePortion*)this ); + pPortion = new SwTxtPortion(*this); // Call with scope or we'll end up with recursion! return pPortion->SwLinePortion::Append( pIns ); } @@ -184,7 +184,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin() SwMarginPortion *pLeft = (GetPortion() && GetPortion()->IsMarginPortion()) ? static_cast<SwMarginPortion *>(GetPortion()) : 0; if( !GetPortion() ) - SetPortion( new SwTxtPortion( *(SwLinePortion*)this ) ); + SetPortion(new SwTxtPortion(*this)); if( !pLeft ) { pLeft = new SwMarginPortion( 0 ); diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 5741651dbed7..39bbdc9c6712 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -72,7 +72,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, const SwTxtAttr *pHint ) const { SwExpandPortion *pRet = 0; - SwFrm *pFrame = (SwFrm*)pFrm; + SwFrm *pFrame = pFrm; SwField *pFld = const_cast<SwField*>(pHint->GetFmtFld().GetField()); const bool bName = rInf.GetOpt().IsFldName(); @@ -478,7 +478,7 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const if( SVX_NUM_BITMAP == rNumFmt.GetNumberingType() ) { - pRet = new SwGrfNumPortion( (SwFrm*)GetTxtFrm(), + pRet = new SwGrfNumPortion( const_cast<SwTxtFrm*>(GetTxtFrm()), pTxtNd->GetLabelFollowedBy(), rNumFmt.GetBrush(), rNumFmt.GetGraphicOrientation(), diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 9505b649538b..f5be1d3288f1 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -812,7 +812,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf, sal_uInt16 nOldReal = pCurr->GetRealHeight(); sal_uInt16 nOldAscent = pCurr->GetAscent(); sal_uInt16 nOldHeight = pCurr->Height(); - ((SwTxtFormatter*)this)->CalcRealHeight(); + CalcRealHeight(); nReal = pCurr->GetRealHeight(); if( nReal < nOldReal ) nReal = nOldReal; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index e49d52e9b1be..718d5527fe94 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -209,7 +209,7 @@ void RtfExport::BuildNumbering() SwNumRule* pRule; --n; if (n == rListTbl.size()) - pRule = (SwNumRule*)m_pDoc->GetOutlineNumRule(); + pRule = m_pDoc->GetOutlineNumRule(); else { pRule = rListTbl[ n ]; diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 106df4478dad..bc14531c74f7 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -95,7 +95,7 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule ) if ( !bOutlineRuleAdded ) { // still need to paste the OutlineRule - SwNumRule* pR = (SwNumRule*)m_pDoc->GetOutlineNumRule(); + SwNumRule* pR = m_pDoc->GetOutlineNumRule(); m_pUsedNumTbl->push_back( pR ); } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ebf8095e6e37..95f0f30f7025 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4046,7 +4046,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType) if(m_pAktItemSet && !pFmt) { OUString sPrefix(OUStringBuffer("WW8Dropcap").append(m_nDropCap++).makeStringAndClear()); - pNewSwCharFmt = m_rDoc.MakeCharFmt(sPrefix, (SwCharFmt*)m_rDoc.GetDfltCharFmt()); + pNewSwCharFmt = m_rDoc.MakeCharFmt(sPrefix, m_rDoc.GetDfltCharFmt()); m_pAktItemSet->ClearItem(RES_CHRATR_ESCAPEMENT); pNewSwCharFmt->SetFmtAttr( *m_pAktItemSet ); } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index b269eccb5edb..63c84f0046a0 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1053,7 +1053,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, + "z" + OUString::number( nLevel ) ); // const Wegcasten - pFmt = rDoc.MakeCharFmt(aName, (SwCharFmt*)rDoc.GetDfltCharFmt()); + pFmt = rDoc.MakeCharFmt(aName, rDoc.GetDfltCharFmt()); bNewCharFmtCreated = true; // Attribute reinsetzen pFmt->SetFmtAttr( *pThisLevelItemSet ); @@ -1080,7 +1080,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, const OUString aName( (!sPrefix.isEmpty() ? sPrefix : rNumRule.GetName()) + "z" + OUString::number( nLevel ) ); - pFmt = rDoc.MakeCharFmt(aName, (SwCharFmt*)rDoc.GetDfltCharFmt()); + pFmt = rDoc.MakeCharFmt(aName, rDoc.GetDfltCharFmt()); bNewCharFmtCreated = true; rCharFmt[ nLevel ] = pFmt; aNumFmt.SetCharFmt( pFmt ); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 0d11bd9ff2b6..1192fd434343 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2654,7 +2654,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam) //Take this as the base name SwStyleNameMapper::FillUIName(RES_POOLCHR_RUBYTEXT,aNm); aNm+=OUString::number(m_aRubyCharFmts.size()+1); - pFmt = m_rDoc.MakeCharFmt(aNm,(SwCharFmt*)m_rDoc.GetDfltCharFmt()); + pFmt = m_rDoc.MakeCharFmt(aNm, m_rDoc.GetDfltCharFmt()); SvxFontHeightItem aHeightItem(nFontSize*10, 100, RES_CHRATR_FONTSIZE); SvxFontItem aFontItem(FAMILY_DONTKNOW,sFontName, OUString(), PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index df4cf18118c7..663395e6c63d 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5394,15 +5394,15 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) case COMMAND_PREPARERECONVERSION: if( rSh.HasSelection() ) { - SwPaM *pCrsr = (SwPaM*)rSh.GetCrsr(); + SwPaM *pCrsr = rSh.GetCrsr(); if( rSh.IsMultiSelection() ) { - if( pCrsr && !pCrsr->HasMark() && - pCrsr->GetPoint() == pCrsr->GetMark() ) + if (pCrsr && !pCrsr->HasMark() && + pCrsr->GetPoint() == pCrsr->GetMark()) { - rSh.GoPrevCrsr(); - pCrsr = (SwPaM*)rSh.GetCrsr(); + rSh.GoPrevCrsr(); + pCrsr = rSh.GetCrsr(); } // Cancel all selections other than the last selected one. diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 59c5230248cd..c86e8d19a228 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2189,7 +2189,7 @@ Reference< XNameAccess > SwXTextDocument::getLinks() throw( RuntimeException, s if(!pxLinkTargetSupplier) { pxLinkTargetSupplier = new Reference< XNameAccess > ; - (*pxLinkTargetSupplier) = new SwXLinkTargetSupplier(*(SwXTextDocument*)this); + (*pxLinkTargetSupplier) = new SwXLinkTargetSupplier(*this); } return (*pxLinkTargetSupplier); } |