diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-22 16:06:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-10-23 12:36:16 +0200 |
| commit | 6a097a7d964a22fbff8bfa9552c77b11447691bb (patch) | |
| tree | 5c86335f81902bae4f6f765893bc847d89ee24d0 /sc | |
| parent | 229eed079c675e70118370044ae91a69c60d044e (diff) | |
loplugin: cstylecast
Change-Id: I8c7cd4c2cdc134556c2c664a22e2048b51a3b98e
Diffstat (limited to 'sc')
54 files changed, 363 insertions, 363 deletions
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index f078fa2a341b..3f5d5c9b2c11 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -148,7 +148,7 @@ bool ScChangeAction::IsVisible() const if ( IsRejected() || GetType() == SC_CAT_DELETE_TABS || IsDeletedIn() ) return false; if ( GetType() == SC_CAT_CONTENT ) - return ((ScChangeActionContent*)this)->IsTopContent(); + return static_cast<const ScChangeActionContent*>(this)->IsTopContent(); return true; } @@ -159,7 +159,7 @@ bool ScChangeAction::IsTouchable() const return false; // content may reject and be touchable if on top if ( GetType() == SC_CAT_CONTENT ) - return ((ScChangeActionContent*)this)->IsTopContent(); + return static_cast<const ScChangeActionContent*>(this)->IsTopContent(); if ( IsRejecting() ) return false; return true; @@ -176,13 +176,13 @@ bool ScChangeAction::IsClickable() const { ScChangeActionContentCellType eCCT = ScChangeActionContent::GetContentCellType( - ((ScChangeActionContent*)this)->GetNewCell() ); + static_cast<const ScChangeActionContent*>(this)->GetNewCell() ); if ( eCCT == SC_CACCT_MATREF ) return false; if ( eCCT == SC_CACCT_MATORG ) { // no Accept-Select if one of the references is in a deleted col/row const ScChangeActionLinkEntry* pL = - ((ScChangeActionContent*)this)->GetFirstDependentEntry(); + static_cast<const ScChangeActionContent*>(this)->GetFirstDependentEntry(); while ( pL ) { ScChangeAction* p = (ScChangeAction*) pL->GetAction(); @@ -203,10 +203,10 @@ bool ScChangeAction::IsRejectable() const return false; if ( GetType() == SC_CAT_CONTENT ) { - if ( ((ScChangeActionContent*)this)->IsOldMatrixReference() ) + if ( static_cast<const ScChangeActionContent*>(this)->IsOldMatrixReference() ) return false; ScChangeActionContent* pNextContent = - ((ScChangeActionContent*)this)->GetNextContent(); + static_cast<const ScChangeActionContent*>(this)->GetNextContent(); if ( pNextContent == NULL ) return true; // *this is TopContent return pNextContent->IsRejected(); // *this is next rejectable @@ -224,7 +224,7 @@ bool ScChangeAction::IsInternalRejectable() const if ( GetType() == SC_CAT_CONTENT ) { ScChangeActionContent* pNextContent = - ((ScChangeActionContent*)this)->GetNextContent(); + static_cast<const ScChangeActionContent*>(this)->GetNextContent(); if ( pNextContent == NULL ) return true; // *this is TopContent return pNextContent->IsRejected(); // *this is next rejectable @@ -244,10 +244,10 @@ bool ScChangeAction::IsDialogParent() const { if ( !IsDialogRoot() ) return false; - if ( ((ScChangeActionContent*)this)->IsMatrixOrigin() && HasDependent() ) + if ( static_cast<const ScChangeActionContent*>(this)->IsMatrixOrigin() && HasDependent() ) return true; ScChangeActionContent* pPrevContent = - ((ScChangeActionContent*)this)->GetPrevContent(); + static_cast<const ScChangeActionContent*>(this)->GetPrevContent(); return pPrevContent && pPrevContent->IsVirgin(); } if ( HasDependent() ) @@ -277,7 +277,7 @@ bool ScChangeAction::IsMasterDelete() const { if ( !IsDeleteType() ) return false; - ScChangeActionDel* pDel = (ScChangeActionDel*) this; + const ScChangeActionDel* pDel = static_cast<const ScChangeActionDel*>(this); return pDel->IsMultiDelete() && (pDel->IsTopDelete() || pDel->IsRejectable()); } @@ -384,7 +384,7 @@ void ScChangeAction::SetDeletedIn( ScChangeAction* p ) ScChangeActionLinkEntry* pLink1 = AddDeletedIn( p ); ScChangeActionLinkEntry* pLink2; if ( GetType() == SC_CAT_CONTENT ) - pLink2 = p->AddDeleted( ((ScChangeActionContent*)this)->GetTopContent() ); + pLink2 = p->AddDeleted( static_cast<ScChangeActionContent*>(this)->GetTopContent() ); else pLink2 = p->AddDeleted( this ); pLink1->SetLink( pLink2 ); @@ -599,7 +599,7 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack, if ( p && p->GetType() == SC_CAT_CONTENT ) { ScChangeActionCellListEntry* pE = new ScChangeActionCellListEntry( - (ScChangeActionContent*) p, pListContents ); + static_cast<ScChangeActionContent*>(p), pListContents ); pListContents = pE; } } @@ -853,7 +853,7 @@ bool ScChangeActionDel::IsTopDelete() const const ScChangeAction* p = GetNext(); if ( !p || p->GetType() != GetType() ) return true; - return ((ScChangeActionDel*)p)->IsBaseDelete(); + return static_cast<const ScChangeActionDel*>(p)->IsBaseDelete(); } bool ScChangeActionDel::IsMultiDelete() const @@ -863,7 +863,7 @@ bool ScChangeActionDel::IsMultiDelete() const const ScChangeAction* p = GetNext(); if ( !p || p->GetType() != GetType() ) return false; - const ScChangeActionDel* pDel = (const ScChangeActionDel*) p; + const ScChangeActionDel* pDel = static_cast<const ScChangeActionDel*>(p); if ( (pDel->GetDx() > GetDx() || pDel->GetDy() > GetDy()) && pDel->GetBigRange() == aBigRange ) return true; @@ -876,7 +876,7 @@ bool ScChangeActionDel::IsTabDeleteCol() const return false; const ScChangeAction* p = this; while ( p && p->GetType() == SC_CAT_DELETE_COLS && - !((const ScChangeActionDel*)p)->IsTopDelete() ) + !static_cast<const ScChangeActionDel*>(p)->IsTopDelete() ) p = p->GetNext(); return p && p->GetType() == SC_CAT_DELETE_TABS; } @@ -1270,7 +1270,7 @@ bool ScChangeActionMove::Reject( ScDocument* pDoc ) ScChangeAction* p = pLinkDependent->GetAction(); if ( p && p->GetType() == SC_CAT_CONTENT ) { - ScChangeActionContent* pContent = (ScChangeActionContent*) p; + ScChangeActionContent* pContent = static_cast<ScChangeActionContent*>(p); if ( !pContent->IsDeletedIn() && pContent->GetBigRange().aStart.IsValid( pDoc ) ) pContent->PutNewValueToDoc( pDoc, 0, 0 ); @@ -2367,7 +2367,7 @@ void ScChangeTrack::MasterLinks( ScChangeAction* pAppend ) { SCSIZE nSlot = ComputeContentSlot( pAppend->GetBigRange().aStart.Row() ); - ((ScChangeActionContent*)pAppend)->InsertInSlot( + static_cast<ScChangeActionContent*>(pAppend)->InsertInSlot( &ppContentSlots[nSlot] ); } return ; @@ -2464,7 +2464,7 @@ void ScChangeTrack::Append( ScChangeAction* pAppend, sal_uLong nAction ) NotifyModified( SC_CTM_APPEND, nAction, nAction ); if ( pAppend->GetType() == SC_CAT_CONTENT ) { - ScChangeActionContent* pContent = (ScChangeActionContent*) pAppend; + ScChangeActionContent* pContent = static_cast<ScChangeActionContent*>(pAppend); if ( ( pContent = pContent->GetPrevContent() ) != NULL ) { sal_uLong nMod = pContent->GetActionNumber(); @@ -2903,7 +2903,7 @@ void ScChangeTrack::DeleteGeneratedDelContent( ScChangeActionContent* pContent ) sal_uLong nAct = pContent->GetActionNumber(); aGeneratedMap.erase( nAct ); if ( pFirstGeneratedDelContent == pContent ) - pFirstGeneratedDelContent = (ScChangeActionContent*) pContent->pNext; + pFirstGeneratedDelContent = static_cast<ScChangeActionContent*>(pContent->pNext); if ( pContent->pNext ) pContent->pNext->pPrev = pContent->pPrev; if ( pContent->pPrev ) @@ -2956,15 +2956,15 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) if ( eActType == SC_CAT_CONTENT ) { - if ( !(((ScChangeActionContent*)pAct)->GetNextContent() || - ((ScChangeActionContent*)pAct)->GetPrevContent()) ) + if ( !(static_cast<ScChangeActionContent*>(pAct)->GetNextContent() || + static_cast<ScChangeActionContent*>(pAct)->GetPrevContent()) ) { // Concatenate Contents at same position ScChangeActionContent* pContent = SearchContentAt( pAct->GetBigRange().aStart, pAct ); if ( pContent ) { - pContent->SetNextContent( (ScChangeActionContent*) pAct ); - ((ScChangeActionContent*)pAct)->SetPrevContent( pContent ); + pContent->SetNextContent( static_cast<ScChangeActionContent*>(pAct) ); + static_cast<ScChangeActionContent*>(pAct)->SetPrevContent( pContent ); } } const ScCellValue& rCell = static_cast<ScChangeActionContent*>(pAct)->GetNewCell(); @@ -3006,7 +3006,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) { for ( ScChangeActionLinkEntry* pL = pLinkInsertCol; pL; pL = pL->GetNext() ) { - ScChangeActionIns* pTest = (ScChangeActionIns*) pL->GetAction(); + ScChangeActionIns* pTest = static_cast<ScChangeActionIns*>(pL->GetAction()); if ( !pTest->IsRejected() && pTest->GetBigRange().Intersects( rRange ) ) { @@ -3020,7 +3020,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) { for ( ScChangeActionLinkEntry* pL = pLinkInsertRow; pL; pL = pL->GetNext() ) { - ScChangeActionIns* pTest = (ScChangeActionIns*) pL->GetAction(); + ScChangeActionIns* pTest = static_cast<ScChangeActionIns*>(pL->GetAction()); if ( !pTest->IsRejected() && pTest->GetBigRange().Intersects( rRange ) ) { @@ -3034,7 +3034,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) { for ( ScChangeActionLinkEntry* pL = pLinkInsertTab; pL; pL = pL->GetNext() ) { - ScChangeActionIns* pTest = (ScChangeActionIns*) pL->GetAction(); + ScChangeActionIns* pTest = static_cast<ScChangeActionIns*>(pL->GetAction()); if ( !pTest->IsRejected() && pTest->GetBigRange().Intersects( rRange ) ) { @@ -3051,7 +3051,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) const ScBigAddress& rPos = rRange.aStart; for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() ) { - ScChangeActionMove* pTest = (ScChangeActionMove*) pL->GetAction(); + ScChangeActionMove* pTest = static_cast<ScChangeActionMove*>(pL->GetAction()); if ( !pTest->IsRejected() && pTest->GetFromRange().In( rPos ) ) { @@ -3061,10 +3061,10 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) } else if ( eActType == SC_CAT_MOVE ) { // Move FromRange is depending on ToRange - const ScBigRange& rFromRange = ((ScChangeActionMove*)pAct)->GetFromRange(); + const ScBigRange& rFromRange = static_cast<ScChangeActionMove*>(pAct)->GetFromRange(); for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() ) { - ScChangeActionMove* pTest = (ScChangeActionMove*) pL->GetAction(); + ScChangeActionMove* pTest = static_cast<ScChangeActionMove*>(pL->GetAction()); if ( !pTest->IsRejected() && pTest->GetBigRange().Intersects( rFromRange ) ) { @@ -3077,7 +3077,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) // ToRange for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() ) { - ScChangeActionMove* pTest = (ScChangeActionMove*) pL->GetAction(); + ScChangeActionMove* pTest = static_cast<ScChangeActionMove*>(pL->GetAction()); if ( !pTest->IsRejected() && (pTest->GetFromRange().Intersects( rRange ) || pTest->GetBigRange().Intersects( rRange )) ) @@ -3117,7 +3117,7 @@ void ScChangeTrack::Remove( ScChangeAction* pRemove ) NotifyModified( SC_CTM_REMOVE, nAct, nAct ); if ( pRemove->GetType() == SC_CAT_CONTENT ) { - ScChangeActionContent* pContent = (ScChangeActionContent*) pRemove; + ScChangeActionContent* pContent = static_cast<ScChangeActionContent*>(pRemove); if ( ( pContent = pContent->GetPrevContent() ) != NULL ) { sal_uLong nMod = pContent->GetActionNumber(); @@ -3131,7 +3131,7 @@ void ScChangeTrack::Remove( ScChangeAction* pRemove ) if ( IsInPasteCut() && pRemove->GetType() == SC_CAT_CONTENT ) { //! Content is reused - ScChangeActionContent* pContent = (ScChangeActionContent*) pRemove; + ScChangeActionContent* pContent = static_cast<ScChangeActionContent*>(pRemove); pContent->RemoveAllLinks(); pContent->ClearTrack(); pContent->pNext = pContent->pPrev = NULL; @@ -3167,10 +3167,10 @@ void ScChangeTrack::Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMe if ( pAct->IsDeleteType() ) { - if (j == nEndAction || (pAct != pLast && ((ScChangeActionDel*)pAct)->IsTopDelete())) + if (j == nEndAction || (pAct != pLast && static_cast<ScChangeActionDel*>(pAct)->IsTopDelete())) { SetInDeleteTop( true ); - SetInDeleteRange( ((ScChangeActionDel*)pAct)->GetOverAllRange().MakeRange() ); + SetInDeleteRange( static_cast<ScChangeActionDel*>(pAct)->GetOverAllRange().MakeRange() ); } } UpdateReference( pAct, true ); @@ -3184,7 +3184,7 @@ void ScChangeTrack::Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMe if ( j == nStartAction && pAct->GetType() == SC_CAT_MOVE ) { - ScChangeActionMove* pMove = (ScChangeActionMove*) pAct; + ScChangeActionMove* pMove = static_cast<ScChangeActionMove*>(pAct); sal_uLong nStart = pMove->GetStartLastCut(); sal_uLong nEnd = pMove->GetEndLastCut(); if ( nStart && nStart <= nEnd ) @@ -3257,10 +3257,10 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared ) { if ( pAct->IsDeleteType() ) { - if ( ((ScChangeActionDel*)pAct)->IsTopDelete() ) + if ( static_cast<ScChangeActionDel*>(pAct)->IsTopDelete() ) { SetInDeleteTop( true ); - SetInDeleteRange( ((ScChangeActionDel*)pAct)-> + SetInDeleteRange( static_cast<ScChangeActionDel*>(pAct)-> GetOverAllRange().MakeRange() ); } } @@ -3282,10 +3282,10 @@ void ScChangeTrack::MergeOwn( ScChangeAction* pAct, sal_uLong nFirstMerge, bool SetMergeState( SC_CTMS_OWN ); if ( pAct->IsDeleteType() ) { - if ( ((ScChangeActionDel*)pAct)->IsTopDelete() ) + if ( static_cast<ScChangeActionDel*>(pAct)->IsTopDelete() ) { SetInDeleteTop( true ); - SetInDeleteRange( ((ScChangeActionDel*)pAct)-> + SetInDeleteRange( static_cast<ScChangeActionDel*>(pAct)-> GetOverAllRange().MakeRange() ); } } @@ -3386,7 +3386,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, break; case SC_CAT_MOVE : eMode = URM_MOVE; - ((ScChangeActionMove*)pAct)->GetDelta( nDx, nDy, nDz ); + static_cast<ScChangeActionMove*>(pAct)->GetDelta( nDx, nDy, nDz ); break; default: OSL_FAIL( "ScChangeTrack::UpdateReference: unknown Type" ); @@ -3400,7 +3400,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, if ( bDel ) { //! For this mechanism we assume: //! There's only a whole, simple deleted row/column - ScChangeActionDel* pActDel = (ScChangeActionDel*) pAct; + ScChangeActionDel* pActDel = static_cast<ScChangeActionDel*>(pAct); if ( !bUndo ) { // Delete ScChangeActionType eInsType = SC_CAT_NONE; // for Insert Undo "Deletes" @@ -3469,7 +3469,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, p->SetDeletedIn( pActDel ); // Add GeneratedDelContent to the to-be-deleted list if ( bGeneratedDelContents ) - pActDel->AddContent( (ScChangeActionContent*) p ); + pActDel->AddContent( static_cast<ScChangeActionContent*>(p) ); } bUpdate = false; } @@ -3493,13 +3493,13 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, if ( aDelRange.In( p->GetBigRange().aStart ) ) { pActDel->SetCutOffInsert( - (ScChangeActionIns*) p, 1 ); + static_cast<ScChangeActionIns*>(p), 1 ); p->GetBigRange().aStart.IncCol( 1 ); } else if ( aDelRange.In( p->GetBigRange().aEnd ) ) { pActDel->SetCutOffInsert( - (ScChangeActionIns*) p, -1 ); + static_cast<ScChangeActionIns*>(p), -1 ); p->GetBigRange().aEnd.IncCol( -1 ); } } @@ -3510,13 +3510,13 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, if ( aDelRange.In( p->GetBigRange().aStart ) ) { pActDel->SetCutOffInsert( - (ScChangeActionIns*) p, 1 ); + static_cast<ScChangeActionIns*>(p), 1 ); p->GetBigRange().aStart.IncRow( 1 ); } else if ( aDelRange.In( p->GetBigRange().aEnd ) ) { pActDel->SetCutOffInsert( - (ScChangeActionIns*) p, -1 ); + static_cast<ScChangeActionIns*>(p), -1 ); p->GetBigRange().aEnd.IncRow( -1 ); } } @@ -3527,20 +3527,20 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, if ( aDelRange.In( p->GetBigRange().aStart ) ) { pActDel->SetCutOffInsert( - (ScChangeActionIns*) p, 1 ); + static_cast<ScChangeActionIns*>(p), 1 ); p->GetBigRange().aStart.IncTab( 1 ); } else if ( aDelRange.In( p->GetBigRange().aEnd ) ) { pActDel->SetCutOffInsert( - (ScChangeActionIns*) p, -1 ); + static_cast<ScChangeActionIns*>(p), -1 ); p->GetBigRange().aEnd.IncTab( -1 ); } } break; case SC_CAT_MOVE : { - ScChangeActionMove* pMove = (ScChangeActionMove*) p; + ScChangeActionMove* pMove = static_cast<ScChangeActionMove*>(p); short nFrom = 0; short nTo = 0; if ( aDelRange.In( pMove->GetBigRange().aStart ) ) @@ -3654,7 +3654,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, if ( p->IsDeletedIn( pActDel ) ) { if ( p->GetType() != SC_CAT_CONTENT || - ((ScChangeActionContent*)p)->IsTopContent() ) + static_cast<ScChangeActionContent*>(p)->IsTopContent() ) { // First really remove the TopContent p->RemoveDeletedIn( pActDel ); // Do NOT delete GeneratedDelContent from the list, we might need @@ -3686,7 +3686,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, } else if ( eActType == SC_CAT_MOVE ) { - ScChangeActionMove* pActMove = (ScChangeActionMove*) pAct; + ScChangeActionMove* pActMove = static_cast<ScChangeActionMove*>(pAct); bool bLastCutMove = ( pActMove == pLastCutMove ); const ScBigRange& rTo = pActMove->GetBigRange(); const ScBigRange& rFrom = pActMove->GetFromRange(); @@ -3706,7 +3706,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, p->SetDeletedIn( pActMove ); // Add GeneratedDelContent to the to-be-deleted list if ( bGeneratedDelContents ) - pActMove->AddContent( (ScChangeActionContent*) p ); + pActMove->AddContent( static_cast<ScChangeActionContent*>(p) ); } } else if ( bLastCutMove && @@ -3715,7 +3715,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, { // Paste Cut: insert new Content inserted after stays // Split up the ContentChain ScChangeActionContent *pHere, *pTmp; - pHere = (ScChangeActionContent*) p; + pHere = static_cast<ScChangeActionContent*>(p); while ( (pTmp = pHere->GetPrevContent()) != NULL && pTmp->GetActionNumber() > nEndLastCut ) pHere = pTmp; @@ -3747,7 +3747,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, // Move Content into Target if not deleted else to delete (FIXME: What?) if ( p->IsDeletedIn( pActMove ) ) { - if ( ((ScChangeActionContent*)p)->IsTopContent() ) + if ( static_cast<ScChangeActionContent*>(p)->IsTopContent() ) { // First really remove the TopContent p->RemoveDeletedIn( pActMove ); // Do NOT delete GeneratedDelContent from the list, we might need @@ -3758,7 +3758,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, else if ( ( GetMergeState() != SC_CTMS_PREPARE && GetMergeState() != SC_CTMS_OWN ) || p->GetActionNumber() <= pAct->GetActionNumber() ) p->UpdateReference( this, eMode, rTo, nDx, nDy, nDz ); if ( bActRejected && - ((ScChangeActionContent*)p)->IsTopContent() && + static_cast<ScChangeActionContent*>(p)->IsTopContent() && rFrom.In( p->GetBigRange() ) ) { // Recover dependency to write Content ScChangeActionLinkEntry* pLink = @@ -3929,7 +3929,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, { if ( p->GetType() == SC_CAT_CONTENT ) { - if ( ((ScChangeActionContent*)p)->IsTopContent() ) + if ( static_cast<ScChangeActionContent*>(p)->IsTopContent() ) rMap.insert( ::std::make_pair( p->GetActionNumber(), p ) ); } else @@ -3943,7 +3943,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, { if ( bIsDelete ) { // Contents of deleted Ranges are only of interest on Delete - ScChangeActionDel* pDel = (ScChangeActionDel*) pCur; + ScChangeActionDel* pDel = const_cast<ScChangeActionDel*>(static_cast<const ScChangeActionDel*>(pCur)); if ( !bAllFlat && bIsMasterDelete && pCur == pAct ) { // Corresponding Deletes to this Delete to the same level, @@ -3951,7 +3951,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, ScChangeActionType eType = pDel->GetType(); ScChangeAction* p = pDel; while ( (p = p->GetPrev()) != NULL && p->GetType() == eType && - !((ScChangeActionDel*)p)->IsTopDelete() ) + !static_cast<ScChangeActionDel*>(p)->IsTopDelete() ) rMap.insert( ::std::make_pair( p->GetActionNumber(), p ) ); // delete this in the map too rMap.insert( ::std::make_pair( pAct->GetActionNumber(), pAct ) ); @@ -3977,7 +3977,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, { if ( p->IsDeleteType() ) { // Further TopDeletes to same level: it's not rejectable - if ( ((ScChangeActionDel*)p)->IsTopDelete() ) + if ( static_cast<ScChangeActionDel*>(p)->IsTopDelete() ) rMap.insert( ::std::make_pair( p->GetActionNumber(), p ) ); } else @@ -4024,7 +4024,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, { if ( p->GetType() == SC_CAT_CONTENT ) { - if ( ((ScChangeActionContent*)p)->IsTopContent() ) + if ( static_cast<ScChangeActionContent*>(p)->IsTopContent() ) rMap.insert( ::std::make_pair( p->GetActionNumber(), p ) ); } else @@ -4036,14 +4036,14 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, } else if ( pCur->GetType() == SC_CAT_CONTENT ) { // All changes at same position - ScChangeActionContent* pContent = (ScChangeActionContent*) pCur; + ScChangeActionContent* pContent = const_cast<ScChangeActionContent*>(static_cast<const ScChangeActionContent*>(pCur)); // All preceding ones while ( ( pContent = pContent->GetPrevContent() ) != NULL ) { if ( !pContent->IsRejected() ) rMap.insert( ::std::make_pair( pContent->GetActionNumber(), pContent ) ); } - pContent = (ScChangeActionContent*) pCur; + pContent = const_cast<ScChangeActionContent*>(static_cast<const ScChangeActionContent*>(pCur)); // All succeeding ones while ( ( pContent = pContent->GetNextContent() ) != NULL ) { @@ -4075,7 +4075,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, if ( bAllFlat ) { ScChangeAction* p = GetAction( - ((ScChangeActionReject*)pCur)->GetRejectAction() ); + static_cast<const ScChangeActionReject*>(pCur)->GetRejectAction() ); if (p != pAct && rMap.find( p->GetActionNumber() ) == rMap.end()) cStack.push( p ); } @@ -4088,7 +4088,7 @@ bool ScChangeTrack::SelectContent( ScChangeAction* pAct, bool bOldest ) if ( pAct->GetType() != SC_CAT_CONTENT ) return false; - ScChangeActionContent* pContent = (ScChangeActionContent*) pAct; + ScChangeActionContent* pContent = static_cast<ScChangeActionContent*>(pAct); if ( bOldest ) { pContent = pContent->GetTopContent(); @@ -4133,7 +4133,7 @@ bool ScChangeTrack::SelectContent( ScChangeAction* pAct, bool bOldest ) if ( p->GetType() == SC_CAT_CONTENT ) { // we don't need no recursion here, do we? - bOk &= ((ScChangeActionContent*)p)->Select( pDoc, this, + bOk &= static_cast<ScChangeActionContent*>(p)->Select( pDoc, this, bOldest, &aRejectActions ); } else @@ -4277,7 +4277,7 @@ bool ScChangeTrack::Reject( } else bTabDel = bTabDelOk = false; - ScChangeActionDel* pDel = (ScChangeActionDel*) pAct; + ScChangeActionDel* pDel = static_cast<ScChangeActionDel*>(pAct); if ( bOk ) { aDelRange = pDel->GetOverAllRange(); @@ -4307,7 +4307,7 @@ bool ScChangeTrack::Reject( bool bLoop = true; do { - pDel = (ScChangeActionDel*) p; + pDel = static_cast<ScChangeActionDel*>(p); bOk = pDel->Reject( pDoc ); if ( bOk ) { @@ -4338,7 +4338,7 @@ bool ScChangeTrack::Reject( else p = p->GetPrev(); } while ( bOk && bLoop && p && p->GetType() == eActType && - !((ScChangeActionDel*)p)->IsTopDelete() ); + !static_cast<ScChangeActionDel*>(p)->IsTopDelete() ); } bRejected = bOk; if ( bOneOk || (bTabDel && bTabDelOk) ) @@ -4367,7 +4367,7 @@ bool ScChangeTrack::Reject( { ScChangeActionMove* pReject = new ScChangeActionMove( pAct->GetBigRange().MakeRange(), - ((ScChangeActionMove*)pAct)->GetFromRange().MakeRange(), this ); + static_cast<ScChangeActionMove*>(pAct)->GetFromRange().MakeRange(), this ); pReject->SetRejectAction( pAct->GetActionNumber() ); pReject->SetState( SC_CAS_ACCEPTED ); Append( pReject ); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 6e738d577c46..d49aaf6bb0b4 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2853,7 +2853,7 @@ bool ScCompiler::IsMacro( const OUString& rName ) if (FormulaGrammar::isODFF( GetGrammar()) && aName.startsWithIgnoreAsciiCase("USER.")) aName = aName.copy(5); - SbxMethod* pMeth = (SbxMethod*) pObj->Find( aName, SbxCLASS_METHOD ); + SbxMethod* pMeth = static_cast<SbxMethod*>(pObj->Find( aName, SbxCLASS_METHOD )); if( !pMeth ) { return false; diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 8047122fc25f..7c66d60adf54 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -85,7 +85,7 @@ bool ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScTpDefaultsItem& rPItem = (const ScTpDefaultsItem&)rItem; + const ScTpDefaultsItem& rPItem = static_cast<const ScTpDefaultsItem&>(rItem); return ( theOptions == rPItem.theOptions ); } diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 835220f78013..7a8880b840d3 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -129,7 +129,7 @@ static bool lcl_HasThickLine( SdrObject& rObj ) { // thin lines get width 0 -> everything greater 0 is a thick line - return ( ((const XLineWidthItem&)rObj.GetMergedItem(XATTR_LINEWIDTH)).GetValue() > 0 ); + return static_cast<const XLineWidthItem&>(rObj.GetMergedItem(XATTR_LINEWIDTH)).GetValue() > 0; } ScDetectiveData::ScDetectiveData( SdrModel* pModel ) : @@ -229,7 +229,7 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) : // do use the default cell style, so the user has a chance to // modify the font for the annotations - ((const ScPatternAttr&)rDoc.GetPool()->GetDefaultItem(ATTR_PATTERN)). + static_cast<const ScPatternAttr&>(rDoc.GetPool()->GetDefaultItem(ATTR_PATTERN)). FillEditItemSet( &aCaptionSet ); // support the best position for the tail connector now that @@ -416,9 +416,9 @@ bool ScDetectiveFunc::HasArrow( const ScAddress& rStart, const SfxItemSet& rSet = pObject->GetMergedItemSet(); bool bObjStartAlien = - lcl_IsOtherTab( ((const XLineStartItem&)rSet.Get(XATTR_LINESTART)).GetLineStartValue() ); + lcl_IsOtherTab( static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue() ); bool bObjEndAlien = - lcl_IsOtherTab( ((const XLineEndItem&)rSet.Get(XATTR_LINEEND)).GetLineEndValue() ); + lcl_IsOtherTab( static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue() ); bool bStartHit = bStartAlien ? bObjStartAlien : ( !bObjStartAlien && aStartRect.IsInside(pObject->GetPoint(0)) ); @@ -442,9 +442,9 @@ bool ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) const SfxItemSet& rSet = pObject->GetMergedItemSet(); bool bObjStartAlien = - lcl_IsOtherTab( ((const XLineStartItem&)rSet.Get(XATTR_LINESTART)).GetLineStartValue() ); + lcl_IsOtherTab( static_cast<const XLineStartItem&>(rSet.Get(XATTR_LINESTART)).GetLineStartValue() ); bool bObjEndAlien = - lcl_IsOtherTab( ((const XLineEndItem&)rSet.Get(XATTR_LINEEND)).GetLineEndValue() ); + lcl_IsOtherTab( static_cast<const XLineEndItem&>(rSet.Get(XATTR_LINEEND)).GetLineEndValue() ); return !bObjStartAlien && !bObjEndAlien; } @@ -744,7 +744,7 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR if ( pObject->GetLayer() == SC_LAYER_INTERN && pObject->Type() == TYPE(SdrRectObj) ) { - aObjRect = ((SdrRectObj*)pObject)->GetLogicRect(); + aObjRect = static_cast<SdrRectObj*>(pObject)->GetLogicRect(); aObjRect.Justify(); if ( RectIsPoints( aObjRect, aStartCorner, aEndCorner ) ) ppObj[nDelCount++] = pObject; @@ -1309,7 +1309,7 @@ bool ScDetectiveFunc::MarkInvalid(bool& rOverflow) const ScPatternAttr* pPattern = aAttrIter.GetNext( nCol, nRow1, nRow2 ); while ( pPattern && nInsCount < SC_DET_MAXCIRCLE ) { - sal_uLong nIndex = ((const SfxUInt32Item&)pPattern->GetItem(ATTR_VALIDDATA)).GetValue(); + sal_uLong nIndex = static_cast<const SfxUInt32Item&>(pPattern->GetItem(ATTR_VALIDDATA)).GetValue(); if (nIndex) { const ScValidationData* pData = pDoc->GetValidationEntry( nIndex ); @@ -1596,7 +1596,7 @@ ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject, FindFrameForObject( pObject, rSource ); // modifies rSource } - ColorData nObjColor = ((const XLineColorItem&)pObject->GetMergedItem(XATTR_LINECOLOR)).GetColorValue().GetColor(); + ColorData nObjColor = static_cast<const XLineColorItem&>(pObject->GetMergedItem(XATTR_LINECOLOR)).GetColorValue().GetColor(); if ( nObjColor == GetErrorColor() && nObjColor != GetArrowColor() ) rRedLine = true; } diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index c3676a569c0b..d0708656d921 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -125,7 +125,7 @@ bool ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScTpCalcItem& rPItem = (const ScTpCalcItem&)rItem; + const ScTpCalcItem& rPItem = static_cast<const ScTpCalcItem&>(rItem); return ( theOptions == rPItem.theOptions ); } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 59d39c8c6ce5..7cca6e8aa009 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -285,7 +285,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bForceToT bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; - const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); + const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(&pPattern->GetItem(ATTR_MERGE)); long nCellX = (long) ( pDoc->GetColWidth(nCol,nTab) * nPPTX ); if ( pMerge->GetColMerge() > 1 ) { @@ -300,11 +300,11 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bForceToT nCellY += (long) pDoc->GetScaledRowHeight( nRow+1, nRow+nCountY-1, nTab, nPPTY); } - const SvxMarginItem* pMargin = (const SvxMarginItem*)&pPattern->GetItem(ATTR_MARGIN); + const SvxMarginItem* pMargin = static_cast<const SvxMarginItem*>(&pPattern->GetItem(ATTR_MARGIN)); sal_uInt16 nIndent = 0; - if ( ((const SvxHorJustifyItem&)pPattern->GetItem(ATTR_HOR_JUSTIFY)).GetValue() == + if ( static_cast<const SvxHorJustifyItem&>(pPattern->GetItem(ATTR_HOR_JUSTIFY)).GetValue() == SVX_HOR_JUSTIFY_LEFT ) - nIndent = ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue(); + nIndent = static_cast<const SfxUInt16Item&>(pPattern->GetItem(ATTR_INDENT)).GetValue(); long nPixDifX = (long) ( ( pMargin->GetLeftMargin() + nIndent ) * nPPTX ); aStartPos.X() += nPixDifX * nLayoutSign; nCellX -= nPixDifX + (long) ( pMargin->GetRightMargin() * nPPTX ); // wegen Umbruch etc. @@ -313,12 +313,12 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, bool bForceToT long nPixDifY; long nTopMargin = (long) ( pMargin->GetTopMargin() * nPPTY ); - SvxCellVerJustify eJust = (SvxCellVerJustify) ((const SvxVerJustifyItem&)pPattern-> + SvxCellVerJustify eJust = (SvxCellVerJustify) static_cast<const SvxVerJustifyItem&>(pPattern-> GetItem(ATTR_VER_JUSTIFY)).GetValue(); // asian vertical is always edited top-aligned - bool bAsianVertical = ((const SfxBoolItem&)pPattern->GetItem( ATTR_STACKED )).GetValue() && - ((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue(); + bool bAsianVertical = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_STACKED )).GetValue() && + static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue(); if ( eJust == SVX_VER_JUSTIFY_TOP || ( bForceToTop && ( SC_MOD()->GetInputOptions().GetTextWysiwyg() || bAsianVertical ) ) ) @@ -692,7 +692,7 @@ ScTabEditEngine::ScTabEditEngine( ScDocument* pDoc ) : ScEditEngineDefaulter( pDoc->GetEnginePool() ) { SetEditTextObjectPool( pDoc->GetEditPool() ); - Init((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)); + Init(static_cast<const ScPatternAttr&>(pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN))); } ScTabEditEngine::ScTabEditEngine( const ScPatternAttr& rPattern, @@ -873,7 +873,7 @@ void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_Int32, sal if ( pFld && pFld->ISA( SvxURLField ) && bExecuteURL ) { - const SvxURLField* pURLField = (const SvxURLField*) pFld; + const SvxURLField* pURLField = static_cast<const SvxURLField*>(pFld); ScGlobal::OpenURL( pURLField->GetURL(), pURLField->GetTargetFrame() ); } } diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index cea8940063ea..1abeaa349f87 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -176,7 +176,7 @@ bool ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScTpFormulaItem& rPItem = (const ScTpFormulaItem&)rItem; + const ScTpFormulaItem& rPItem = static_cast<const ScTpFormulaItem&>(rItem); return ( theOptions == rPItem.theOptions ); } diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 016a02674fb4..e099d3a2b184 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2254,8 +2254,8 @@ void ScInterpreter::ScCell() sal_Unicode c = 0; if (aCell.hasString()) { - const SvxHorJustifyItem* pJustAttr = (const SvxHorJustifyItem*) - pDok->GetAttr( aCellPos.Col(), aCellPos.Row(), aCellPos.Tab(), ATTR_HOR_JUSTIFY ); + const SvxHorJustifyItem* pJustAttr = static_cast<const SvxHorJustifyItem*>( + pDok->GetAttr( aCellPos.Col(), aCellPos.Row(), aCellPos.Tab(), ATTR_HOR_JUSTIFY )); switch( pJustAttr->GetValue() ) { case SVX_HOR_JUSTIFY_STANDARD: @@ -2270,8 +2270,8 @@ void ScInterpreter::ScCell() } else if( aInfoType.equalsAscii( "PROTECT" ) ) { // 1 = cell locked - const ScProtectionAttr* pProtAttr = (const ScProtectionAttr*) - pDok->GetAttr( aCellPos.Col(), aCellPos.Row(), aCellPos.Tab(), ATTR_PROTECTION ); + const ScProtectionAttr* pProtAttr = static_cast<const ScProtectionAttr*>( + pDok->GetAttr( aCellPos.Col(), aCellPos.Row(), aCellPos.Tab(), ATTR_PROTECTION )); PushInt( pProtAttr->GetProtection() ? 1 : 0 ); } @@ -8121,7 +8121,7 @@ void ScInterpreter::ScText() const ScPatternAttr* pPattern = pDok->GetPattern( aPos.Col(), aPos.Row(), aPos.Tab() ); if ( pPattern ) - eCellLang = ((const SvxLanguageItem&) + eCellLang = static_cast<const SvxLanguageItem&>( pPattern->GetItem( ATTR_LANGUAGE_FORMAT )).GetValue(); else eCellLang = ScGlobal::eLnge; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index e1eeb71ff601..e6bff2936d27 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3140,7 +3140,7 @@ void ScInterpreter::ScMacro() } bool bVolatileMacro = false; - SbMethod* pMethod = (SbMethod*)pVar; + SbMethod* pMethod = static_cast<SbMethod*>(pVar); SbModule* pModule = pMethod->GetModule(); bool bUseVBAObjects = pModule->IsVBACompat(); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 337ca6fc0dbc..70926e1947bb 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -96,7 +96,7 @@ bool ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScTpPrintItem& rPItem = (const ScTpPrintItem&)rItem; + const ScTpPrintItem& rPItem = static_cast<const ScTpPrintItem&>(rItem); return ( theOptions == rPItem.theOptions ); } diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index 9cf8977e089f..c0e4a291f143 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -55,7 +55,7 @@ static bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) SfxItemSet* pSet = pMed->GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SfxItemState::SET == pSet->GetItemState( SID_HIDDEN, true, &pItem ) && - ((const SfxBoolItem*)pItem)->GetValue() ) + static_cast<const SfxBoolItem*>(pItem)->GetValue() ) return true; } } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 6cea8ff1c603..b830d4da029d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1460,13 +1460,13 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, boo { if ( pToken->GetType() == svSingleRef ) { - const ScSingleRefData& rRef = *((const ScSingleRefToken*)pToken)->GetSingleRef(); + const ScSingleRefData& rRef = *static_cast<const ScSingleRefToken*>(pToken)->GetSingleRef(); rRange.aStart = rRange.aEnd = rRef.toAbs(rPos); bIs = !bValidOnly || ValidAddress(rRange.aStart); } else if ( pToken->GetType() == svDoubleRef ) { - const ScComplexRefData& rCompl = *((const ScDoubleRefToken*)pToken)->GetDoubleRef(); + const ScComplexRefData& rCompl = *static_cast<const ScDoubleRefToken*>(pToken)->GetDoubleRef(); const ScSingleRefData& rRef1 = rCompl.Ref1; const ScSingleRefData& rRef2 = rCompl.Ref2; rRange.aStart = rRef1.toAbs(rPos); diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 0e105c3b16d2..4cc649c84f4a 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -219,7 +219,7 @@ bool ScTpViewItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScTpViewItem& rPItem = (const ScTpViewItem&)rItem; + const ScTpViewItem& rPItem = static_cast<const ScTpViewItem&>(rItem); return ( theOptions == rPItem.theOptions ); } diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 33af4c0ff92a..3788c3cac8d9 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -22,8 +22,8 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/util/Date.hpp> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLCalculationSettingsContext : public SvXMLImportContext { @@ -38,8 +38,8 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext bool bMatchWholeCell; bool bUseRegularExpressions; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -62,8 +62,8 @@ public: class ScXMLNullDateContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -82,8 +82,8 @@ public: class ScXMLIterationContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 95a93c17cf5c..1801db63e891 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -21,8 +21,8 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCELLRANGESOURCECONTEXT_HXX #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; struct ScMyImpCellRangeSource { @@ -40,8 +40,8 @@ struct ScMyImpCellRangeSource class ScXMLCellRangeSourceContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCellRangeSourceContext( diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 76cfdc1cc195..d75c08112950 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -555,7 +555,7 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel bAll = true; else { - const ScChangeActionDel* pDel = (const ScChangeActionDel*) p; + const ScChangeActionDel* pDel = static_cast<const ScChangeActionDel*>(p); if ( (pDel->GetDx() > pDelAction->GetDx() || pDel->GetDy() > pDelAction->GetDy()) && pDel->GetBigRange() == pDelAction->GetBigRange() ) { diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index ba53c2f4af38..1c9bfd8d2844 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -23,8 +23,8 @@ #include "global.hxx" #include "address.hxx" #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLConsolidationContext : public SvXMLImportContext { @@ -37,8 +37,8 @@ private: bool bTargetAddr; protected: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLConsolidationContext( diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index ce7b102e840f..184a4ced4ad9 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -21,15 +21,13 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLDDELINKSCONTEXT_HXX #include <xmloff/xmlictxt.hxx> - +#include "xmlimprt.hxx" #include <list> -class ScXMLImport; - class ScXMLDDELinksContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -68,8 +66,8 @@ class ScXMLDDELinkContext : public SvXMLImportContext sal_Int32 nRows; sal_uInt8 nMode; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -100,8 +98,8 @@ class ScXMLDDESourceContext : public SvXMLImportContext { ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -123,8 +121,8 @@ class ScXMLDDETableContext : public SvXMLImportContext { ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -146,8 +144,8 @@ class ScXMLDDEColumnContext : public SvXMLImportContext { ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -170,8 +168,8 @@ class ScXMLDDERowContext : public SvXMLImportContext ScXMLDDELinkContext* pDDELink; sal_Int32 nRows; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -200,8 +198,8 @@ class ScXMLDDECellContext : public SvXMLImportContext ScXMLDDELinkContext* pDDELink; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 12b0265abc10..38f22eaab528 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -24,11 +24,10 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include "detfunc.hxx" #include "detdata.hxx" +#include "xmlimprt.hxx" #include <list> -class ScXMLImport; - struct ScMyImpDetectiveObj { ScRange aSourceRange; @@ -78,8 +77,8 @@ class ScXMLDetectiveContext : public SvXMLImportContext private: ScMyImpDetectiveObjVec* pDetectiveObjVec; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDetectiveContext( @@ -105,8 +104,8 @@ private: ScMyImpDetectiveObj aDetectiveObj; bool bValid; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDetectiveHighlightedContext( @@ -132,8 +131,8 @@ private: ScMyImpDetectiveOp aDetectiveOp; bool bHasType; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDetectiveOperationContext( diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index be0c9e9587d9..20d6bd0ced77 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -20,13 +20,13 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLEMPTYCONTEXT_HXX #include <xmloff/xmlictxt.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index cd711d4b0edb..99b086777910 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -759,7 +759,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads const ScPatternAttr* pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); while (pAttr) { - ScMergeFlagAttr& rItem = (ScMergeFlagAttr&)pAttr->GetItem(ATTR_MERGE_FLAG); + const ScMergeFlagAttr& rItem = static_cast<const ScMergeFlagAttr&>(pAttr->GetItem(ATTR_MERGE_FLAG)); if (rItem.HasPivotButton()) { for (SCROW nButtonRow = nRow1; nButtonRow <= nRow2; ++nButtonRow) diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index f1eb4a860b24..7062aa4c74b8 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -52,7 +52,7 @@ SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPre uno::Reference<drawing::XShapes> xShapes (rXMLImport.GetTables().GetCurrentXShapes()); if (xShapes.is()) { - XMLTableShapeImportHelper* pTableShapeImport((XMLTableShapeImportHelper*)rXMLImport.GetShapeImport().get()); + XMLTableShapeImportHelper* pTableShapeImport(static_cast<XMLTableShapeImportHelper*>(rXMLImport.GetShapeImport().get())); pTableShapeImport->SetOnTable(true); pContext = rXMLImport.GetShapeImport()->CreateGroupChildContext( rXMLImport, nPrefix, rLName, xAttrList, xShapes); diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index aa6ad501c4bd..857ebc8683d3 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -21,13 +21,12 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLESHAPESCONTEXT_HXX #include <xmloff/xmlictxt.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLTableShapesContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 31415e9630c6..1c97efa3a138 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -22,8 +22,7 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/sheet/SheetLinkMode.hpp> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLTableSourceContext : public SvXMLImportContext { @@ -34,8 +33,8 @@ class ScXMLTableSourceContext : public SvXMLImportContext sal_Int32 nRefresh; com::sun::star::sheet::SheetLinkMode nMode; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 90e3b9cc9c98..dfa5a69310bd 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -47,7 +47,7 @@ class ScXMLChangeInfoContext : public SvXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; sal_uInt32 nParagraphCount; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -68,7 +68,7 @@ class ScXMLBigRangeContext : public SvXMLImportContext { ScBigRange& rBigRange; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -104,7 +104,7 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext bool bBigRange; bool bContainsCell; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -125,7 +125,7 @@ class ScXMLDependenceContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -146,7 +146,7 @@ class ScXMLDependingsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -167,7 +167,7 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -188,7 +188,7 @@ class ScXMLDeletionsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -216,7 +216,7 @@ class ScXMLChangeTextPContext : public SvXMLImportContext SvXMLImportContext* pTextPContext; sal_uInt16 nPrefix; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -253,7 +253,7 @@ class ScXMLChangeCellContext : public SvXMLImportContext bool bString; bool bFormula; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -294,7 +294,7 @@ class ScXMLPreviousContext : public SvXMLImportContext sal_uInt16 nType; sal_uInt8 nMatrixFlag; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -316,7 +316,7 @@ class ScXMLContentChangeContext : public SvXMLImportContext ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; ScBigRange aBigRange; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -336,7 +336,7 @@ class ScXMLInsertionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -356,7 +356,7 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -376,7 +376,7 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -396,7 +396,7 @@ class ScXMLCutOffsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -416,7 +416,7 @@ class ScXMLDeletionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -438,7 +438,7 @@ class ScXMLMovementContext : public SvXMLImportContext ScBigRange aTargetRange; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -458,7 +458,7 @@ class ScXMLRejectionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 5bc218e0a635..da8e03a81b6b 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -22,18 +22,18 @@ #include "XMLChangeTrackingImportHelper.hxx" #include "chgtrack.hxx" +#include "xmlimprt.hxx" #include <xmloff/xmlictxt.hxx> #include <rtl/ustrbuf.hxx> -class ScXMLImport; class ScXMLChangeTrackingImportHelper; class ScXMLTrackedChangesContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 963cd15b9790..10d161fa3e85 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -54,7 +54,7 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, uno::Reference<drawing::XShapes> xLocalShapes (GetScImport().GetTables().GetCurrentXShapes()); if (xLocalShapes.is()) { - XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get(); + XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); pTableShapeImport->SetAnnotation(this); pShapeContext = GetScImport().GetShapeImport()->CreateGroupChildContext( GetScImport(), nPrfx, rLName, xAttrList, xLocalShapes, true); @@ -169,7 +169,7 @@ void ScXMLAnnotationContext::EndElement() mrAnnotationData.maCreateDate = maCreateDateStringBuffer.makeStringAndClear(); mrAnnotationData.maSimpleText = maTextBuffer.makeStringAndClear(); - XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get(); + XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); pTableShapeImport->SetAnnotation(NULL); } diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index d107b132d1e4..837f855d9f89 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -25,8 +25,8 @@ #include <editeng/editdata.hxx> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLTableRowCellContext; struct ScXMLAnnotationStyleEntry @@ -102,8 +102,8 @@ private: ScXMLTableRowCellContext* pCellContext; SvXMLImportContext* pShapeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } }; #endif diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 1b074b99123a..efb655fb7c5e 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -37,6 +37,7 @@ #include "XMLCalculationSettingsContext.hxx" #include "XMLTrackedChangesContext.hxx" #include "XMLEmptyContext.hxx" +#include "XMLDetectiveContext.hxx" #include "scerrors.hxx" #include "tabprotection.hxx" #include "datastreamimport.hxx" diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 7aa2221c1426..09bcd460f179 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -22,10 +22,10 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" #include "tabprotection.hxx" -class ScXMLImport; class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext @@ -37,8 +37,8 @@ class ScXMLBodyContext : public SvXMLImportContext bool bHadCalculationSettings; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index d5e80a7f5f26..86227a593df7 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -125,11 +125,11 @@ void ScXMLTableColContext::EndElement() { if (!sStyleName.isEmpty()) { - XMLTableStylesContext *pStyles = (XMLTableStylesContext *)rXMLImport.GetAutoStyles(); + XMLTableStylesContext *pStyles = static_cast<XMLTableStylesContext *>(rXMLImport.GetAutoStyles()); if ( pStyles ) { - XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_COLUMN, sStyleName, true); + XMLTableStyleContext* pStyle = const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_COLUMN, sStyleName, true))); if (pStyle) { pStyle->FillPropertySet(xColumnProperties); diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 866ab957aa43..9c99afab9f99 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -21,8 +21,8 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLTableColContext : public SvXMLImportContext { @@ -31,8 +31,8 @@ class ScXMLTableColContext : public SvXMLImportContext OUString sVisibility; OUString sCellStyleName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -61,8 +61,8 @@ class ScXMLTableColsContext : public SvXMLImportContext bool bGroup; bool bGroupDisplay; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 26d83fab318d..9e2e810ee52f 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -23,8 +23,8 @@ struct ScIconSetFormatData; class ScXMLConditionalFormatsContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); @@ -41,8 +41,8 @@ public: class ScXMLConditionalFormatContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -66,8 +66,8 @@ private: class ScXMLColorScaleFormatContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -86,8 +86,8 @@ private: class ScXMLDataBarFormatContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -110,8 +110,8 @@ private: class ScXMLIconSetFormatContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } ScIconSetFormatData* mpFormatData; public: @@ -132,8 +132,8 @@ public: class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -149,8 +149,8 @@ private: class ScXMLFormattingEntryContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -163,8 +163,8 @@ public: class ScXMLCondContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -177,8 +177,8 @@ public: class ScXMLDateContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 2751007f17ba..bedbc7da46b3 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -21,16 +21,15 @@ #include <xmloff/xmlimp.hxx> #include <rtl/ustrbuf.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLContentContext : public SvXMLImportContext { OUStringBuffer sOUText; OUStringBuffer& sValue; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 1bd823c108a9..0c616f1b5cc8 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -51,8 +51,8 @@ class ScXMLContentValidationContext : public SvXMLImportContext SvXMLImportContextRef xEventContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } com::sun::star::sheet::ValidationAlertStyle GetAlertStyle() const; void SetFormula( OUString& rFormula, OUString& rFormulaNmsp, FormulaGrammar::Grammar& reGrammar, @@ -89,7 +89,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext ScXMLContentValidationContext* pValidationContext; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -119,7 +119,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext ScXMLContentValidationContext* pValidationContext; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -146,7 +146,7 @@ class ScXMLErrorMacroContext : public SvXMLImportContext ScXMLContentValidationContext* pValidationContext; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -419,7 +419,7 @@ void ScXMLContentValidationContext::EndElement() { OUString sOnError("OnError"); XMLEventsImportContext* pEvents = - (XMLEventsImportContext*)&xEventContext; + static_cast<XMLEventsImportContext*>(&xEventContext); uno::Sequence<beans::PropertyValue> aValues; pEvents->GetEventSequence( sOnError, aValues ); diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index 2913d9e289b1..c97f174e97a8 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -25,13 +25,12 @@ #include <com/sun/star/sheet/ValidationType.hpp> #include <com/sun/star/sheet/ConditionOperator.hpp> #include <rtl/ustrbuf.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLContentValidationsContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 3470e6c8158b..9a0f1d3533d0 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -30,10 +30,10 @@ #include "dpobject.hxx" #include "dpsave.hxx" #include "queryparam.hxx" +#include "xmlimprt.hxx" #include <boost/unordered_set.hpp> -class ScXMLImport; class ScDPSaveNumGroupDimension; class ScDPSaveGroupDimension; @@ -49,8 +49,8 @@ enum ScMySourceType class ScXMLDataPilotTablesContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -118,8 +118,8 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext SelectedPagesType maSelectedPages; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -162,8 +162,8 @@ class ScXMLDPSourceSQLContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -187,8 +187,8 @@ class ScXMLDPSourceTableContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -212,8 +212,8 @@ class ScXMLDPSourceQueryContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -237,8 +237,8 @@ class ScXMLSourceServiceContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -290,8 +290,8 @@ class ScXMLSourceCellRangeContext : public SvXMLImportContext { ScXMLDataPilotTableContext* pDataPilotTable; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -340,8 +340,8 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext bool bAutoEnd:1; bool mbHasHiddenMember:1; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -388,8 +388,8 @@ class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldReference aReference; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -406,8 +406,8 @@ class ScXMLDataPilotLevelContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -431,8 +431,8 @@ class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldAutoShowInfo aInfo; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -449,8 +449,8 @@ class ScXMLDataPilotSortInfoContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldSortInfo aInfo; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -467,8 +467,8 @@ class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext { // com::sun::star::sheet::DataPilotFieldLayoutInfo aInfo; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -489,8 +489,8 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext sal_uInt16* pFunctions; OUString maDisplayName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -518,8 +518,8 @@ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext { ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -543,8 +543,8 @@ class ScXMLDataPilotMembersContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -574,8 +574,8 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext bool bDisplayDetails; bool bHasName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -599,8 +599,8 @@ class ScXMLDataPilotGroupsContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -627,8 +627,8 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext OUString sName; ::std::vector<OUString> aMembers; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -656,8 +656,8 @@ class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext OUString sName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index dbdc502a1dec..5555dfdd3d2e 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -31,17 +31,17 @@ #include <com/sun/star/table/TableOrientation.hpp> #include "dbdata.hxx" +#include "xmlimprt.hxx" #include <boost/scoped_ptr.hpp> class ScDBData; struct ScQueryParam; -class ScXMLImport; class ScXMLDatabaseRangesContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -100,8 +100,8 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext bool bByRow; ScDBCollection::RangeType meRangeType; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } ScDBData* ConvertToDBData(const OUString& rName); @@ -144,8 +144,8 @@ class ScXMLSourceSQLContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; OUString sDBName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -170,8 +170,8 @@ class ScXMLSourceTableContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; OUString sDBName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -196,8 +196,8 @@ class ScXMLSourceQueryContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; OUString sDBName; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -221,8 +221,8 @@ class ScXMLConResContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -246,8 +246,8 @@ class ScXMLSubTotalRulesContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -271,8 +271,8 @@ class ScXMLSortGroupsContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -297,8 +297,8 @@ class ScXMLSubTotalRuleContext : public SvXMLImportContext ScXMLDatabaseRangeContext* pDatabaseRangeContext; ScSubTotalRule aSubTotalRule; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -328,8 +328,8 @@ class ScXMLSubTotalFieldContext : public SvXMLImportContext OUString sFieldNumber; OUString sFunction; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 6e7b52de2596..8b382c919f9e 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4980,7 +4980,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn { if( 0 != (pItem = pPool->GetItem2( nAttrib, i ) ) ) { - const SvXMLAttrContainerItem *pUnknown((const SvXMLAttrContainerItem *)pItem); + const SvXMLAttrContainerItem *pUnknown(static_cast<const SvXMLAttrContainerItem *>(pItem)); if( (pUnknown->GetAttrCount() > 0) ) { sal_uInt16 nIdx(pUnknown->GetFirstNamespaceIndex()); diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index eaa0dd01a96e..e22fe1e6d81b 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -56,8 +56,8 @@ class ScXMLFilterContext : public SvXMLImportContext bool bConditionSourceRange; std::vector<ConnStackItem> maConnStack; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -87,8 +87,8 @@ class ScXMLAndContext : public SvXMLImportContext ScQueryParam& mrQueryParam; ScXMLFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -114,8 +114,8 @@ class ScXMLOrContext : public SvXMLImportContext ScQueryParam& mrQueryParam; ScXMLFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -148,8 +148,8 @@ class ScXMLConditionContext : public SvXMLImportContext sal_Int32 nField; bool bIsCaseSensitive; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -214,8 +214,8 @@ class ScXMLDPFilterContext : public SvXMLImportContext bool bConditionSourceRange:1; ::std::stack<bool> aConnectionOrStack; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -267,8 +267,8 @@ class ScXMLDPAndContext : public SvXMLImportContext { ScXMLDPFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -292,8 +292,8 @@ class ScXMLDPOrContext : public SvXMLImportContext { ScXMLDPFilterContext* pFilterContext; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -323,8 +323,8 @@ class ScXMLDPConditionContext : public SvXMLImportContext sal_Int32 nField; bool bIsCaseSensitive; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index 82f1ca409751..8e514e6ca8ec 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.cxx @@ -51,7 +51,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 sal_uInt16 nWhichId(pWhichIds[i]); if (bExportDefaults && (0 != (pItem = &pItemPool->GetDefaultItem(nWhichId)))) { - const SvxFontItem *pFont((const SvxFontItem *)pItem); + const SvxFontItem *pFont(static_cast<const SvxFontItem *>(pItem)); Add( pFont->GetFamilyName(), pFont->GetStyleName(), pFont->GetFamily(), pFont->GetPitch(), pFont->GetCharSet() ); @@ -61,7 +61,7 @@ void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 { if( 0 != (pItem = pItemPool->GetItem2( nWhichId, j ) ) ) { - const SvxFontItem *pFont((const SvxFontItem *)pItem); + const SvxFontItem *pFont(static_cast<const SvxFontItem *>(pItem)); Add( pFont->GetFamilyName(), pFont->GetStyleName(), pFont->GetFamily(), pFont->GetPitch(), pFont->GetCharSet() ); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index aefb1a92f764..721a46b07854 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -58,6 +58,7 @@ #include "patattr.hxx" #include "XMLConverter.hxx" +#include "XMLDetectiveContext.hxx" #include "XMLTableShapeImportHelper.hxx" #include "XMLChangeTrackingImportHelper.hxx" #include "chgviset.hxx" @@ -240,7 +241,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() class ScXMLDocContext_Impl : public virtual SvXMLImportContext { protected: - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -314,7 +315,7 @@ SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext( class ScXMLBodyContext_Impl : public SvXMLImportContext { - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -2270,9 +2271,9 @@ SvXMLImportContext *ScXMLImport::CreateStylesContext(const OUString& rLocalName, *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, bIsAutoStyle); if (bIsAutoStyle) - SetAutoStyles((SvXMLStylesContext*)pContext); + SetAutoStyles(static_cast<SvXMLStylesContext*>(pContext)); else - SetStyles((SvXMLStylesContext*)pContext); + SetStyles(static_cast<SvXMLStylesContext*>(pContext)); return pContext; } @@ -2830,9 +2831,11 @@ void ScXMLImport::SetStyleToRanges() uno::Reference <beans::XPropertySet> xProperties (xSheetCellRanges, uno::UNO_QUERY); if (xProperties.is()) { - XMLTableStylesContext *pStyles((XMLTableStylesContext *)GetAutoStyles()); - XMLTableStyleContext* pStyle( pStyles ? (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName, true) : NULL ); + XMLTableStylesContext *pStyles(static_cast<XMLTableStylesContext *>(GetAutoStyles())); + XMLTableStyleContext* pStyle = NULL; + if ( pStyles ) + pStyle = const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName, true))); if (pStyle) { pStyle->FillPropertySet(xProperties); @@ -3435,4 +3438,11 @@ void ScXMLImport::NotifyEmbeddedFontRead() pDoc->SetIsUsingEmbededFonts( true ); } +ScMyImpDetectiveOpArray* ScXMLImport::GetDetectiveOpArray() +{ + if (!pDetectiveOpArray) + pDetectiveOpArray = new ScMyImpDetectiveOpArray(); + return pDetectiveOpArray; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 0d953431b1a4..7f428e30f545 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -34,7 +34,6 @@ #include "compiler.hxx" #include "xmlstyle.hxx" -#include "XMLDetectiveContext.hxx" #include <com/sun/star/sheet/ValidationAlertStyle.hpp> #include <com/sun/star/sheet/ValidationType.hpp> #include <com/sun/star/sheet/ConditionOperator.hpp> @@ -54,6 +53,7 @@ class ScMyStyleNumberFormats; class XMLNumberFormatAttributesExportHelper; class ScEditEngineDefaulter; class ScDocumentImport; +class ScMyImpDetectiveOpArray; namespace sc { @@ -1137,10 +1137,7 @@ public: pValidations->push_back(rValidation); } bool GetValidation(const OUString& sName, ScMyImportValidation& aValidation); - inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { - if (!pDetectiveOpArray) - pDetectiveOpArray = new ScMyImpDetectiveOpArray(); - return pDetectiveOpArray; } + ScMyImpDetectiveOpArray* GetDetectiveOpArray(); void SetRemoveLastChar(bool bValue) { bRemoveLastChar = bValue; } bool GetRemoveLastChar() { return bRemoveLastChar; } diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index c384e9960538..590fc037aa78 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -20,14 +20,13 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLLABRI_HXX #include <xmloff/xmlictxt.hxx> - -class ScXMLImport; +#include "xmlimprt.hxx" class ScXMLLabelRangesContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLLabelRangesContext( @@ -53,8 +52,8 @@ private: OUString sDataRangeStr; bool bColumnOrientation; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLLabelRangeContext( diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index df17e0b01955..cce47678b4dc 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -22,17 +22,17 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include "address.hxx" +#include "xmlimprt.hxx" #include <boost/shared_ptr.hpp> -class ScXMLImport; struct ScMyNamedExpression; class ScRangeName; class ScXMLNamedExpressionsContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -92,8 +92,8 @@ private: class ScXMLNamedRangeContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -118,8 +118,8 @@ private: class ScXMLNamedExpressionContext : public SvXMLImportContext { - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 65af6b0905c0..7af34aa1dd16 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -172,11 +172,11 @@ void ScXMLTableRowContext::EndElement() { if (!sStyleName.isEmpty()) { - XMLTableStylesContext *pStyles((XMLTableStylesContext *)rXMLImport.GetAutoStyles()); + XMLTableStylesContext *pStyles(static_cast<XMLTableStylesContext *>(rXMLImport.GetAutoStyles())); if ( pStyles ) { - XMLTableStyleContext* pStyle((XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_ROW, sStyleName, true)); + XMLTableStyleContext* pStyle(const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_ROW, sStyleName, true)))); if (pStyle) { pStyle->FillPropertySet(xRowProperties); diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 24d08f59d0f7..c770218de1a7 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -22,8 +22,8 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include "address.hxx" +#include "xmlimprt.hxx" -class ScXMLImport; class ScXMLTableRowContext : public SvXMLImportContext { @@ -32,8 +32,8 @@ class ScXMLTableRowContext : public SvXMLImportContext sal_Int32 nRepeatedRows; bool bHasCell; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -60,8 +60,8 @@ class ScXMLTableRowsContext : public SvXMLImportContext bool bGroup; bool bGroupDisplay; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 4251c641330f..dd3b7b9548f0 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -39,8 +39,8 @@ private: bool bIsActive; bool bProtected; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 893a43e6c04e..97ff19ebea71 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -43,8 +43,8 @@ class ScXMLSortContext : public SvXMLImportContext bool bIsCaseSensitive; bool bEnabledUserList; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: @@ -74,8 +74,8 @@ class ScXMLSortByContext : public SvXMLImportContext OUString sDataType; OUString sOrder; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index d27af06b4c74..7fb37216b5fa 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -351,7 +351,7 @@ class ScXMLMapContext : public SvXMLImportContext OUString msCondition; OUString msBaseCell; - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLMapContext( @@ -727,7 +727,7 @@ void XMLTableStylesContext::EndElement() if (bAutoStyles) GetImport().GetTextImport()->SetAutoStyles( this ); else - ((ScXMLImport&)GetImport()).InsertStyles(); + GetScImport().InsertStyles(); } rtl::Reference < SvXMLImportPropertyMapper > @@ -1089,7 +1089,7 @@ void ScCellTextStyleContext::FillPropertySet( const uno::Reference<beans::XPrope ScDrawTextCursor* pDrawImp = ScDrawTextCursor::getImplementation( xPropSet ); if (pDrawImp) { - XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get(); + XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); ScXMLAnnotationContext* pAnnotationContext = pTableShapeImport->GetAnnotationContext(); if (pAnnotationContext) { diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 9e68eda6dfba..6c1d483681ad 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -78,8 +78,8 @@ class XMLTableStyleContext : public XMLPropStyleContext ScConditionalFormat* mpCondFormat; bool mbDeleteCondFormat; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } protected: @@ -146,8 +146,8 @@ class XMLTableStylesContext : public SvXMLStylesContext rtl::Reference < SvXMLImportPropertyMapper > xRowImpPropMapper; rtl::Reference < SvXMLImportPropertyMapper > xTableImpPropMapper; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } protected: @@ -254,8 +254,8 @@ class ScCellTextStyleContext : public XMLTextStyleContext { sal_Int32 nLastSheet; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index e3f159b08f7e..f8da27fb556c 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -153,11 +153,11 @@ void ScMyTables::SetTableStyle(const OUString& sStyleName) uno::Reference <beans::XPropertySet> xProperties(xCurrentSheet, uno::UNO_QUERY); if ( xProperties.is() ) { - XMLTableStylesContext *pStyles = (XMLTableStylesContext *)rImport.GetAutoStyles(); + XMLTableStylesContext *pStyles = static_cast<XMLTableStylesContext *>(rImport.GetAutoStyles()); if ( pStyles ) { - XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, true); + XMLTableStyleContext* pStyle = const_cast<XMLTableStyleContext*>(static_cast<const XMLTableStyleContext *>(pStyles->FindStyleChildContext( + XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, true))); if ( pStyle ) { pStyle->FillPropertySet(xProperties); diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 62bd8c034c64..eec6553d4e0b 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -20,11 +20,11 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABI_HXX #include "externalrefmgr.hxx" +#include "xmlimprt.hxx" #include <xmloff/xmlictxt.hxx> #include <memory> -class ScXMLImport; struct ScXMLExternalTabData { @@ -45,8 +45,8 @@ class ScXMLTableContext : public SvXMLImportContext bool bStartFormPage; bool bPrintEntireSheet; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } + ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index a15e3f978dbe..aff5ba2a3774 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -338,9 +338,9 @@ bool ScAccessibleCell::IsEditable( mpDoc) { // here I have to test whether the protection of the table should influence this cell. - const ScProtectionAttr* pItem = (const ScProtectionAttr*)mpDoc->GetAttr( + const ScProtectionAttr* pItem = static_cast<const ScProtectionAttr*>(mpDoc->GetAttr( maCellAddress.Col(), maCellAddress.Row(), - maCellAddress.Tab(), ATTR_PROTECTION); + maCellAddress.Tab(), ATTR_PROTECTION)); if (pItem) bEditable = !pItem->GetProtection(); } @@ -354,9 +354,9 @@ bool ScAccessibleCell::IsOpaque( bool bOpaque(true); if (mpDoc) { - const SvxBrushItem* pItem = (const SvxBrushItem*)mpDoc->GetAttr( + const SvxBrushItem* pItem = static_cast<const SvxBrushItem*>(mpDoc->GetAttr( maCellAddress.Col(), maCellAddress.Row(), - maCellAddress.Tab(), ATTR_BACKGROUND); + maCellAddress.Tab(), ATTR_BACKGROUND)); if (pItem) bOpaque = pItem->GetColor() != COL_TRANSPARENT; } @@ -589,7 +589,7 @@ bool ScAccessibleCell::IsDropdown() return true; } ScMergeFlagAttr* pAttr; - pAttr = (ScMergeFlagAttr*)mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG ); + pAttr = static_cast<ScMergeFlagAttr*>(mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG )); if( pAttr->HasAutoFilter() ) { return true; |