diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-22 12:03:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-10-23 12:36:16 +0200 |
| commit | 229eed079c675e70118370044ae91a69c60d044e (patch) | |
| tree | c2d26c6158aa43633f034c9abbebbe18ecc1e565 | |
| parent | 5f6f57c26ee15787ca2f775f853e57cfc11d666f (diff) | |
loplugin: cstylecast
Change-Id: If991c0efe1ded6ef6d32b3a722ee87bbe36bf0bf
38 files changed, 470 insertions, 468 deletions
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 73b361a3f059..316dd66f8c37 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -938,9 +938,9 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName, { pContext = new OReportStylesContext(*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; } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 89dbb5a767bd..429997df2d21 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1668,7 +1668,7 @@ void OReportController::impl_initialize( ) const ::comphelper::NamedValueCollection& rArguments( getInitParams() ); - rArguments.get_ensureType( (OUString)PROPERTY_REPORTNAME, m_sName ); + rArguments.get_ensureType( OUString(PROPERTY_REPORTNAME), m_sName ); if ( m_sName.isEmpty() ) rArguments.get_ensureType( "DocumentTitle", m_sName ); @@ -4285,7 +4285,7 @@ void OReportController::openZoomDialog() if ( !bCancel ) { - const SvxZoomItem& rZoomItem = (const SvxZoomItem&)pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM ); + const SvxZoomItem& rZoomItem = static_cast<const SvxZoomItem&>(pDlg->GetOutputItemSet()->Get( SID_ATTR_ZOOM )); m_eZoomType = rZoomItem.GetType(); m_nZoomValue = rZoomItem.GetValue(); if ( m_eZoomType != SVX_ZOOM_PERCENT ) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 5111ecc04ba5..5d34c20fed59 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -679,7 +679,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) _pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); _pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); _pObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( false ) ); - ((SdrObjCustomShape*)_pObj)->MergeDefaultAttributes( &_sType ); + static_cast<SdrObjCustomShape*>(_pObj)->MergeDefaultAttributes( &_sType ); } } diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index f89836871789..f21fa10916fa 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -476,26 +476,18 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry ScChangeActionDelMoveEntry* GetNext() { - return (ScChangeActionDelMoveEntry*) - ScChangeActionLinkEntry::GetNext(); - } - ScChangeActionMove* GetMove() - { - return (ScChangeActionMove*) - ScChangeActionLinkEntry::GetAction(); + return static_cast<ScChangeActionDelMoveEntry*>( + ScChangeActionLinkEntry::GetNext()); } + inline ScChangeActionMove* GetMove(); public: const ScChangeActionDelMoveEntry* GetNext() const { - return (const ScChangeActionDelMoveEntry*) - ScChangeActionLinkEntry::GetNext(); - } - const ScChangeActionMove* GetMove() const - { - return (const ScChangeActionMove*) - ScChangeActionLinkEntry::GetAction(); + return static_cast<const ScChangeActionDelMoveEntry*>( + ScChangeActionLinkEntry::GetNext()); } + inline const ScChangeActionMove* GetMove() const; short GetCutOffFrom() const { return nCutOffFrom; } short GetCutOffTo() const { return nCutOffTo; } }; @@ -646,6 +638,17 @@ public: OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const SAL_OVERRIDE; }; +inline ScChangeActionMove* ScChangeActionDelMoveEntry::GetMove() + { + return static_cast<ScChangeActionMove*>( + ScChangeActionLinkEntry::GetAction()); + } + +inline const ScChangeActionMove* ScChangeActionDelMoveEntry::GetMove() const + { + return static_cast<const ScChangeActionMove*>( + ScChangeActionLinkEntry::GetAction()); + } // ScChangeActionContent enum ScChangeActionContentCellType { diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 0fb3922ac631..8064e2c9ffb0 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1610,7 +1610,7 @@ public: void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); SC_DLLPUBLIC ScPatternAttr* GetDefPattern() const; - SC_DLLPUBLIC ScDocumentPool* GetPool(); + SC_DLLPUBLIC ScDocumentPool* GetPool(); SC_DLLPUBLIC ScStyleSheetPool* GetStyleSheetPool() const; // PageStyle: diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 875fb931c1ae..4ab6d2abbb32 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -132,7 +132,7 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern ) nCount = nLimit = 1; pData = new ScAttrEntry[1]; - ScPatternAttr* pNewPattern = (ScPatternAttr*) &pDocPool->Put(*pPattern); + const ScPatternAttr* pNewPattern = static_cast<const ScPatternAttr*>( &pDocPool->Put(*pPattern) ); pData[0].nRow = MAXROW; pData[0].pPattern = pNewPattern; } @@ -389,7 +389,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern if (ValidRow(nStartRow) && ValidRow(nEndRow)) { if (bPutToPool) - pPattern = (const ScPatternAttr*) &pDocument->GetPool()->Put(*pPattern); + pPattern = static_cast<const ScPatternAttr*>(&pDocument->GetPool()->Put(*pPattern)); if ((nStartRow == 0) && (nEndRow == MAXROW)) Reset(pPattern); @@ -617,8 +617,8 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* } pDocument->GetPool()->Remove(*pData[nPos].pPattern); - pData[nPos].pPattern = (const ScPatternAttr*) - &pDocument->GetPool()->Put(*pNewPattern); + pData[nPos].pPattern = static_cast<const ScPatternAttr*>( + &pDocument->GetPool()->Put(*pNewPattern)); if (Concat(nPos)) Search(nStart, nPos); else @@ -685,9 +685,9 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, SCROW nY1 = nStart; SCROW nY2 = pData[nPos].nRow; - SvxBoxItem* pNewBoxItem = pBoxItem ? (SvxBoxItem*)pBoxItem->Clone() : 0; - SvxLineItem* pNewTLBRItem = pTLBRItem ? (SvxLineItem*)pTLBRItem->Clone() : 0; - SvxLineItem* pNewBLTRItem = pBLTRItem ? (SvxLineItem*)pBLTRItem->Clone() : 0; + SvxBoxItem* pNewBoxItem = pBoxItem ? static_cast<SvxBoxItem*>(pBoxItem->Clone()) : 0; + SvxLineItem* pNewTLBRItem = pTLBRItem ? static_cast<SvxLineItem*>(pTLBRItem->Clone()) : 0; + SvxLineItem* pNewBLTRItem = pBLTRItem ? static_cast<SvxLineItem*>(pBLTRItem->Clone()) : 0; // fetch line and update attributes with parameters @@ -754,8 +754,8 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, { // remove from pool ? pDocument->GetPool()->Remove(*pData[nPos].pPattern); - pData[nPos].pPattern = (const ScPatternAttr*) - &pDocument->GetPool()->Put(*pNewPattern); + pData[nPos].pPattern = static_cast<const ScPatternAttr*>( + &pDocument->GetPool()->Put(*pNewPattern) ); if (Concat(nPos)) Search(nStart, nPos); @@ -801,7 +801,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac do { const ScPatternAttr* pOldPattern = pData[nPos].pPattern; - const ScPatternAttr* pNewPattern = (const ScPatternAttr*) &pCache->ApplyTo( *pOldPattern, true ); + const ScPatternAttr* pNewPattern = static_cast<const ScPatternAttr*>( &pCache->ApplyTo( *pOldPattern, true ) ); ScDocumentPool::CheckRef( *pOldPattern ); ScDocumentPool::CheckRef( *pNewPattern ); if (pNewPattern != pOldPattern) @@ -990,13 +990,13 @@ static void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner bool bLeft, SCCOL nDistRight, bool bTop, SCROW nDistBottom ) { // right/bottom border set when connected together - const ScMergeAttr& rMerge = (const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE); + const ScMergeAttr& rMerge = static_cast<const ScMergeAttr&>(pPattern->GetItem(ATTR_MERGE)); if ( rMerge.GetColMerge() == nDistRight + 1 ) nDistRight = 0; if ( rMerge.GetRowMerge() == nDistBottom + 1 ) nDistBottom = 0; - const SvxBoxItem* pCellFrame = (SvxBoxItem*) &pPattern->GetItemSet().Get( ATTR_BORDER ); + const SvxBoxItem* pCellFrame = static_cast<const SvxBoxItem*>( &pPattern->GetItemSet().Get( ATTR_BORDER ) ); const SvxBorderLine* pLeftAttr = pCellFrame->GetLeft(); const SvxBorderLine* pRightAttr = pCellFrame->GetRight(); const SvxBorderLine* pTopAttr = pCellFrame->GetTop(); @@ -1094,11 +1094,11 @@ bool ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, OSL_ENSURE( pBoxItem && pBoxInfoItem, "Missing line attributes!" ); const ScPatternAttr* pPattern = GetPattern( nStartRow ); - const SvxBoxItem* pOldFrame = (const SvxBoxItem*) - &pPattern->GetItemSet().Get( ATTR_BORDER ); + const SvxBoxItem* pOldFrame = static_cast<const SvxBoxItem*>( + &pPattern->GetItemSet().Get( ATTR_BORDER )); // right/bottom border set when connected together - const ScMergeAttr& rMerge = (const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE); + const ScMergeAttr& rMerge = static_cast<const ScMergeAttr&>(pPattern->GetItem(ATTR_MERGE)); if ( rMerge.GetColMerge() == nDistRight + 1 ) nDistRight = 0; if ( rMerge.GetRowMerge() == nDistBottom + 1 ) @@ -1210,14 +1210,14 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const if ( nMask & HASATTR_MERGED ) { const ScMergeAttr* pMerge = - (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE ); + static_cast<const ScMergeAttr*>( &pPattern->GetItem( ATTR_MERGE ) ); if ( pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1 ) bFound = true; } if ( nMask & ( HASATTR_OVERLAPPED | HASATTR_NOTOVERLAPPED | HASATTR_AUTOFILTER ) ) { const ScMergeFlagAttr* pMergeFlag = - (const ScMergeFlagAttr*) &pPattern->GetItem( ATTR_MERGE_FLAG ); + static_cast<const ScMergeFlagAttr*>( &pPattern->GetItem( ATTR_MERGE_FLAG ) ); if ( (nMask & HASATTR_OVERLAPPED) && pMergeFlag->IsOverlapped() ) bFound = true; if ( (nMask & HASATTR_NOTOVERLAPPED) && !pMergeFlag->IsOverlapped() ) @@ -1228,14 +1228,14 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const if ( nMask & HASATTR_LINES ) { const SvxBoxItem* pBox = - (const SvxBoxItem*) &pPattern->GetItem( ATTR_BORDER ); + static_cast<const SvxBoxItem*>( &pPattern->GetItem( ATTR_BORDER ) ); if ( pBox->GetLeft() || pBox->GetRight() || pBox->GetTop() || pBox->GetBottom() ) bFound = true; } if ( nMask & HASATTR_SHADOW ) { const SvxShadowItem* pShadow = - (const SvxShadowItem*) &pPattern->GetItem( ATTR_SHADOW ); + static_cast<const SvxShadowItem*>( &pPattern->GetItem( ATTR_SHADOW ) ); if ( pShadow->GetLocation() != SVX_SHADOW_NONE ) bFound = true; } @@ -1249,7 +1249,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const if ( nMask & HASATTR_PROTECTED ) { const ScProtectionAttr* pProtect = - (const ScProtectionAttr*) &pPattern->GetItem( ATTR_PROTECTION ); + static_cast<const ScProtectionAttr*>( &pPattern->GetItem( ATTR_PROTECTION ) ); bool bFoundTemp = false; if ( pProtect->GetProtection() || pProtect->GetHideCell() ) bFoundTemp = true; @@ -1292,7 +1292,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const if ( nMask & HASATTR_ROTATE ) { const SfxInt32Item* pRotate = - (const SfxInt32Item*) &pPattern->GetItem( ATTR_ROTATE_VALUE ); + static_cast<const SfxInt32Item*>( &pPattern->GetItem( ATTR_ROTATE_VALUE ) ); // 90 or 270 degrees is former SvxOrientationItem - only look for other values // (see ScPatternAttr::GetCellOrientation) sal_Int32 nAngle = pRotate->GetValue(); @@ -1303,21 +1303,21 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const { if (pPattern->GetCellOrientation() != SVX_ORIENTATION_STANDARD) bFound = true; - else if (((const SfxBoolItem&)pPattern->GetItem( ATTR_LINEBREAK )).GetValue()) + else if (static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_LINEBREAK )).GetValue()) bFound = true; - else if ((SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern-> + else if ((SvxCellHorJustify)static_cast<const SvxHorJustifyItem&>(pPattern-> GetItem( ATTR_HOR_JUSTIFY )).GetValue() == SVX_HOR_JUSTIFY_BLOCK) bFound = true; else if (!static_cast<const ScCondFormatItem&>(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData().empty()) bFound = true; - else if (((const SfxInt32Item&)pPattern->GetItem( ATTR_ROTATE_VALUE )).GetValue()) + else if (static_cast<const SfxInt32Item&>(pPattern->GetItem( ATTR_ROTATE_VALUE )).GetValue()) bFound = true; } if ( nMask & ( HASATTR_SHADOW_RIGHT | HASATTR_SHADOW_DOWN ) ) { const SvxShadowItem* pShadow = - (const SvxShadowItem*) &pPattern->GetItem( ATTR_SHADOW ); + static_cast<const SvxShadowItem*>( &pPattern->GetItem( ATTR_SHADOW )); SvxShadowLocation eLoc = pShadow->GetLocation(); if ( nMask & HASATTR_SHADOW_RIGHT ) if ( eLoc == SVX_SHADOW_TOPRIGHT || eLoc == SVX_SHADOW_BOTTOMRIGHT ) @@ -1329,7 +1329,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const if ( nMask & HASATTR_RTL ) { const SvxFrameDirectionItem& rDirection = - (const SvxFrameDirectionItem&) pPattern->GetItem( ATTR_WRITINGDIR ); + static_cast<const SvxFrameDirectionItem&>( pPattern->GetItem( ATTR_WRITINGDIR ) ); if ( rDirection.GetValue() == FRMDIR_HORI_RIGHT_TOP ) bFound = true; } @@ -1337,7 +1337,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const { // called only if the sheet is LTR, so physical=logical alignment can be assumed SvxCellHorJustify eHorJust = (SvxCellHorJustify) - ((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); + static_cast<const SvxHorJustifyItem&>( pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); if ( eHorJust == SVX_HOR_JUSTIFY_RIGHT || eHorJust == SVX_HOR_JUSTIFY_CENTER ) bFound = true; } @@ -1374,7 +1374,7 @@ bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, for (SCSIZE i=nStartIndex; i<=nEndIndex; i++) { pPattern = pData[i].pPattern; - pItem = (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE ); + pItem = static_cast<const ScMergeAttr*>( &pPattern->GetItem( ATTR_MERGE ) ); SCsCOL nCountX = pItem->GetColMerge(); SCsROW nCountY = pItem->GetRowMerge(); if (nCountX>1 || nCountY>1) @@ -1429,15 +1429,15 @@ bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) nThisEnd = nEndRow; pPattern = pData[nIndex].pPattern; - pItem = (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE ); + pItem = static_cast<const ScMergeAttr*>( &pPattern->GetItem( ATTR_MERGE ) ); SCsCOL nCountX = pItem->GetColMerge(); SCsROW nCountY = pItem->GetRowMerge(); if (nCountX>1 || nCountY>1) { - const ScMergeAttr* pAttr = (const ScMergeAttr*) - &pDocument->GetPool()->GetDefaultItem( ATTR_MERGE ); - const ScMergeFlagAttr* pFlagAttr = (const ScMergeFlagAttr*) - &pDocument->GetPool()->GetDefaultItem( ATTR_MERGE_FLAG ); + const ScMergeAttr* pAttr = static_cast<const ScMergeAttr*>( + &pDocument->GetPool()->GetDefaultItem( ATTR_MERGE ) ); + const ScMergeFlagAttr* pFlagAttr = static_cast<const ScMergeFlagAttr*>( + &pDocument->GetPool()->GetDefaultItem( ATTR_MERGE_FLAG )); OSL_ENSURE( nCountY==1 || nThisStart==nThisEnd, "What's up?" ); @@ -1498,7 +1498,7 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, if (nThisRow < nStartRow) nThisRow = nStartRow; nRow = pData[nIndex].nRow; SCROW nAttrRow = std::min( (SCROW)nRow, (SCROW)nEndRow ); - pItem = (const ScMergeFlagAttr*) &pOldPattern->GetItem( ATTR_MERGE_FLAG ); + pItem = static_cast<const ScMergeFlagAttr*>( &pOldPattern->GetItem( ATTR_MERGE_FLAG ) ); if (pItem->IsOverlapped() || pItem->HasAutoFilter()) { @@ -1549,7 +1549,7 @@ bool ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) while ( nThisRow <= nEndRow ) { pOldPattern = pData[nIndex].pPattern; - nOldValue = ((const ScMergeFlagAttr*) &pOldPattern->GetItem( ATTR_MERGE_FLAG ))->GetValue(); + nOldValue = static_cast<const ScMergeFlagAttr*>( &pOldPattern->GetItem( ATTR_MERGE_FLAG ))->GetValue(); if ( (nOldValue | nFlags) != nOldValue ) { nRow = pData[nIndex].nRow; @@ -1585,7 +1585,7 @@ bool ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags while ( nThisRow <= nEndRow ) { pOldPattern = pData[nIndex].pPattern; - nOldValue = ((const ScMergeFlagAttr*) &pOldPattern->GetItem( ATTR_MERGE_FLAG ))->GetValue(); + nOldValue = static_cast<const ScMergeFlagAttr*>(&pOldPattern->GetItem( ATTR_MERGE_FLAG ))->GetValue(); if ( (nOldValue & ~nFlags) != nOldValue ) { nRow = pData[nIndex].nRow; @@ -1649,9 +1649,9 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement const SfxPoolItem* pItem; bool bNeedJust = ( rOldSet.GetItemState( ATTR_HOR_JUSTIFY, false, &pItem ) != SfxItemState::SET - || (((const SvxHorJustifyItem*)pItem)->GetValue() != SVX_HOR_JUSTIFY_LEFT && - ((const SvxHorJustifyItem*)pItem)->GetValue() != SVX_HOR_JUSTIFY_RIGHT )); - sal_uInt16 nOldValue = ((const SfxUInt16Item&)rOldSet.Get( ATTR_INDENT )).GetValue(); + || (static_cast<const SvxHorJustifyItem*>(pItem)->GetValue() != SVX_HOR_JUSTIFY_LEFT && + static_cast<const SvxHorJustifyItem*>(pItem)->GetValue() != SVX_HOR_JUSTIFY_RIGHT )); + sal_uInt16 nOldValue = static_cast<const SfxUInt16Item&>(rOldSet.Get( ATTR_INDENT )).GetValue(); sal_uInt16 nNewValue = nOldValue; // To keep Increment indent from running outside the cell1659 long nColWidth = (long)pDocument->GetColWidth(nCol,nTab); @@ -1703,7 +1703,7 @@ SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, bool bUp ) const { SCSIZE nIndex; Search(nRow, nIndex); - while (((const ScProtectionAttr&)pData[nIndex].pPattern-> + while (static_cast<const ScProtectionAttr&>(pData[nIndex].pPattern-> GetItem(ATTR_PROTECTION)).GetProtection()) { if (bUp) @@ -1740,13 +1740,13 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo { boost::scoped_ptr<ScPatternAttr> pNewPattern(new ScPatternAttr(*pData[nPos].pPattern)); pDocument->GetPool()->Remove(*pData[nPos].pPattern); - pNewPattern->SetStyleSheet( (ScStyleSheet*) + pNewPattern->SetStyleSheet( static_cast<ScStyleSheet*>( pDocument->GetStyleSheetPool()-> Find( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA, - SFXSTYLEBIT_AUTO | SCSTYLEBIT_STANDARD ) ); - pData[nPos].pPattern = (const ScPatternAttr*) - &pDocument->GetPool()->Put(*pNewPattern); + SFXSTYLEBIT_AUTO | SCSTYLEBIT_STANDARD ) ) ); + pData[nPos].pPattern = static_cast<const ScPatternAttr*>( + &pDocument->GetPool()->Put(*pNewPattern)); pNewPattern.reset(); if (Concat(nPos)) @@ -1999,7 +1999,7 @@ bool ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const for ( ; nIndex < nCount; nIndex++ ) { - if ( ((const ScMergeFlagAttr&)pData[nIndex].pPattern-> + if ( static_cast<const ScMergeFlagAttr&>(pData[nIndex].pPattern-> GetItem(ATTR_MERGE_FLAG)).IsHorOverlapped() ) { bTest = false; // may not be pushed out @@ -2022,7 +2022,7 @@ bool ScAttrArray::TestInsertRow( SCSIZE nSize ) const while ( nFirstLost && pData[nFirstLost-1].nRow >= sal::static_int_cast<SCROW>(MAXROW + 1 - nSize) ) --nFirstLost; - if ( ((const ScMergeFlagAttr&)pData[nFirstLost].pPattern-> + if ( static_cast<const ScMergeFlagAttr&>(pData[nFirstLost].pPattern-> GetItem(ATTR_MERGE_FLAG)).IsVerOverlapped() ) return false; @@ -2040,7 +2040,7 @@ void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize ) // set ScMergeAttr may not be extended (so behind delete again) - bool bDoMerge = ((const ScMergeAttr&) pData[nIndex].pPattern->GetItem(ATTR_MERGE)).IsMerged(); + bool bDoMerge = static_cast<const ScMergeAttr&>( pData[nIndex].pPattern->GetItem(ATTR_MERGE)).IsMerged(); SCSIZE nRemove = 0; SCSIZE i; @@ -2231,15 +2231,15 @@ void ScAttrArray::CopyArea( { // default: nothing changed - pNewPattern = (const ScPatternAttr*) - &pDestDocPool->GetDefaultItem( ATTR_PATTERN ); + pNewPattern = static_cast<const ScPatternAttr*>( + &pDestDocPool->GetDefaultItem( ATTR_PATTERN )); } else if ( nStripFlags ) { boost::scoped_ptr<ScPatternAttr> pTmpPattern(new ScPatternAttr( *pOldPattern )); sal_Int16 nNewFlags = 0; if ( nStripFlags != SC_MF_ALL ) - nNewFlags = ((const ScMergeFlagAttr&)pTmpPattern->GetItem(ATTR_MERGE_FLAG)). + nNewFlags = static_cast<const ScMergeFlagAttr&>(pTmpPattern->GetItem(ATTR_MERGE_FLAG)). GetValue() & ~nStripFlags; if ( nNewFlags ) @@ -2248,14 +2248,14 @@ void ScAttrArray::CopyArea( pTmpPattern->GetItemSet().ClearItem( ATTR_MERGE_FLAG ); if (bSamePool) - pNewPattern = (ScPatternAttr*) &pDestDocPool->Put(*pTmpPattern); + pNewPattern = static_cast<const ScPatternAttr*>( &pDestDocPool->Put(*pTmpPattern) ); else pNewPattern = pTmpPattern->PutInPool( rAttrArray.pDocument, pDocument ); } else { if (bSamePool) - pNewPattern = (ScPatternAttr*) &pDestDocPool->Put(*pOldPattern); + pNewPattern = static_cast<const ScPatternAttr*>( &pDestDocPool->Put(*pOldPattern) ); else pNewPattern = pOldPattern->PutInPool( rAttrArray.pDocument, pDocument ); } @@ -2300,7 +2300,7 @@ void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttr const ScPatternAttr* pNewPattern; if (bSamePool) - pNewPattern = (ScPatternAttr*) &pDestDocPool->Put(*pOldPattern); + pNewPattern = static_cast<const ScPatternAttr*>( &pDestDocPool->Put(*pOldPattern) ); else pNewPattern = pOldPattern->PutInPool( rAttrArray.pDocument, pDocument ); diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index ce2600e915c7..1b37853c7d1d 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -124,8 +124,8 @@ bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" ); return (Which() == rItem.Which()) - && (nColMerge == ((ScMergeAttr&)rItem).nColMerge) - && (nRowMerge == ((ScMergeAttr&)rItem).nRowMerge); + && (nColMerge == static_cast<const ScMergeAttr&>(rItem).nColMerge) + && (nRowMerge == static_cast<const ScMergeAttr&>(rItem).nRowMerge); } SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const @@ -338,10 +338,10 @@ bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" ); return (Which() == rItem.Which()) - && (bProtection == ((ScProtectionAttr&)rItem).bProtection) - && (bHideFormula == ((ScProtectionAttr&)rItem).bHideFormula) - && (bHideCell == ((ScProtectionAttr&)rItem).bHideCell) - && (bHidePrint == ((ScProtectionAttr&)rItem).bHidePrint); + && (bProtection == static_cast<const ScProtectionAttr&>(rItem).bProtection) + && (bHideFormula == static_cast<const ScProtectionAttr&>(rItem).bHideFormula) + && (bHideCell == static_cast<const ScProtectionAttr&>(rItem).bHideCell) + && (bHidePrint == static_cast<const ScProtectionAttr&>(rItem).bHidePrint); } SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const @@ -395,7 +395,7 @@ bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); - return ( aRange == ( (ScRangeItem&)rAttr ).aRange ); + return aRange == static_cast<const ScRangeItem&>(rAttr).aRange; } SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const @@ -481,8 +481,8 @@ bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); - ScTableListItem& rCmp = (ScTableListItem&)rAttr; - bool bEqual = (nCount == rCmp.nCount); + const ScTableListItem& rCmp = static_cast<const ScTableListItem&>(rAttr); + bool bEqual = (nCount == rCmp.nCount); if ( nCount > 0 ) { @@ -641,7 +641,7 @@ bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScPageHFItem& r = (const ScPageHFItem&)rItem; + const ScPageHFItem& r = static_cast<const ScPageHFItem&>(rItem); return ScGlobal::EETextObjEqual(pLeftArea, r.pLeftArea) && ScGlobal::EETextObjEqual(pCenterArea, r.pCenterArea) @@ -949,7 +949,7 @@ OUString ScDoubleItem::GetValueText() const bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScDoubleItem& _rItem = (const ScDoubleItem&)rItem; + const ScDoubleItem& _rItem = static_cast<const ScDoubleItem&>(rItem); return nValue == _rItem.nValue; } diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index e0fb0ece7cfb..9aa35324235f 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -493,7 +493,7 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ) // true = keep old content - ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, true ); + const ScPatternAttr* pNewPattern = static_cast<const ScPatternAttr*>( &aCache.ApplyTo( *pPattern, true ) ); ScDocumentPool::CheckRef( *pPattern ); ScDocumentPool::CheckRef( *pNewPattern ); @@ -703,7 +703,7 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) const ScPatternAttr* pOldPattern = pAttrArray->GetPattern( nRow ); boost::scoped_ptr<ScPatternAttr> pTemp(new ScPatternAttr(*pOldPattern)); pTemp->GetItemSet().Put(rAttr); - const ScPatternAttr* pNewPattern = (const ScPatternAttr*) &pDocPool->Put( *pTemp ); + const ScPatternAttr* pNewPattern = static_cast<const ScPatternAttr*>( &pDocPool->Put( *pTemp ) ); if ( pNewPattern != pOldPattern ) pAttrArray->SetPattern( nRow, pNewPattern ); @@ -1704,7 +1704,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd ); while (pPattern) { - if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) + if ( static_cast<const ScMergeFlagAttr&>(pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) { DeleteArea( nStart, nEnd, IDF_CONTENTS ); sc::CopyToDocContext aCxt(*pDocument); @@ -1735,7 +1735,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd ); while (pPattern) { - if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) + if ( static_cast<const ScMergeFlagAttr&>(pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) { rDestCol.DeleteArea( nStart, nEnd, IDF_CONTENTS ); sc::CopyToDocContext aCxt(*rDestCol.pDocument); @@ -1765,7 +1765,7 @@ bool ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd ); while (pPattern && bOk) { - if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) + if ( static_cast<const ScMergeFlagAttr&>(pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) if ( rDestCol.pAttrArray->HasAttrib( nStart, nEnd, HASATTR_PROTECTED ) ) bOk = false; @@ -1783,7 +1783,7 @@ void ScColumn::MarkScenarioIn( ScMarkData& rDestMark ) const const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd ); while (pPattern) { - if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) + if ( static_cast<const ScMergeFlagAttr&>(pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() ) { aRange.aStart.SetRow( nStart ); aRange.aEnd.SetRow( nEnd ); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index b110be4c9673..f2a1803ed0a0 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -104,8 +104,8 @@ long ScColumn::GetNeededSize( // merged? // Do not merge in conditional formatting - const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); - const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); + const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(&pPattern->GetItem(ATTR_MERGE)); + const ScMergeFlagAttr* pFlag = static_cast<const ScMergeFlagAttr*>(&pPattern->GetItem(ATTR_MERGE_FLAG)); if ( bWidth ) { @@ -131,18 +131,18 @@ long ScColumn::GetNeededSize( SvxCellHorJustify eHorJust; if (pCondSet && pCondSet->GetItemState(ATTR_HOR_JUSTIFY, true, &pCondItem) == SfxItemState::SET) - eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem*)pCondItem)->GetValue(); + eHorJust = (SvxCellHorJustify)static_cast<const SvxHorJustifyItem*>(pCondItem)->GetValue(); else - eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) + eHorJust = (SvxCellHorJustify)static_cast<const SvxHorJustifyItem&>( pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); bool bBreak; if ( eHorJust == SVX_HOR_JUSTIFY_BLOCK ) bBreak = true; else if ( pCondSet && pCondSet->GetItemState(ATTR_LINEBREAK, true, &pCondItem) == SfxItemState::SET) - bBreak = ((const SfxBoolItem*)pCondItem)->GetValue(); + bBreak = static_cast<const SfxBoolItem*>(pCondItem)->GetValue(); else - bBreak = ((const SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue(); + bBreak = static_cast<const SfxBoolItem&>(pPattern->GetItem(ATTR_LINEBREAK)).GetValue(); SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); sal_uLong nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet ); @@ -179,7 +179,7 @@ long ScColumn::GetNeededSize( SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet ); bool bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED && - ((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN, pCondSet )).GetValue() ); + static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_VERTICAL_ASIAN, pCondSet )).GetValue() ); if ( bAsianVertical ) bBreak = false; @@ -192,16 +192,16 @@ long ScColumn::GetNeededSize( { if (pCondSet && pCondSet->GetItemState(ATTR_ROTATE_VALUE, true, &pCondItem) == SfxItemState::SET) - nRotate = ((const SfxInt32Item*)pCondItem)->GetValue(); + nRotate = static_cast<const SfxInt32Item*>(pCondItem)->GetValue(); else - nRotate = ((const SfxInt32Item&)pPattern->GetItem(ATTR_ROTATE_VALUE)).GetValue(); + nRotate =static_cast<const SfxInt32Item&>(pPattern->GetItem(ATTR_ROTATE_VALUE)).GetValue(); if ( nRotate ) { if (pCondSet && pCondSet->GetItemState(ATTR_ROTATE_MODE, true, &pCondItem) == SfxItemState::SET) - eRotMode = (SvxRotateMode)((const SvxRotateModeItem*)pCondItem)->GetValue(); + eRotMode = (SvxRotateMode)static_cast<const SvxRotateModeItem*>(pCondItem)->GetValue(); else - eRotMode = (SvxRotateMode)((const SvxRotateModeItem&) + eRotMode = (SvxRotateMode)static_cast<const SvxRotateModeItem&>( pPattern->GetItem(ATTR_ROTATE_MODE)).GetValue(); if ( nRotate == 18000 ) @@ -220,17 +220,17 @@ long ScColumn::GetNeededSize( const SvxMarginItem* pMargin; if (pCondSet && pCondSet->GetItemState(ATTR_MARGIN, true, &pCondItem) == SfxItemState::SET) - pMargin = (const SvxMarginItem*) pCondItem; + pMargin = static_cast<const SvxMarginItem*>(pCondItem); else - pMargin = (const SvxMarginItem*) &pPattern->GetItem(ATTR_MARGIN); + pMargin = static_cast<const SvxMarginItem*>(&pPattern->GetItem(ATTR_MARGIN)); sal_uInt16 nIndent = 0; if ( eHorJust == SVX_HOR_JUSTIFY_LEFT ) { if (pCondSet && pCondSet->GetItemState(ATTR_INDENT, true, &pCondItem) == SfxItemState::SET) - nIndent = ((const SfxUInt16Item*)pCondItem)->GetValue(); + nIndent = static_cast<const SfxUInt16Item*>(pCondItem)->GetValue(); else - nIndent = ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue(); + nIndent = static_cast<const SfxUInt16Item&>(pPattern->GetItem(ATTR_INDENT)).GetValue(); } sal_uInt8 nScript = pDocument->GetScriptType(nCol, nRow, nTab); @@ -378,7 +378,7 @@ long ScColumn::GetNeededSize( // no longer needed, are setted with the text (is faster) // pEngine->SetDefaults( pSet ); - if ( ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { + if ( static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); @@ -549,7 +549,7 @@ long ScColumn::GetNeededSize( // 20 * nZoom/100 // Conditional formatting is not interesting here - sal_Int16 nFlags = ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue(); + sal_Int16 nFlags = static_cast<const ScMergeFlagAttr&>(pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue(); if (nFlags & SC_MF_AUTO) nValue += (rZoomX.numerator()*20)/rZoomX.denominator(); } @@ -644,7 +644,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth( // font color doesn't matter here pPattern->GetFont( aFont, SC_AUTOCOL_BLACK, pDev, &rZoomX, NULL ); pDev->SetFont( aFont ); - const SvxMarginItem* pMargin = (const SvxMarginItem*) &pPattern->GetItem(ATTR_MARGIN); + const SvxMarginItem* pMargin = static_cast<const SvxMarginItem*>(&pPattern->GetItem(ATTR_MARGIN)); long nMargin = (long) ( pMargin->GetLeftMargin() * nPPTX ) + (long) ( pMargin->GetRightMargin() * nPPTX ); @@ -745,7 +745,7 @@ static sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern, sal_uInt16 sal_uInt16 nHeight = rFontHeight.GetHeight(); nHeight *= 1.18; - if ( ((const SvxEmphasisMarkItem&)rPattern. + if ( static_cast<const SvxEmphasisMarkItem&>(rPattern. GetItem(ATTR_FONT_EMPHASISMARK)).GetEmphasisMark() != EMPHASISMARK_NONE ) { // add height for emphasis marks @@ -787,8 +787,8 @@ void ScColumn::GetOptimalHeight( const ScPatternAttr* pPattern = aIter.Next(nStart,nEnd); while ( pPattern ) { - const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); - const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); + const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(&pPattern->GetItem(ATTR_MERGE)); + const ScMergeFlagAttr* pFlag = static_cast<const ScMergeFlagAttr*>(&pPattern->GetItem(ATTR_MERGE_FLAG)); if ( pMerge->GetRowMerge() > 1 || pFlag->IsOverlapped() ) { // do nothing - vertically with merged and overlapping, @@ -801,8 +801,8 @@ void ScColumn::GetOptimalHeight( bool bStdOnly = false; if (bStdAllowed) { - bool bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() || - ((SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern-> + bool bBreak = static_cast<const SfxBoolItem&>(pPattern->GetItem(ATTR_LINEBREAK)).GetValue() || + ((SvxCellHorJustify)static_cast<const SvxHorJustifyItem&>(pPattern-> GetItem( ATTR_HOR_JUSTIFY )).GetValue() == SVX_HOR_JUSTIFY_BLOCK); bStdOnly = !bBreak; @@ -816,7 +816,7 @@ void ScColumn::GetOptimalHeight( } // rotated text: loop all cells - if ( bStdOnly && ((const SfxInt32Item&)pPattern-> + if ( bStdOnly && static_cast<const SfxInt32Item&>(pPattern-> GetItem(ATTR_ROTATE_VALUE)).GetValue() ) bStdOnly = false; } diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 225276a24d2f..f3c7a5adf362 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2289,7 +2289,7 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW nEndRow ) const ScPatternAttr* pPattern = aAttrIter.Next( nTop, nBottom ); while (pPattern) { - const ScProtectionAttr* pAttr = (const ScProtectionAttr*)&pPattern->GetItem(ATTR_PROTECTION); + const ScProtectionAttr* pAttr = static_cast<const ScProtectionAttr*>(&pPattern->GetItem(ATTR_PROTECTION)); if ( pAttr->GetHideCell() ) DeleteArea( nTop, nBottom, IDF_CONTENTS ); else if ( pAttr->GetHideFormula() ) diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index aa28bf9d7b86..d8f779e8699d 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -657,7 +657,7 @@ void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle ) sal_uInt32 nCount = GetItemCount2(ATTR_PATTERN); for (sal_uInt32 i=0; i<nCount; i++) { - ScPatternAttr* pPattern = (ScPatternAttr*)GetItem2(ATTR_PATTERN, i); + ScPatternAttr* pPattern = const_cast<ScPatternAttr*>(static_cast<const ScPatternAttr*>(GetItem2(ATTR_PATTERN, i))); if ( pPattern && pPattern->GetStyleSheet() == pStyle ) pPattern->StyleToName(); } @@ -699,12 +699,12 @@ static bool lcl_HFPresentation const IntlWrapper* pIntl ) { - const SfxItemSet& rSet = ((const SfxSetItem&)rItem).GetItemSet(); + const SfxItemSet& rSet = static_cast<const SfxSetItem&>(rItem).GetItemSet(); const SfxPoolItem* pItem; if ( SfxItemState::SET == rSet.GetItemState(ATTR_PAGE_ON,false,&pItem) ) { - if( false == ((const SfxBoolItem*)pItem)->GetValue() ) + if( false == static_cast<const SfxBoolItem*>(pItem)->GetValue() ) return false; } @@ -728,7 +728,7 @@ static bool lcl_HFPresentation case ATTR_LRSPACE: { - SvxLRSpaceItem& rLRItem = (SvxLRSpaceItem&)*pItem; + const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>(*pItem); sal_uInt16 nPropLeftMargin = rLRItem.GetPropLeft(); sal_uInt16 nPropRightMargin = rLRItem.GetPropRight(); sal_uInt16 nLeftMargin, nRightMargin; @@ -805,39 +805,39 @@ bool ScDocumentPool::GetPresentation( { case ATTR_PAGE_TOPDOWN: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_PRINTDIR) + aStrSep; - rText += ((const SfxBoolItem&)rItem).GetValue() ? + rText += static_cast<const SfxBoolItem&>(rItem).GetValue() ? ScGlobal::GetRscString(STR_SCATTR_PAGE_TOPDOWN) : ScGlobal::GetRscString(STR_SCATTR_PAGE_LEFTRIGHT) ; break; case ATTR_PAGE_HEADERS: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_HEADERS) + aStrSep; - rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; + rText += static_cast<const SfxBoolItem&>(rItem).GetValue() ? aStrYes : aStrNo ; break; case ATTR_PAGE_NULLVALS: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NULLVALS) + aStrSep; - rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; + rText += static_cast<const SfxBoolItem&>(rItem).GetValue() ? aStrYes : aStrNo ; break; case ATTR_PAGE_FORMULAS: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FORMULAS) + aStrSep; - rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; + rText += static_cast<const SfxBoolItem&>(rItem).GetValue() ? aStrYes : aStrNo ; break; case ATTR_PAGE_NOTES: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NOTES) + aStrSep; - rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; + rText += static_cast<const SfxBoolItem&>(rItem).GetValue() ? aStrYes : aStrNo ; break; case ATTR_PAGE_GRID: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_GRID) + aStrSep; - rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; + rText += static_cast<const SfxBoolItem&>(rItem).GetValue() ? aStrYes : aStrNo ; break; case ATTR_PAGE_SCALETOPAGES: { - sal_uInt16 nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); + sal_uInt16 nPagNo = static_cast<const SfxUInt16Item&>(rItem).GetValue(); if( nPagNo ) { @@ -855,7 +855,7 @@ bool ScDocumentPool::GetPresentation( case ATTR_PAGE_FIRSTPAGENO: { - sal_uInt16 nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); + sal_uInt16 nPagNo = static_cast<const SfxUInt16Item&>(rItem).GetValue(); if( nPagNo ) { @@ -871,7 +871,7 @@ bool ScDocumentPool::GetPresentation( case ATTR_PAGE_SCALE: { - sal_uInt16 nPercent = ((const SfxUInt16Item&)rItem).GetValue(); + sal_uInt16 nPercent = static_cast<const SfxUInt16Item &>(rItem).GetValue(); if( nPercent ) { diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index fdce24063336..d9ab457200f0 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1253,10 +1253,10 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder) } } if ( eType == SC_CAT_MOVE && - ((const ScChangeActionMove*)pAction)-> + static_cast<const ScChangeActionMove*>(pAction)-> GetFromRange().aStart.Tab() == cell.Col() ) { - ScRange aRange = ((const ScChangeActionMove*)pAction)-> + ScRange aRange = static_cast<const ScChangeActionMove*>(pAction)-> GetFromRange().MakeRange(); if (ScViewUtil::IsActionShown( *pAction, *pSettings, *this ) ) { @@ -1325,7 +1325,7 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aT if ( eType == SC_CAT_MOVE ) { ScRange aRange = - ((const ScChangeActionMove*)pAction)-> + static_cast<const ScChangeActionMove*>(pAction)-> GetFromRange().MakeRange(); if ( aRange.In( aCellPos ) ) { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 739b1f34dc20..453c8d6d6758 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1410,7 +1410,7 @@ bool ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab ) for ( nCol=aParam.nCol1; nCol<=aParam.nCol2 && bHasAutoFilter; nCol++ ) { - nFlag = ((ScMergeFlagAttr*) + nFlag = static_cast<const ScMergeFlagAttr*>( GetAttr( nCol, nRow, nCurTab, ATTR_MERGE_FLAG ))-> GetValue(); @@ -1972,8 +1972,8 @@ void ScDocument::DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, void ScDocument::RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ) { - const ScMergeAttr* pAttr = (const ScMergeAttr*) - GetAttr( nCol, nRow, nTab, ATTR_MERGE ); + const ScMergeAttr* pAttr = static_cast<const ScMergeAttr*>( + GetAttr( nCol, nRow, nTab, ATTR_MERGE )); if ( pAttr->GetColMerge() <= 1 && pAttr->GetRowMerge() <= 1 ) return; @@ -1983,8 +1983,8 @@ void ScDocument::RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ) RemoveFlagsTab( nCol, nRow, nEndCol, nEndRow, nTab, SC_MF_HOR | SC_MF_VER ); - const ScMergeAttr* pDefAttr = (const ScMergeAttr*) - &xPoolHelper->GetDocPool()->GetDefaultItem( ATTR_MERGE ); + const ScMergeAttr* pDefAttr = static_cast<const ScMergeAttr*>( + &xPoolHelper->GetDocPool()->GetDefaultItem( ATTR_MERGE )); ApplyAttr( nCol, nRow, nTab, *pDefAttr ); } diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index b3a9813945dd..6c89a6fde441 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -131,10 +131,10 @@ void ScDocument::UpdateAllCharts() { if ( pObject->GetObjIdentifier() == OBJ_OLE2 ) { - uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pObject)->GetObjRef(); + uno::Reference< embed::XEmbeddedObject > xIPObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); if ( xIPObj.is() ) { - OUString aIPName = ((SdrOle2Obj*)pObject)->GetPersistName(); + OUString aIPName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); for (size_t nPos = 0; nPos < nDataCount; ++nPos) { @@ -242,7 +242,7 @@ uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const OUStr while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName ) + OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rChartName ) { xReturn.set( ScChartHelper::GetChartFromSdrObject( pObject ) ); return xReturn; @@ -307,7 +307,7 @@ void ScDocument::GetOldChartParameters( const OUString& rName, while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rName ) + OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rName ) { uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) ); if ( xChartDoc.is() ) @@ -354,7 +354,7 @@ void ScDocument::UpdateChartArea( const OUString& rChartName, while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName ) + OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rChartName ) { uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) ); uno::Reference< chart2::data::XDataReceiver > xReceiver( xChartDoc, uno::UNO_QUERY ); @@ -590,7 +590,7 @@ void ScDocument::SetChartRangeList( const OUString& rChartName, while (pObject) { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && - OUString(((SdrOle2Obj*)pObject)->GetPersistName()) == rChartName ) + OUString(static_cast<SdrOle2Obj*>(pObject)->GetPersistName()) == rChartName ) { uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) ); uno::Reference< chart2::data::XDataReceiver > xReceiver( xChartDoc, uno::UNO_QUERY ); @@ -689,7 +689,7 @@ void ScDocument::UpdateChartListenerCollection() if ( pObject->GetObjIdentifier() != OBJ_OLE2 ) continue; - OUString aObjName = ((SdrOle2Obj*)pObject)->GetPersistName(); + OUString aObjName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); ScChartListener* pListener = pChartListenerCollection->findByName(aObjName); if (pListener) @@ -700,7 +700,7 @@ void ScDocument::UpdateChartListenerCollection() } else { - uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pObject)->GetObjRef(); + uno::Reference< embed::XEmbeddedObject > xIPObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); OSL_ENSURE( xIPObj.is(), "No embedded object is given!"); uno::Reference< ::com::sun::star::chart2::data::XDataReceiver > xReceiver; uno::Reference< embed::XComponentSupplier > xCompSupp( xIPObj, uno::UNO_QUERY ); diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index a9a51fdfe94b..772b8b8e6068 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -142,7 +142,7 @@ sal_uInt8 ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab ) const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab ); if (!pPattern) return 0; const SfxItemSet* pCondSet = NULL; - if ( !((const ScCondFormatItem&)pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData().empty() ) + if ( !static_cast<const ScCondFormatItem&>(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData().empty() ) pCondSet = GetCondResult( nCol, nRow, nTab ); sal_uLong nFormat = pPattern->GetNumberFormat( xPoolHelper->GetFormTable(), pCondSet ); diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index bc0b478ebea8..fbc0f191e871 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -256,10 +256,10 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, maTabs[nTab]->SetStreamValid( false ); sal_uLong nOldFormat = - ((const SfxUInt32Item*)&rSet.Get( + static_cast<const SfxUInt32Item*>(&rSet.Get( ATTR_VALUE_FORMAT ))->GetValue(); sal_uLong nNewFormat = - ((const SfxUInt32Item*)&rChanges.Get( + static_cast<const SfxUInt32Item*>(&rChanges.Get( ATTR_VALUE_FORMAT ))->GetValue(); LanguageType eNewLang, eOldLang; eNewLang = eOldLang = LANGUAGE_DONTKNOW; @@ -375,7 +375,7 @@ sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const { SfxItemSet& rStyleSet = pStyle->GetItemSet(); SvxFrameDirection eDirection = (SvxFrameDirection) - ((const SvxFrameDirectionItem&)rStyleSet.Get( ATTR_WRITINGDIR )).GetValue(); + static_cast<const SvxFrameDirectionItem&>(rStyleSet.Get( ATTR_WRITINGDIR )).GetValue(); if ( eDirection == FRMDIR_HORI_LEFT_TOP ) eRet = EE_HTEXTDIR_L2R; @@ -557,7 +557,7 @@ bool ScDocument::IdleCalcTextWidth() // true = demnaechst wieder vers aScope.setTab(0); ScTable* pTab = maTabs[aScope.Tab()]; - ScStyleSheet* pStyle = (ScStyleSheet*)aScope.getStylePool()->Find(pTab->aPageStyle, SFX_STYLE_FAMILY_PAGE); + ScStyleSheet* pStyle = static_cast<ScStyleSheet*>(aScope.getStylePool()->Find(pTab->aPageStyle, SFX_STYLE_FAMILY_PAGE)); OSL_ENSURE( pStyle, "Missing StyleSheet :-/" ); if (!pStyle || getScaleValue(*pStyle, ATTR_PAGE_SCALETOPAGES) == 0) @@ -644,8 +644,8 @@ bool ScDocument::IdleCalcTextWidth() // true = demnaechst wieder vers if ( bNewTab ) { pTab = maTabs[aScope.Tab()]; - pStyle = (ScStyleSheet*)aScope.getStylePool()->Find( - pTab->aPageStyle, SFX_STYLE_FAMILY_PAGE); + pStyle = static_cast<ScStyleSheet*>(aScope.getStylePool()->Find( + pTab->aPageStyle, SFX_STYLE_FAMILY_PAGE)); if ( pStyle ) { @@ -726,7 +726,7 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const { ::sfx2::SvBaseLink* pBase = *rLinks[i]; if (pBase->ISA(ScDdeLink)) - if ( !bExport40 || ((ScDdeLink*)pBase)->GetMode() == SC_DDE_DEFAULT ) + if ( !bExport40 || static_cast<ScDdeLink*>(pBase)->GetMode() == SC_DDE_DEFAULT ) ++nDdeCount; } @@ -742,7 +742,7 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const ::sfx2::SvBaseLink* pBase = *rLinks[i]; if (pBase->ISA(ScDdeLink)) { - ScDdeLink* pLink = (ScDdeLink*)pBase; + ScDdeLink* pLink = static_cast<ScDdeLink*>(pBase); if ( !bExport40 || pLink->GetMode() == SC_DDE_DEFAULT ) pLink->Store( rStream, aHdr ); } @@ -1089,7 +1089,7 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, ::sfx2::SvBaseLink* pBase = *rLinks[i]; if (pBase->ISA(ScAreaLink)) { - ScAreaLink* pLink = (ScAreaLink*) pBase; + ScAreaLink* pLink = static_cast<ScAreaLink*>(pBase); ScRange aOutRange = pLink->GetDestArea(); SCCOL nCol1 = aOutRange.aStart.Col(); @@ -1284,7 +1284,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp sal_uInt16 nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE : ( ( nScript == SCRIPTTYPE_COMPLEX ) ? ATTR_CTL_FONT_LANGUAGE : ATTR_FONT_LANGUAGE ); - nLanguage = ((const SvxLanguageItem*)GetAttr( nCol, nRow, nTab, nWhich ))->GetValue(); + nLanguage = static_cast<const SvxLanguageItem*>(GetAttr( nCol, nRow, nTab, nWhich ))->GetValue(); } uno::Sequence<sal_Int32> aOffsets; diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 629313d6992d..8a23df160cf5 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -226,7 +226,7 @@ bool ScDocument::IsChart( const SdrObject* pObject ) // IsChart() implementation moved to svx drawinglayer if(pObject && OBJ_OLE2 == pObject->GetObjIdentifier()) { - return ((SdrOle2Obj*)pObject)->IsChart(); + return static_cast<const SdrOle2Obj*>(pObject)->IsChart(); } return false; @@ -234,7 +234,7 @@ bool ScDocument::IsChart( const SdrObject* pObject ) IMPL_LINK_INLINE_START( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex ) { - return (sal_IntPtr) &((GetColorList()->GetColor(*pColorIndex))->GetColor()); + return reinterpret_cast<sal_IntPtr>( &((GetColorList()->GetColor(*pColorIndex))->GetColor()) ); } IMPL_LINK_INLINE_END( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex ) @@ -350,7 +350,7 @@ void ScDocument::StartAnimations( SCTAB nTab, vcl::Window* pWin ) { if (pObject->ISA(SdrGrafObj)) { - SdrGrafObj* pGrafObj = (SdrGrafObj*)pObject; + SdrGrafObj* pGrafObj = static_cast<SdrGrafObj*>(pObject); if ( pGrafObj->IsAnimated() ) { const Rectangle& rRect = pGrafObj->GetCurrentBoundRect(); @@ -591,7 +591,7 @@ void ScDocument::UpdateFontCharSet() nCount = pPool->GetItemCount2(ATTR_FONT); for (i=0; i<nCount; i++) { - pItem = (SvxFontItem*)pPool->GetItem2(ATTR_FONT, i); + pItem = const_cast<SvxFontItem*>(static_cast<const SvxFontItem*>(pPool->GetItem2(ATTR_FONT, i))); if ( pItem && ( pItem->GetCharSet() == eSrcSet || ( bUpdateOld && pItem->GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) pItem->SetCharSet(eSysSet); @@ -603,7 +603,7 @@ void ScDocument::UpdateFontCharSet() nCount = rDrawPool.GetItemCount2(EE_CHAR_FONTINFO); for (i=0; i<nCount; i++) { - pItem = (SvxFontItem*)rDrawPool.GetItem2(EE_CHAR_FONTINFO, i); + pItem = const_cast<SvxFontItem*>(static_cast<const SvxFontItem*>(rDrawPool.GetItem2(EE_CHAR_FONTINFO, i))); if ( pItem && ( pItem->GetCharSet() == eSrcSet || ( bUpdateOld && pItem->GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) pItem->SetCharSet( eSysSet ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index e7d78e6c89c9..592bb3d3cec8 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4804,7 +4804,7 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, for (sal_uInt32 nItem=0; nItem<nDirCount; nItem++) { const SfxPoolItem* pItem = pPool->GetItem2( ATTR_WRITINGDIR, nItem ); - if ( pItem && ((const SvxFrameDirectionItem*)pItem)->GetValue() == FRMDIR_HORI_RIGHT_TOP ) + if ( pItem && static_cast<const SvxFrameDirectionItem*>(pItem)->GetValue() == FRMDIR_HORI_RIGHT_TOP ) { bHasRtl = true; break; @@ -4867,7 +4867,7 @@ void ScDocument::GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, { //! Seitengrenzen fuer Druck beruecksichtigen !!!!! - const SvxBoxItem* pThisAttr = (const SvxBoxItem*) GetEffItem( nCol, nRow, nTab, ATTR_BORDER ); + const SvxBoxItem* pThisAttr = static_cast<const SvxBoxItem*>( GetEffItem( nCol, nRow, nTab, ATTR_BORDER ) ); OSL_ENSURE(pThisAttr,"where is the attribute?"); const SvxBorderLine* pLeftLine = pThisAttr->GetLeft(); @@ -4877,28 +4877,28 @@ void ScDocument::GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( nCol > 0 ) { - const SvxBorderLine* pOther = ((const SvxBoxItem*) + const SvxBorderLine* pOther = static_cast<const SvxBoxItem*>( GetEffItem( nCol-1, nRow, nTab, ATTR_BORDER ))->GetRight(); if ( ScHasPriority( pOther, pLeftLine ) ) pLeftLine = pOther; } if ( nRow > 0 ) { - const SvxBorderLine* pOther = ((const SvxBoxItem*) + const SvxBorderLine* pOther = static_cast<const SvxBoxItem*>( GetEffItem( nCol, nRow-1, nTab, ATTR_BORDER ))->GetBottom(); if ( ScHasPriority( pOther, pTopLine ) ) pTopLine = pOther; } if ( nCol < MAXCOL ) { - const SvxBorderLine* pOther = ((const SvxBoxItem*) + const SvxBorderLine* pOther = static_cast<const SvxBoxItem*>( GetEffItem( nCol+1, nRow, nTab, ATTR_BORDER ))->GetLeft(); if ( ScHasPriority( pOther, pRightLine ) ) pRightLine = pOther; } if ( nRow < MAXROW ) { - const SvxBorderLine* pOther = ((const SvxBoxItem*) + const SvxBorderLine* pOther = static_cast<const SvxBoxItem*>( GetEffItem( nCol, nRow+1, nTab, ATTR_BORDER ))->GetTop(); if ( ScHasPriority( pOther, pBottomLine ) ) pBottomLine = pOther; @@ -5096,7 +5096,7 @@ bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nOldCol = rStartCol; SCROW nOldRow = rStartRow; for (nCol=nOldCol; nCol<=nEndCol; nCol++) - while (((ScMergeFlagAttr*)GetAttr(nCol,rStartRow,nTab,ATTR_MERGE_FLAG))-> + while (static_cast<const ScMergeFlagAttr*>(GetAttr(nCol,rStartRow,nTab,ATTR_MERGE_FLAG))-> IsVerOverlapped()) --rStartRow; @@ -5110,7 +5110,7 @@ bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, { OSL_ENSURE( nIndex < pAttrArray->nCount, "Wrong index in AttrArray" ); - if (((ScMergeFlagAttr&)pAttrArray->pData[nIndex].pPattern-> + if (static_cast<const ScMergeFlagAttr&>(pAttrArray->pData[nIndex].pPattern-> GetItem(ATTR_MERGE_FLAG)).IsHorOverlapped()) { SCROW nLoopEndRow = std::min( nEndRow, pAttrArray->pData[nIndex].nRow ); @@ -5119,7 +5119,7 @@ bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nTempCol = nOldCol; do --nTempCol; - while (((ScMergeFlagAttr*)GetAttr(nTempCol,nAttrRow,nTab,ATTR_MERGE_FLAG)) + while (static_cast<const ScMergeFlagAttr*>(GetAttr(nTempCol,nAttrRow,nTab,ATTR_MERGE_FLAG)) ->IsHorOverlapped()); if (nTempCol < rStartCol) rStartCol = nTempCol; @@ -5343,8 +5343,8 @@ void ScDocument::SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const bool ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { - const ScMergeFlagAttr* pAttr = (const ScMergeFlagAttr*) - GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ); + const ScMergeFlagAttr* pAttr = static_cast<const ScMergeFlagAttr*>( + GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG )); if (pAttr) return pAttr->IsHorOverlapped(); else @@ -5356,8 +5356,8 @@ bool ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const bool ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { - const ScMergeFlagAttr* pAttr = (const ScMergeFlagAttr*) - GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ); + const ScMergeFlagAttr* pAttr = static_cast<const ScMergeFlagAttr*>( + GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG )); if (pAttr) return pAttr->IsVerOverlapped(); else @@ -5475,7 +5475,7 @@ void ScDocument::DeleteSelectionTab( ScPatternAttr* ScDocument::GetDefPattern() const { - return (ScPatternAttr*) &xPoolHelper->GetDocPool()->GetDefaultItem(ATTR_PATTERN); + return const_cast<ScPatternAttr*>(static_cast<const ScPatternAttr*>(&xPoolHelper->GetDocPool()->GetDefaultItem(ATTR_PATTERN))); } ScDocumentPool* ScDocument::GetPool() @@ -5534,11 +5534,11 @@ void ScDocument::UpdStlShtPtrsFrmNms() ScPatternAttr* pPattern; for (sal_uInt32 i=0; i<nCount; i++) { - pPattern = (ScPatternAttr*)pPool->GetItem2(ATTR_PATTERN, i); + pPattern = const_cast<ScPatternAttr*>(static_cast<const ScPatternAttr*>(pPool->GetItem2(ATTR_PATTERN, i))); if (pPattern) pPattern->UpdateStyleSheet(this); } - ((ScPatternAttr&)pPool->GetDefaultItem(ATTR_PATTERN)).UpdateStyleSheet(this); + const_cast<ScPatternAttr&>(static_cast<const ScPatternAttr&>(pPool->GetDefaultItem(ATTR_PATTERN))).UpdateStyleSheet(this); } void ScDocument::StylesToNames() @@ -5549,11 +5549,11 @@ void ScDocument::StylesToNames() ScPatternAttr* pPattern; for (sal_uInt32 i=0; i<nCount; i++) { - pPattern = (ScPatternAttr*)pPool->GetItem2(ATTR_PATTERN, i); + pPattern = const_cast<ScPatternAttr*>(static_cast<const ScPatternAttr*>(pPool->GetItem2(ATTR_PATTERN, i))); if (pPattern) pPattern->StyleToName(); } - ((ScPatternAttr&)pPool->GetDefaultItem(ATTR_PATTERN)).StyleToName(); + const_cast<ScPatternAttr&>(static_cast<const ScPatternAttr&>(pPool->GetDefaultItem(ATTR_PATTERN))).StyleToName(); } sal_uLong ScDocument::GetCellCount() const @@ -5767,7 +5767,7 @@ bool ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const if ( pStyle ) { const SfxItemSet& rSet = pStyle->GetItemSet(); - sal_uInt16 nFirst = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_FIRSTPAGENO)).GetValue(); + sal_uInt16 nFirst = static_cast<const SfxUInt16Item&>(rSet.Get(ATTR_PAGE_FIRSTPAGENO)).GetValue(); if ( nFirst != 0 ) return true; // Seitennummer in neuer Vorlage angegeben } diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index 5b286ec146b4..7fcd4daedfef 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -278,7 +278,7 @@ std::vector<Color> ScDocument::GetDocColors() case ATTR_FONT_COLOR: case ATTR_BACKGROUND: { - Color aColor( ((SvxColorItem*)pItem)->GetValue() ); + Color aColor( static_cast<const SvxColorItem*>(pItem)->GetValue() ); if( COL_AUTO != aColor.GetColor() && std::find(docColors.begin(), docColors.end(), aColor) == docColors.end() ) { diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 64d072b245eb..2435d4072505 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -948,7 +948,7 @@ ScRange ScDPObject::GetOutputRangeByType( sal_Int32 nType ) const static bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { - return ((const ScMergeFlagAttr*)pDoc->GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ))->HasPivotButton(); + return static_cast<const ScMergeFlagAttr*>(pDoc->GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ))->HasPivotButton(); } void ScDPObject::RefreshAfterLoad() diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index a110a74241a0..e903681b2e29 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -287,13 +287,13 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, OUString aStyleName = ScGlobal::GetRscString( nStrId ); ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); - ScStyleSheet* pStyle = (ScStyleSheet*) pStlPool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); + ScStyleSheet* pStyle = static_cast<ScStyleSheet*>( pStlPool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ) ); if (!pStyle) { // create new style (was in ScPivot::SetStyle) - pStyle = (ScStyleSheet*) &pStlPool->Make( aStyleName, SFX_STYLE_FAMILY_PARA, - SFXSTYLEBIT_USERDEF ); + pStyle = static_cast<ScStyleSheet*>( &pStlPool->Make( aStyleName, SFX_STYLE_FAMILY_PARA, + SFXSTYLEBIT_USERDEF ) ); pStyle->SetParent( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); SfxItemSet& rSet = pStyle->GetItemSet(); if ( nStrId==STR_PIVOT_STYLE_RESULT || nStrId==STR_PIVOT_STYLE_TITLE ) diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index c51b58fef8b2..bb309b72bea6 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -202,7 +202,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : SetObjectShell( pObjSh ); // set color table - SvxColorListItem* pColItem = (SvxColorListItem*) pObjSh->GetItem( SID_COLOR_TABLE ); + const SvxColorListItem* pColItem = static_cast<const SvxColorListItem*>( pObjSh->GetItem( SID_COLOR_TABLE ) ); if ( pColItem ) pXCol = pColItem->GetColorList(); } @@ -334,7 +334,7 @@ bool ScDrawLayer::ScAddPage( SCTAB nTab ) if (bDrawIsInUndo) return false; // not inserted - ScDrawPage* pPage = (ScDrawPage*)AllocPage( false ); + ScDrawPage* pPage = static_cast<ScDrawPage*>(AllocPage( false )); InsertPage(pPage, static_cast<sal_uInt16>(nTab)); if (bRecording) AddCalcUndo(new SdrUndoNewPage(*pPage)); @@ -363,7 +363,7 @@ void ScDrawLayer::ScRemovePage( SCTAB nTab ) void ScDrawLayer::ScRenamePage( SCTAB nTab, const OUString& rNewName ) { - ScDrawPage* pPage = (ScDrawPage*) GetPage(static_cast<sal_uInt16>(nTab)); + ScDrawPage* pPage = static_cast<ScDrawPage*>( GetPage(static_cast<sal_uInt16>(nTab)) ); if (pPage) pPage->SetName(rNewName); } @@ -1467,7 +1467,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const if ( pNewObject->GetObjIdentifier() == OBJ_OLE2 ) { - uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pNewObject)->GetObjRef(); + uno::Reference< embed::XEmbeddedObject > xIPObj = static_cast<SdrOle2Obj*>(pNewObject)->GetObjRef(); uno::Reference< embed::XClassifiedObject > xClassified( xIPObj, uno::UNO_QUERY ); SvGlobalName aObjectClassName; if ( xClassified.is() ) @@ -1485,7 +1485,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const uno::Reference< chart2::XChartDocument > xNewChart( ScChartHelper::GetChartFromSdrObject( pNewObject ) ); if( xNewChart.is() && !xNewChart->hasInternalDataProvider() ) { - OUString aChartName = ((SdrOle2Obj*)pNewObject)->GetPersistName(); + OUString aChartName = static_cast<SdrOle2Obj*>(pNewObject)->GetPersistName(); ::std::vector< ScRangeList > aRangesVector; pDoc->GetChartRanges( aChartName, aRangesVector, pDoc ); if( !aRangesVector.empty() ) @@ -1880,7 +1880,7 @@ ScDrawObjData* ScDrawLayer::GetNonRotatedObjData( SdrObject* pObj, bool bCreate { SdrObjUserData* pData = pObj->GetUserData( i ); if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == SC_UD_OBJDATA && ++nFound == 2 ) - return (ScDrawObjData*)pData; + return static_cast<ScDrawObjData*>(pData); } if( pObj && bCreate ) { @@ -1894,7 +1894,7 @@ ScDrawObjData* ScDrawLayer::GetNonRotatedObjData( SdrObject* pObj, bool bCreate ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, bool bCreate ) { if (SdrObjUserData *pData = GetFirstUserDataOfType(pObj, SC_UD_OBJDATA)) - return (ScDrawObjData*) pData; + return static_cast<ScDrawObjData*>(pData); if( pObj && bCreate ) { @@ -1932,7 +1932,7 @@ ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab ) ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) { - return (ScIMapInfo*)GetFirstUserDataOfType(pObj, SC_UD_IMAPDATA); + return static_cast<ScIMapInfo*>(GetFirstUserDataOfType(pObj, SC_UD_IMAPDATA)); } IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, @@ -1954,7 +1954,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt { - const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj; + const SdrGrafObj* pGrafObj = static_cast<const SdrGrafObj*>( pObj ); const GeoStat& rGeo = pGrafObj->GetGeoStat(); const Graphic& rGraphic = pGrafObj->GetGraphic(); @@ -1963,7 +1963,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, RotatePoint( aRelPoint, aLogRect.TopLeft(), -rGeo.nSin, rGeo.nCos ); // Spiegelung rueckgaengig - if ( ( (const SdrGrafObjGeoData*) pGrafObj->GetGeoData() )->bMirrored ) + if ( static_cast<const SdrGrafObjGeoData*>( pGrafObj->GetGeoData() )->bMirrored ) aRelPoint.X() = aLogRect.Right() + aLogRect.Left() - aRelPoint.X(); // ggf. Unshear: @@ -1983,7 +1983,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt { // TODO/LEAN: working with visual area needs running state - aGraphSize = ((const SdrOle2Obj*)pObj)->GetOrigObjSize(); + aGraphSize = static_cast<const SdrOle2Obj*>(pObj)->GetOrigObjSize(); bObjSupported = true; } @@ -2002,7 +2002,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, bool bCreate ) { if (SdrObjUserData *pData = GetFirstUserDataOfType(pObj, SC_UD_MACRODATA)) - return (ScMacroInfo*) pData; + return static_cast<ScMacroInfo*>(pData); if ( bCreate ) { diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 3688412da328..294020c51301 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -78,7 +78,7 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, } else { - sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr( + sal_uInt16 nOverlap = static_cast<const ScMergeFlagAttr*>(pDoc->GetAttr( rStartX, rStartY, nTab, ATTR_MERGE_FLAG ))->GetValue(); bHOver = ((nOverlap & SC_MF_HOR) != 0); bVOver = ((nOverlap & SC_MF_VER) != 0); @@ -101,7 +101,7 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, } else { - sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr( + sal_uInt16 nOverlap = static_cast<const ScMergeFlagAttr*>(pDoc->GetAttr( rStartX, rStartY, nTab, ATTR_MERGE_FLAG ))->GetValue(); bVOver = ((nOverlap & SC_MF_VER) != 0); } @@ -113,11 +113,11 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, !pDoc->RowHidden(rStartY, nTab, NULL, &nLastRow) && (SCsROW) pRowInfo[nArrY].nRowNo == rStartY) { - pMerge = (const ScMergeAttr*) &pRowInfo[nArrY].pCellInfo[rStartX+1].pPatternAttr-> - GetItem(ATTR_MERGE); + pMerge = static_cast<const ScMergeAttr*>( &pRowInfo[nArrY].pCellInfo[rStartX+1].pPatternAttr-> + GetItem(ATTR_MERGE)); } else - pMerge = (const ScMergeAttr*) pDoc->GetAttr(rStartX,rStartY,nTab,ATTR_MERGE); + pMerge = static_cast<const ScMergeAttr*>( pDoc->GetAttr(rStartX,rStartY,nTab,ATTR_MERGE) ); rEndX = rStartX + pMerge->GetColMerge() - 1; rEndY = rStartY + pMerge->GetRowMerge() - 1; @@ -208,11 +208,11 @@ void ScDocument::FillInfo( RowInfo* pRowInfo = rTabInfo.mpRowInfo; const SvxBrushItem* pDefBackground = - (const SvxBrushItem*) &pPool->GetDefaultItem( ATTR_BACKGROUND ); + static_cast<const SvxBrushItem*>( &pPool->GetDefaultItem( ATTR_BACKGROUND ) ); const ScMergeAttr* pDefMerge = - (const ScMergeAttr*) &pPool->GetDefaultItem( ATTR_MERGE ); + static_cast<const ScMergeAttr*>( &pPool->GetDefaultItem( ATTR_MERGE ) ); const SvxShadowItem* pDefShadow = - (const SvxShadowItem*) &pPool->GetDefaultItem( ATTR_SHADOW ); + static_cast<const SvxShadowItem*>( &pPool->GetDefaultItem( ATTR_SHADOW ) ); SCROW nThisRow; SCCOL nX; @@ -453,25 +453,25 @@ void ScDocument::FillInfo( nThisRow=pThisAttrArr->pData[nIndex].nRow; // Ende des Bereichs pPattern=pThisAttrArr->pData[nIndex].pPattern; - const SvxBrushItem* pBackground = (const SvxBrushItem*) - &pPattern->GetItem(ATTR_BACKGROUND); - const SvxBoxItem* pLinesAttr = (const SvxBoxItem*) - &pPattern->GetItem(ATTR_BORDER); + const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>( + &pPattern->GetItem(ATTR_BACKGROUND)); + const SvxBoxItem* pLinesAttr = static_cast<const SvxBoxItem*>( + &pPattern->GetItem(ATTR_BORDER)); const SvxLineItem* pTLBRLine = static_cast< const SvxLineItem* >( &pPattern->GetItem( ATTR_BORDER_TLBR ) ); const SvxLineItem* pBLTRLine = static_cast< const SvxLineItem* >( &pPattern->GetItem( ATTR_BORDER_BLTR ) ); - const SvxShadowItem* pShadowAttr = (const SvxShadowItem*) - &pPattern->GetItem(ATTR_SHADOW); + const SvxShadowItem* pShadowAttr = static_cast<const SvxShadowItem*>( + &pPattern->GetItem(ATTR_SHADOW)); if (pShadowAttr != pDefShadow) bAnyShadow = true; - const ScMergeAttr* pMergeAttr = (const ScMergeAttr*) - &pPattern->GetItem(ATTR_MERGE); + const ScMergeAttr* pMergeAttr = static_cast<const ScMergeAttr*>( + &pPattern->GetItem(ATTR_MERGE)); bool bMerged = ( pMergeAttr != pDefMerge && *pMergeAttr != *pDefMerge ); - sal_uInt16 nOverlap = ((const ScMergeFlagAttr*) &pPattern->GetItemSet(). + sal_uInt16 nOverlap = static_cast<const ScMergeFlagAttr*>( &pPattern->GetItemSet(). Get(ATTR_MERGE_FLAG))->GetValue(); bool bHOverlapped = ((nOverlap & SC_MF_HOR) != 0); bool bVOverlapped = ((nOverlap & SC_MF_VER) != 0); @@ -486,8 +486,8 @@ void ScDocument::FillInfo( bool bHidden, bHideFormula; if (bTabProtect) { - const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&) - pPattern->GetItem(ATTR_PROTECTION); + const ScProtectionAttr& rProtAttr = static_cast<const ScProtectionAttr&>( + pPattern->GetItem(ATTR_PROTECTION)); bHidden = rProtAttr.GetHideCell(); bHideFormula = rProtAttr.GetHideFormula(); } @@ -707,13 +707,13 @@ void ScDocument::FillInfo( // Hintergrund if ( pCondSet->GetItemState( ATTR_BACKGROUND, true, &pItem ) == SfxItemState::SET ) { - pInfo->pBackground = (const SvxBrushItem*) pItem; + pInfo->pBackground = static_cast<const SvxBrushItem*>(pItem); pRowInfo[nArrRow].bEmptyBack = false; } // Umrandung if ( pCondSet->GetItemState( ATTR_BORDER, true, &pItem ) == SfxItemState::SET ) - pInfo->pLinesAttr = (const SvxBoxItem*) pItem; + pInfo->pLinesAttr = static_cast<const SvxBoxItem*>(pItem); if ( pCondSet->GetItemState( ATTR_BORDER_TLBR, true, &pItem ) == SfxItemState::SET ) pInfo->mpTLBRLine = static_cast< const SvxLineItem* >( pItem ); @@ -723,7 +723,7 @@ void ScDocument::FillInfo( // Schatten if ( pCondSet->GetItemState( ATTR_SHADOW, true, &pItem ) == SfxItemState::SET ) { - pInfo->pShadowAttr = (const SvxShadowItem*) pItem; + pInfo->pShadowAttr = static_cast<const SvxShadowItem*>(pItem); bAnyShadow = true; } } @@ -769,7 +769,7 @@ void ScDocument::FillInfo( if ( !pStartCond || pStartCond-> GetItemState(ATTR_BACKGROUND,true,&pItem) != SfxItemState::SET ) pItem = &pStartPattern->GetItem(ATTR_BACKGROUND); - pInfo->pBackground = (const SvxBrushItem*) pItem; + pInfo->pBackground = static_cast<const SvxBrushItem*>(pItem); pRowInfo[nArrRow].bEmptyBack = false; // Schatten @@ -777,7 +777,7 @@ void ScDocument::FillInfo( if ( !pStartCond || pStartCond-> GetItemState(ATTR_SHADOW,true,&pItem) != SfxItemState::SET ) pItem = &pStartPattern->GetItem(ATTR_SHADOW); - pInfo->pShadowAttr = (const SvxShadowItem*) pItem; + pInfo->pShadowAttr = static_cast<const SvxShadowItem*>(pItem); if (pInfo->pShadowAttr != pDefShadow) bAnyShadow = true; diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 6e4492348c68..3ba6bf3705a6 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -1824,7 +1824,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) if ( pCode->IsRecalcModeForced() ) { - sal_uLong nValidation = ((const SfxUInt32Item*) pDocument->GetAttr( + sal_uLong nValidation = static_cast<const SfxUInt32Item*>(pDocument->GetAttr( aPos.Col(), aPos.Row(), aPos.Tab(), ATTR_VALIDDATA ))->GetValue(); if ( nValidation ) { diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 150ed87e8ddf..9189ba8c195b 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -241,7 +241,7 @@ void ScGlobal::SetSearchItem( const SvxSearchItem& rNew ) { // FIXME: An assignement operator would be nice here delete pSearchItem; - pSearchItem = (SvxSearchItem*)rNew.Clone(); + pSearchItem = static_cast<SvxSearchItem*>(rNew.Clone()); pSearchItem->SetWhich( SID_SEARCH_ITEM ); pSearchItem->SetAppFlag( SVX_SEARCHAPP_CALC ); @@ -567,7 +567,7 @@ void ScGlobal::InitTextHeight(SfxItemPool* pPool) return; } - const ScPatternAttr* pPattern = (const ScPatternAttr*)&pPool->GetDefaultItem(ATTR_PATTERN); + const ScPatternAttr* pPattern = static_cast<const ScPatternAttr*>(&pPool->GetDefaultItem(ATTR_PATTERN)); if (!pPattern) { OSL_FAIL("ScGlobal::InitTextHeight: No default pattern"); @@ -586,7 +586,7 @@ void ScGlobal::InitTextHeight(SfxItemPool* pPool) if (nTest > nDefFontHeight) nDefFontHeight = nTest; - const SvxMarginItem* pMargin = (const SvxMarginItem*)&pPattern->GetItem(ATTR_MARGIN); + const SvxMarginItem* pMargin = static_cast<const SvxMarginItem*>(&pPattern->GetItem(ATTR_MARGIN)); nTest = static_cast<sal_uInt16>( nDefFontHeight + pMargin->GetTopMargin() + pMargin->GetBottomMargin() - STD_ROWHEIGHT_DIFF); @@ -1032,12 +1032,12 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) if ( rSet.GetItemState( ATTR_VALUE_FORMAT, false, &pHardItem ) == SfxItemState::SET ) { const SvNumberformat* pHardFormat = rFormatter.GetEntry( - ((const SfxUInt32Item*)pHardItem)->GetValue() ); + static_cast<const SfxUInt32Item*>(pHardItem)->GetValue() ); sal_uLong nParentFmt = 0; // Pool default const SfxItemSet* pParent = rSet.GetParent(); if ( pParent ) - nParentFmt = ((const SfxUInt32Item&)pParent->Get( ATTR_VALUE_FORMAT )).GetValue(); + nParentFmt = static_cast<const SfxUInt32Item&>(pParent->Get( ATTR_VALUE_FORMAT )).GetValue(); const SvNumberformat* pParFormat = rFormatter.GetEntry( nParentFmt ); if ( pHardFormat && pParFormat && diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index a92c92925b04..bf270849b071 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -193,13 +193,13 @@ SvxCellOrientation ScPatternAttr::GetCellOrientation( const SfxItemSet& rItemSet { SvxCellOrientation eOrient = SVX_ORIENTATION_STANDARD; - if( ((const SfxBoolItem&)GetItem( ATTR_STACKED, rItemSet, pCondSet )).GetValue() ) + if( static_cast<const SfxBoolItem&>(GetItem( ATTR_STACKED, rItemSet, pCondSet )).GetValue() ) { eOrient = SVX_ORIENTATION_STACKED; } else { - sal_Int32 nAngle = ((const SfxInt32Item&)GetItem( ATTR_ROTATE_VALUE, rItemSet, pCondSet )).GetValue(); + sal_Int32 nAngle = static_cast<const SfxInt32Item&>(GetItem( ATTR_ROTATE_VALUE, rItemSet, pCondSet )).GetValue(); if( nAngle == 9000 ) eOrient = SVX_ORIENTATION_BOTTOMTOP; else if( nAngle == 27000 ) @@ -269,90 +269,89 @@ void ScPatternAttr::GetFont( if ( pCondSet->GetItemState( nFontId, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( nFontId ); - pFontAttr = (const SvxFontItem*) pItem; + pFontAttr = static_cast<const SvxFontItem*>(pItem); if ( pCondSet->GetItemState( nHeightId, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( nHeightId ); - nFontHeight = ((const SvxFontHeightItem*)pItem)->GetHeight(); + nFontHeight = static_cast<const SvxFontHeightItem*>(pItem)->GetHeight(); if ( pCondSet->GetItemState( nWeightId, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( nWeightId ); - eWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue(); + eWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( nPostureId, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( nPostureId ); - eItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue(); + eItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_UNDERLINE ); - eUnder = (FontUnderline)((const SvxUnderlineItem*)pItem)->GetValue(); + eUnder = (FontUnderline)static_cast<const SvxUnderlineItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_OVERLINE ); - eOver = (FontUnderline)((const SvxOverlineItem*)pItem)->GetValue(); + eOver = (FontUnderline)static_cast<const SvxOverlineItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_WORDLINE ); - bWordLine = ((const SvxWordLineModeItem*)pItem)->GetValue(); + bWordLine = static_cast<const SvxWordLineModeItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_CROSSEDOUT ); - eStrike = (FontStrikeout)((const SvxCrossedOutItem*)pItem)->GetValue(); + eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_CONTOUR ); - bOutline = ((const SvxContourItem*)pItem)->GetValue(); + bOutline = static_cast<const SvxContourItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_SHADOWED, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_SHADOWED ); - bShadow = ((const SvxShadowedItem*)pItem)->GetValue(); + bShadow = static_cast<const SvxShadowedItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_EMPHASISMARK, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_EMPHASISMARK ); - eEmphasis = ((const SvxEmphasisMarkItem*)pItem)->GetEmphasisMark(); + eEmphasis = static_cast<const SvxEmphasisMarkItem*>(pItem)->GetEmphasisMark(); if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_RELIEF ); - eRelief = (FontRelief)((const SvxCharReliefItem*)pItem)->GetValue(); + eRelief = (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_COLOR, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_FONT_COLOR ); - aColor = ((const SvxColorItem*)pItem)->GetValue(); + aColor = static_cast<const SvxColorItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( nLangId, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( nLangId ); - eLang = ((const SvxLanguageItem*)pItem)->GetLanguage(); + eLang = static_cast<const SvxLanguageItem*>(pItem)->GetLanguage(); } else // alles aus rItemSet { - pFontAttr = &(const SvxFontItem&)rItemSet.Get( nFontId ); - nFontHeight = ((const SvxFontHeightItem&) + pFontAttr = &static_cast<const SvxFontItem&>(rItemSet.Get( nFontId )); + nFontHeight = static_cast<const SvxFontHeightItem&>( rItemSet.Get( nHeightId )).GetHeight(); - eWeight = (FontWeight)((const SvxWeightItem&) + eWeight = (FontWeight)static_cast<const SvxWeightItem&>( rItemSet.Get( nWeightId )).GetValue(); - eItalic = (FontItalic)((const SvxPostureItem&) + eItalic = (FontItalic)static_cast<const SvxPostureItem&>( rItemSet.Get( nPostureId )).GetValue(); - eUnder = (FontUnderline)((const SvxUnderlineItem&) + eUnder = (FontUnderline)static_cast<const SvxUnderlineItem&>( rItemSet.Get( ATTR_FONT_UNDERLINE )).GetValue(); - eOver = (FontUnderline)((const SvxOverlineItem&) + eOver = (FontUnderline)static_cast<const SvxOverlineItem&>( rItemSet.Get( ATTR_FONT_OVERLINE )).GetValue(); - bWordLine = ((const SvxWordLineModeItem&) + bWordLine = static_cast<const SvxWordLineModeItem&>( rItemSet.Get( ATTR_FONT_WORDLINE )).GetValue(); - eStrike = (FontStrikeout)((const SvxCrossedOutItem&) + eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem&>( rItemSet.Get( ATTR_FONT_CROSSEDOUT )).GetValue(); - bOutline = ((const SvxContourItem&) + bOutline = static_cast<const SvxContourItem&>( rItemSet.Get( ATTR_FONT_CONTOUR )).GetValue(); - bShadow = ((const SvxShadowedItem&) + bShadow = static_cast<const SvxShadowedItem&>( rItemSet.Get( ATTR_FONT_SHADOWED )).GetValue(); - eEmphasis = ((const SvxEmphasisMarkItem&) + eEmphasis = static_cast<const SvxEmphasisMarkItem&>( rItemSet.Get( ATTR_FONT_EMPHASISMARK )).GetEmphasisMark(); - eRelief = (FontRelief)((const SvxCharReliefItem&) + eRelief = (FontRelief)static_cast<const SvxCharReliefItem&>( rItemSet.Get( ATTR_FONT_RELIEF )).GetValue(); - aColor = ((const SvxColorItem&) + aColor = static_cast<const SvxColorItem&>( rItemSet.Get( ATTR_FONT_COLOR )).GetValue(); // for graphite language features - eLang = - ((const SvxLanguageItem&)rItemSet.Get( nLangId )).GetLanguage(); + eLang = static_cast<const SvxLanguageItem&>(rItemSet.Get( nLangId )).GetLanguage(); } OSL_ENSURE(pFontAttr,"Oops?"); @@ -414,10 +413,10 @@ void ScPatternAttr::GetFont( const SfxPoolItem* pItem; if ( pCondSet->GetItemState( ATTR_BACKGROUND, true, &pItem ) != SfxItemState::SET ) pItem = &rItemSet.Get( ATTR_BACKGROUND ); - aBackColor = ((const SvxBrushItem*)pItem)->GetColor(); + aBackColor = static_cast<const SvxBrushItem*>(pItem)->GetColor(); } else - aBackColor = ((const SvxBrushItem&)rItemSet.Get( ATTR_BACKGROUND )).GetColor(); + aBackColor = static_cast<const SvxBrushItem&>(rItemSet.Get( ATTR_BACKGROUND )).GetColor(); // if background color attribute is transparent, use window color for brightness comparisons if ( aBackColor == COL_TRANSPARENT || @@ -521,150 +520,150 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r if ( pCondSet->GetItemState( ATTR_FONT_COLOR, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_COLOR ); - aColorItem = *(const SvxColorItem*)pItem; + aColorItem = *static_cast<const SvxColorItem*>(pItem); if ( pCondSet->GetItemState( ATTR_FONT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT ); - aFontItem = *(const SvxFontItem*)pItem; + aFontItem = *static_cast<const SvxFontItem*>(pItem); if ( pCondSet->GetItemState( ATTR_CJK_FONT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CJK_FONT ); - aCjkFontItem = *(const SvxFontItem*)pItem; + aCjkFontItem = *static_cast<const SvxFontItem*>(pItem); if ( pCondSet->GetItemState( ATTR_CTL_FONT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CTL_FONT ); - aCtlFontItem = *(const SvxFontItem*)pItem; + aCtlFontItem = *static_cast<const SvxFontItem*>(pItem); if ( pCondSet->GetItemState( ATTR_FONT_HEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_HEIGHT ); - nTHeight = ((const SvxFontHeightItem*)pItem)->GetHeight(); + nTHeight = static_cast<const SvxFontHeightItem*>(pItem)->GetHeight(); if ( pCondSet->GetItemState( ATTR_CJK_FONT_HEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CJK_FONT_HEIGHT ); - nCjkTHeight = ((const SvxFontHeightItem*)pItem)->GetHeight(); + nCjkTHeight = static_cast<const SvxFontHeightItem*>(pItem)->GetHeight(); if ( pCondSet->GetItemState( ATTR_CTL_FONT_HEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CTL_FONT_HEIGHT ); - nCtlTHeight = ((const SvxFontHeightItem*)pItem)->GetHeight(); + nCtlTHeight = static_cast<const SvxFontHeightItem*>(pItem)->GetHeight(); if ( pCondSet->GetItemState( ATTR_FONT_WEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_WEIGHT ); - eWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue(); + eWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CJK_FONT_WEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CJK_FONT_WEIGHT ); - eCjkWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue(); + eCjkWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CTL_FONT_WEIGHT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CTL_FONT_WEIGHT ); - eCtlWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue(); + eCtlWeight = (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_POSTURE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_POSTURE ); - eItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue(); + eItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CJK_FONT_POSTURE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CJK_FONT_POSTURE ); - eCjkItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue(); + eCjkItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_CTL_FONT_POSTURE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CTL_FONT_POSTURE ); - eCtlItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue(); + eCtlItalic = (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_UNDERLINE ); - aUnderlineItem = *(const SvxUnderlineItem*)pItem; + aUnderlineItem = *static_cast<const SvxUnderlineItem*>(pItem); if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_OVERLINE ); - aOverlineItem = *(const SvxOverlineItem*)pItem; + aOverlineItem = *static_cast<const SvxOverlineItem*>(pItem); if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_WORDLINE ); - bWordLine = ((const SvxWordLineModeItem*)pItem)->GetValue(); + bWordLine = static_cast<const SvxWordLineModeItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_CROSSEDOUT ); - eStrike = (FontStrikeout)((const SvxCrossedOutItem*)pItem)->GetValue(); + eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_CONTOUR ); - bOutline = ((const SvxContourItem*)pItem)->GetValue(); + bOutline = static_cast<const SvxContourItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_SHADOWED, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_SHADOWED ); - bShadow = ((const SvxShadowedItem*)pItem)->GetValue(); + bShadow = static_cast<const SvxShadowedItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FORBIDDEN_RULES, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FORBIDDEN_RULES ); - bForbidden = ((const SvxForbiddenRuleItem*)pItem)->GetValue(); + bForbidden = static_cast<const SvxForbiddenRuleItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_EMPHASISMARK, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_EMPHASISMARK ); - eEmphasis = ((const SvxEmphasisMarkItem*)pItem)->GetEmphasisMark(); + eEmphasis = static_cast<const SvxEmphasisMarkItem*>(pItem)->GetEmphasisMark(); if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_RELIEF ); - eRelief = (FontRelief)((const SvxCharReliefItem*)pItem)->GetValue(); + eRelief = (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_FONT_LANGUAGE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_FONT_LANGUAGE ); - eLang = ((const SvxLanguageItem*)pItem)->GetLanguage(); + eLang = static_cast<const SvxLanguageItem*>(pItem)->GetLanguage(); if ( pCondSet->GetItemState( ATTR_CJK_FONT_LANGUAGE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CJK_FONT_LANGUAGE ); - eCjkLang = ((const SvxLanguageItem*)pItem)->GetLanguage(); + eCjkLang = static_cast<const SvxLanguageItem*>(pItem)->GetLanguage(); if ( pCondSet->GetItemState( ATTR_CTL_FONT_LANGUAGE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_CTL_FONT_LANGUAGE ); - eCtlLang = ((const SvxLanguageItem*)pItem)->GetLanguage(); + eCtlLang = static_cast<const SvxLanguageItem*>(pItem)->GetLanguage(); if ( pCondSet->GetItemState( ATTR_HYPHENATE, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_HYPHENATE ); - bHyphenate = ((const SfxBoolItem*)pItem)->GetValue(); + bHyphenate = static_cast<const SfxBoolItem*>(pItem)->GetValue(); if ( pCondSet->GetItemState( ATTR_WRITINGDIR, true, &pItem ) != SfxItemState::SET ) pItem = &rSrcSet.Get( ATTR_WRITINGDIR ); - eDirection = (SvxFrameDirection)((const SvxFrameDirectionItem*)pItem)->GetValue(); + eDirection = (SvxFrameDirection)static_cast<const SvxFrameDirectionItem*>(pItem)->GetValue(); } else // alles direkt aus Pattern { - aColorItem = (const SvxColorItem&) rSrcSet.Get( ATTR_FONT_COLOR ); - aFontItem = (const SvxFontItem&) rSrcSet.Get( ATTR_FONT ); - aCjkFontItem = (const SvxFontItem&) rSrcSet.Get( ATTR_CJK_FONT ); - aCtlFontItem = (const SvxFontItem&) rSrcSet.Get( ATTR_CTL_FONT ); - nTHeight = ((const SvxFontHeightItem&) + aColorItem = static_cast<const SvxColorItem&>( rSrcSet.Get( ATTR_FONT_COLOR ) ); + aFontItem = static_cast<const SvxFontItem&>( rSrcSet.Get( ATTR_FONT ) ); + aCjkFontItem = static_cast<const SvxFontItem&>( rSrcSet.Get( ATTR_CJK_FONT ) ); + aCtlFontItem = static_cast<const SvxFontItem&>( rSrcSet.Get( ATTR_CTL_FONT ) ); + nTHeight = static_cast<const SvxFontHeightItem&>( rSrcSet.Get( ATTR_FONT_HEIGHT )).GetHeight(); - nCjkTHeight = ((const SvxFontHeightItem&) + nCjkTHeight = static_cast<const SvxFontHeightItem&>( rSrcSet.Get( ATTR_CJK_FONT_HEIGHT )).GetHeight(); - nCtlTHeight = ((const SvxFontHeightItem&) + nCtlTHeight = static_cast<const SvxFontHeightItem&>( rSrcSet.Get( ATTR_CTL_FONT_HEIGHT )).GetHeight(); - eWeight = (FontWeight)((const SvxWeightItem&) + eWeight = (FontWeight)static_cast<const SvxWeightItem&>( rSrcSet.Get( ATTR_FONT_WEIGHT )).GetValue(); - eCjkWeight = (FontWeight)((const SvxWeightItem&) + eCjkWeight = (FontWeight)static_cast<const SvxWeightItem&>( rSrcSet.Get( ATTR_CJK_FONT_WEIGHT )).GetValue(); - eCtlWeight = (FontWeight)((const SvxWeightItem&) + eCtlWeight = (FontWeight)static_cast<const SvxWeightItem&>( rSrcSet.Get( ATTR_CTL_FONT_WEIGHT )).GetValue(); - eItalic = (FontItalic)((const SvxPostureItem&) + eItalic = (FontItalic)static_cast<const SvxPostureItem&>( rSrcSet.Get( ATTR_FONT_POSTURE )).GetValue(); - eCjkItalic = (FontItalic)((const SvxPostureItem&) + eCjkItalic = (FontItalic)static_cast<const SvxPostureItem&>( rSrcSet.Get( ATTR_CJK_FONT_POSTURE )).GetValue(); - eCtlItalic = (FontItalic)((const SvxPostureItem&) + eCtlItalic = (FontItalic)static_cast<const SvxPostureItem&>( rSrcSet.Get( ATTR_CTL_FONT_POSTURE )).GetValue(); - aUnderlineItem = (const SvxUnderlineItem&) rSrcSet.Get( ATTR_FONT_UNDERLINE ); - aOverlineItem = (const SvxOverlineItem&) rSrcSet.Get( ATTR_FONT_OVERLINE ); - bWordLine = ((const SvxWordLineModeItem&) + aUnderlineItem = static_cast<const SvxUnderlineItem&>( rSrcSet.Get( ATTR_FONT_UNDERLINE ) ); + aOverlineItem = static_cast<const SvxOverlineItem&>( rSrcSet.Get( ATTR_FONT_OVERLINE ) ); + bWordLine = static_cast<const SvxWordLineModeItem&>( rSrcSet.Get( ATTR_FONT_WORDLINE )).GetValue(); - eStrike = (FontStrikeout)((const SvxCrossedOutItem&) + eStrike = (FontStrikeout)static_cast<const SvxCrossedOutItem&>( rSrcSet.Get( ATTR_FONT_CROSSEDOUT )).GetValue(); - bOutline = ((const SvxContourItem&) + bOutline = static_cast<const SvxContourItem&>( rSrcSet.Get( ATTR_FONT_CONTOUR )).GetValue(); - bShadow = ((const SvxShadowedItem&) + bShadow = static_cast<const SvxShadowedItem&>( rSrcSet.Get( ATTR_FONT_SHADOWED )).GetValue(); - bForbidden = ((const SvxForbiddenRuleItem&) + bForbidden = static_cast<const SvxForbiddenRuleItem&>( rSrcSet.Get( ATTR_FORBIDDEN_RULES )).GetValue(); - eEmphasis = ((const SvxEmphasisMarkItem&) + eEmphasis = static_cast<const SvxEmphasisMarkItem&>( rSrcSet.Get( ATTR_FONT_EMPHASISMARK )).GetEmphasisMark(); - eRelief = (FontRelief)((const SvxCharReliefItem&) + eRelief = (FontRelief)static_cast<const SvxCharReliefItem&>( rSrcSet.Get( ATTR_FONT_RELIEF )).GetValue(); - eLang = ((const SvxLanguageItem&) + eLang = static_cast<const SvxLanguageItem&>( rSrcSet.Get( ATTR_FONT_LANGUAGE )).GetLanguage(); - eCjkLang = ((const SvxLanguageItem&) + eCjkLang = static_cast<const SvxLanguageItem&>( rSrcSet.Get( ATTR_CJK_FONT_LANGUAGE )).GetLanguage(); - eCtlLang = ((const SvxLanguageItem&) + eCtlLang = static_cast<const SvxLanguageItem&>( rSrcSet.Get( ATTR_CTL_FONT_LANGUAGE )).GetLanguage(); - bHyphenate = ((const SfxBoolItem&) + bHyphenate = static_cast<const SfxBoolItem&>( rSrcSet.Get( ATTR_HYPHENATE )).GetValue(); - eDirection = (SvxFrameDirection)((const SvxFrameDirectionItem&) + eDirection = (SvxFrameDirection)static_cast<const SvxFrameDirectionItem&>( rSrcSet.Get( ATTR_WRITINGDIR )).GetValue(); } @@ -733,69 +732,69 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& const SfxPoolItem* pItem; if (rEditSet.GetItemState(EE_CHAR_COLOR,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxColorItem(ATTR_FONT_COLOR) = *(const SvxColorItem*)pItem ); + rDestSet.Put( SvxColorItem(ATTR_FONT_COLOR) = *static_cast<const SvxColorItem*>(pItem) ); if (rEditSet.GetItemState(EE_CHAR_FONTINFO,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxFontItem(ATTR_FONT) = *(const SvxFontItem*)pItem ); + rDestSet.Put( SvxFontItem(ATTR_FONT) = *static_cast<const SvxFontItem*>(pItem) ); if (rEditSet.GetItemState(EE_CHAR_FONTINFO_CJK,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxFontItem(ATTR_CJK_FONT) = *(const SvxFontItem*)pItem ); + rDestSet.Put( SvxFontItem(ATTR_CJK_FONT) = *static_cast<const SvxFontItem*>(pItem) ); if (rEditSet.GetItemState(EE_CHAR_FONTINFO_CTL,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxFontItem(ATTR_CTL_FONT) = *(const SvxFontItem*)pItem ); + rDestSet.Put( SvxFontItem(ATTR_CTL_FONT) = *static_cast<const SvxFontItem*>(pItem) ); if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxFontHeightItem( HMMToTwips( ((const SvxFontHeightItem*)pItem)->GetHeight() ), + rDestSet.Put( SvxFontHeightItem( HMMToTwips( static_cast<const SvxFontHeightItem*>(pItem)->GetHeight() ), 100, ATTR_FONT_HEIGHT ) ); if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT_CJK,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxFontHeightItem( HMMToTwips( ((const SvxFontHeightItem*)pItem)->GetHeight() ), + rDestSet.Put( SvxFontHeightItem( HMMToTwips( static_cast<const SvxFontHeightItem*>(pItem)->GetHeight() ), 100, ATTR_CJK_FONT_HEIGHT ) ); if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT_CTL,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxFontHeightItem( HMMToTwips( ((const SvxFontHeightItem*)pItem)->GetHeight() ), + rDestSet.Put( SvxFontHeightItem( HMMToTwips( static_cast<const SvxFontHeightItem*>(pItem)->GetHeight() ), 100, ATTR_CTL_FONT_HEIGHT ) ); if (rEditSet.GetItemState(EE_CHAR_WEIGHT,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxWeightItem( (FontWeight)((const SvxWeightItem*)pItem)->GetValue(), + rDestSet.Put( SvxWeightItem( (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(), ATTR_FONT_WEIGHT) ); if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CJK,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxWeightItem( (FontWeight)((const SvxWeightItem*)pItem)->GetValue(), + rDestSet.Put( SvxWeightItem( (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(), ATTR_CJK_FONT_WEIGHT) ); if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CTL,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxWeightItem( (FontWeight)((const SvxWeightItem*)pItem)->GetValue(), + rDestSet.Put( SvxWeightItem( (FontWeight)static_cast<const SvxWeightItem*>(pItem)->GetValue(), ATTR_CTL_FONT_WEIGHT) ); // SvxTextLineItem contains enum and color if (rEditSet.GetItemState(EE_CHAR_UNDERLINE,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxUnderlineItem(UNDERLINE_NONE,ATTR_FONT_UNDERLINE) = *(const SvxUnderlineItem*)pItem ); + rDestSet.Put( SvxUnderlineItem(UNDERLINE_NONE,ATTR_FONT_UNDERLINE) = *static_cast<const SvxUnderlineItem*>(pItem) ); if (rEditSet.GetItemState(EE_CHAR_OVERLINE,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxOverlineItem(UNDERLINE_NONE,ATTR_FONT_OVERLINE) = *(const SvxOverlineItem*)pItem ); + rDestSet.Put( SvxOverlineItem(UNDERLINE_NONE,ATTR_FONT_OVERLINE) = *static_cast<const SvxOverlineItem*>(pItem) ); if (rEditSet.GetItemState(EE_CHAR_WLM,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxWordLineModeItem( ((const SvxWordLineModeItem*)pItem)->GetValue(), + rDestSet.Put( SvxWordLineModeItem( static_cast<const SvxWordLineModeItem*>(pItem)->GetValue(), ATTR_FONT_WORDLINE) ); if (rEditSet.GetItemState(EE_CHAR_STRIKEOUT,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxCrossedOutItem( (FontStrikeout)((const SvxCrossedOutItem*)pItem)->GetValue(), + rDestSet.Put( SvxCrossedOutItem( (FontStrikeout)static_cast<const SvxCrossedOutItem*>(pItem)->GetValue(), ATTR_FONT_CROSSEDOUT) ); if (rEditSet.GetItemState(EE_CHAR_ITALIC,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxPostureItem( (FontItalic)((const SvxPostureItem*)pItem)->GetValue(), + rDestSet.Put( SvxPostureItem( (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(), ATTR_FONT_POSTURE) ); if (rEditSet.GetItemState(EE_CHAR_ITALIC_CJK,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxPostureItem( (FontItalic)((const SvxPostureItem*)pItem)->GetValue(), + rDestSet.Put( SvxPostureItem( (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(), ATTR_CJK_FONT_POSTURE) ); if (rEditSet.GetItemState(EE_CHAR_ITALIC_CTL,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxPostureItem( (FontItalic)((const SvxPostureItem*)pItem)->GetValue(), + rDestSet.Put( SvxPostureItem( (FontItalic)static_cast<const SvxPostureItem*>(pItem)->GetValue(), ATTR_CTL_FONT_POSTURE) ); if (rEditSet.GetItemState(EE_CHAR_OUTLINE,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxContourItem( ((const SvxContourItem*)pItem)->GetValue(), + rDestSet.Put( SvxContourItem( static_cast<const SvxContourItem*>(pItem)->GetValue(), ATTR_FONT_CONTOUR) ); if (rEditSet.GetItemState(EE_CHAR_SHADOW,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxShadowedItem( ((const SvxShadowedItem*)pItem)->GetValue(), + rDestSet.Put( SvxShadowedItem( static_cast<const SvxShadowedItem*>(pItem)->GetValue(), ATTR_FONT_SHADOWED) ); if (rEditSet.GetItemState(EE_CHAR_EMPHASISMARK,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxEmphasisMarkItem( ((const SvxEmphasisMarkItem*)pItem)->GetEmphasisMark(), + rDestSet.Put( SvxEmphasisMarkItem( static_cast<const SvxEmphasisMarkItem*>(pItem)->GetEmphasisMark(), ATTR_FONT_EMPHASISMARK) ); if (rEditSet.GetItemState(EE_CHAR_RELIEF,true,&pItem) == SfxItemState::SET) - rDestSet.Put( SvxCharReliefItem( (FontRelief)((const SvxCharReliefItem*)pItem)->GetValue(), + rDestSet.Put( SvxCharReliefItem( (FontRelief)static_cast<const SvxCharReliefItem*>(pItem)->GetValue(), ATTR_FONT_RELIEF) ); if (rEditSet.GetItemState(EE_CHAR_LANGUAGE,true,&pItem) == SfxItemState::SET) @@ -808,7 +807,7 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& if (rEditSet.GetItemState(EE_PARA_JUST,true,&pItem) == SfxItemState::SET) { SvxCellHorJustify eVal; - switch ( ((const SvxAdjustItem*)pItem)->GetAdjust() ) + switch ( static_cast<const SvxAdjustItem*>(pItem)->GetAdjust() ) { case SVX_ADJUST_LEFT: // EditEngine Default ist bei dem GetAttribs() ItemSet @@ -853,7 +852,7 @@ void ScPatternAttr::FillEditParaItems( SfxItemSet* pEditSet ) const const SfxItemSet& rMySet = GetItemSet(); SvxCellHorJustify eHorJust = (SvxCellHorJustify) - ((const SvxHorJustifyItem&)rMySet.Get(ATTR_HOR_JUSTIFY)).GetValue(); + static_cast<const SvxHorJustifyItem&>(rMySet.Get(ATTR_HOR_JUSTIFY)).GetValue(); SvxAdjust eSvxAdjust; switch (eHorJust) @@ -992,7 +991,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD pDestDoc->GetStyleSheetPool(), pDestDoc->GetFormatExchangeList() ); - pDestPattern->SetStyleSheet( (ScStyleSheet*)pStyleCpy ); + pDestPattern->SetStyleSheet( static_cast<ScStyleSheet*>(pStyleCpy) ); } for ( sal_uInt16 nAttrId = ATTR_PATTERN_START; nAttrId <= ATTR_PATTERN_END; nAttrId++ ) @@ -1011,7 +1010,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD ScValidationDataList* pSrcList = pSrcDoc->GetValidationList(); if ( pSrcList ) { - sal_uLong nOldIndex = ((const SfxUInt32Item*)pSrcItem)->GetValue(); + sal_uLong nOldIndex = static_cast<const SfxUInt32Item*>(pSrcItem)->GetValue(); const ScValidationData* pOldData = pSrcList->GetData( nOldIndex ); if ( pOldData ) nNewIndex = pDestDoc->AddValidationEntry( *pOldData ); @@ -1022,7 +1021,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD { // Zahlformate nach Exchange-Liste - sal_uLong nOldFormat = ((const SfxUInt32Item*)pSrcItem)->GetValue(); + sal_uLong nOldFormat = static_cast<const SfxUInt32Item*>(pSrcItem)->GetValue(); SvNumberFormatterIndexTable::const_iterator it = pDestDoc->GetFormatExchangeList()->find(nOldFormat); if (it != pDestDoc->GetFormatExchangeList()->end()) { @@ -1042,7 +1041,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD } ScPatternAttr* pPatternAttr = - (ScPatternAttr*) &pDestDoc->GetPool()->Put(*pDestPattern); + const_cast<ScPatternAttr*>( static_cast<const ScPatternAttr*>( &pDestDoc->GetPool()->Put(*pDestPattern) ) ); delete pDestPattern; return pPatternAttr; } @@ -1056,13 +1055,13 @@ bool ScPatternAttr::IsVisible() const eState = rSet.GetItemState( ATTR_BACKGROUND, true, &pItem ); if ( eState == SfxItemState::SET ) - if ( ((const SvxBrushItem*)pItem)->GetColor().GetColor() != COL_TRANSPARENT ) + if ( static_cast<const SvxBrushItem*>(pItem)->GetColor().GetColor() != COL_TRANSPARENT ) return true; eState = rSet.GetItemState( ATTR_BORDER, true, &pItem ); if ( eState == SfxItemState::SET ) { - const SvxBoxItem* pBoxItem = (SvxBoxItem*) pItem; + const SvxBoxItem* pBoxItem = static_cast<const SvxBoxItem*>(pItem); if ( pBoxItem->GetTop() || pBoxItem->GetBottom() || pBoxItem->GetLeft() || pBoxItem->GetRight() ) return true; @@ -1080,7 +1079,7 @@ bool ScPatternAttr::IsVisible() const eState = rSet.GetItemState( ATTR_SHADOW, true, &pItem ); if ( eState == SfxItemState::SET ) - if ( ((const SvxShadowItem*)pItem)->GetLocation() != SVX_SHADOW_NONE ) + if ( static_cast<const SvxShadowItem*>(pItem)->GetLocation() != SVX_SHADOW_NONE ) return true; return false; @@ -1143,7 +1142,7 @@ void ScPatternAttr::UpdateStyleSheet(ScDocument* pDoc) { if (pName) { - pStyle = (ScStyleSheet*)pDoc->GetStyleSheetPool()->Find(*pName, SFX_STYLE_FAMILY_PARA); + pStyle = static_cast<ScStyleSheet*>(pDoc->GetStyleSheetPool()->Find(*pName, SFX_STYLE_FAMILY_PARA)); // wenn Style nicht gefunden, Standard nehmen, // damit keine leere Anzeige im Toolbox-Controller @@ -1184,7 +1183,7 @@ bool ScPatternAttr::IsSymbolFont() const { const SfxPoolItem* pItem; if( GetItemSet().GetItemState( ATTR_FONT, true, &pItem ) == SfxItemState::SET ) - return ((const SvxFontItem*) pItem)->GetCharSet() == RTL_TEXTENCODING_SYMBOL; + return static_cast<const SvxFontItem*>(pItem)->GetCharSet() == RTL_TEXTENCODING_SYMBOL; else return false; } @@ -1192,9 +1191,9 @@ bool ScPatternAttr::IsSymbolFont() const sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const { sal_uLong nFormat = - ((SfxUInt32Item*)&GetItemSet().Get( ATTR_VALUE_FORMAT ))->GetValue(); + static_cast<const SfxUInt32Item*>(&GetItemSet().Get( ATTR_VALUE_FORMAT ))->GetValue(); LanguageType eLang = - ((SvxLanguageItem*)&GetItemSet().Get( ATTR_LANGUAGE_FORMAT ))->GetLanguage(); + static_cast<const SvxLanguageItem*>(&GetItemSet().Get( ATTR_LANGUAGE_FORMAT ))->GetLanguage(); if ( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && eLang == LANGUAGE_SYSTEM ) ; // es bleibt wie es ist else if ( pFormatter ) @@ -1218,8 +1217,8 @@ sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter, pLangItem = &GetItemSet().Get(ATTR_LANGUAGE_FORMAT); return pFormatter->GetFormatForLanguageIfBuiltIn( - ((SfxUInt32Item*)pFormItem)->GetValue(), - ((SvxLanguageItem*)pLangItem)->GetLanguage() ); + static_cast<const SfxUInt32Item*>(pFormItem)->GetValue(), + static_cast<const SvxLanguageItem*>(pLangItem)->GetLanguage() ); } const SfxPoolItem& ScPatternAttr::GetItem( sal_uInt16 nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet ) @@ -1246,7 +1245,7 @@ long ScPatternAttr::GetRotateVal( const SfxItemSet* pCondSet ) const GetValue() == SVX_HOR_JUSTIFY_REPEAT ); // ignore orientation/rotation if "repeat" is active if ( !bRepeat ) - nAttrRotate = ((const SfxInt32Item&)GetItem( ATTR_ROTATE_VALUE, pCondSet )).GetValue(); + nAttrRotate = static_cast<const SfxInt32Item&>(GetItem( ATTR_ROTATE_VALUE, pCondSet )).GetValue(); } return nAttrRotate; } @@ -1258,7 +1257,7 @@ sal_uInt8 ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const long nAttrRotate = GetRotateVal( pCondSet ); if ( nAttrRotate ) { - SvxRotateMode eRotMode = (SvxRotateMode)((const SvxRotateModeItem&) + SvxRotateMode eRotMode = (SvxRotateMode)static_cast<const SvxRotateModeItem&>( GetItem(ATTR_ROTATE_MODE, pCondSet)).GetValue(); if ( eRotMode == SVX_ROTATE_MODE_STANDARD || nAttrRotate == 18000 ) diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 780f74ff2665..71ac75966a40 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -111,7 +111,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) { OSL_ENSURE( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" ); - return new ScStyleSheet( (const ScStyleSheet&) rStyle ); + return new ScStyleSheet( static_cast<const ScStyleSheet&>(rStyle) ); } void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) @@ -121,7 +121,7 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) OSL_ENSURE( IS_SET( SFXSTYLEBIT_USERDEF, pStyle->GetMask() ), "SFXSTYLEBIT_USERDEF not set!" ); - ((ScDocumentPool&)rPool).StyleDeleted((ScStyleSheet*)pStyle); + static_cast<ScDocumentPool&>(rPool).StyleDeleted(static_cast<ScStyleSheet*>(pStyle)); SfxStyleSheetPool::Remove(pStyle); } } @@ -148,14 +148,14 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, if ( rSourceSet.GetItemState( ATTR_PAGE_HEADERSET, false, &pItem ) == SfxItemState::SET ) { - const SfxItemSet& rSrcSub = ((const SvxSetItem*) pItem)->GetItemSet(); + const SfxItemSet& rSrcSub = static_cast<const SvxSetItem*>(pItem)->GetItemSet(); SfxItemSet aDestSub( *rDestSet.GetPool(), rSrcSub.GetRanges() ); aDestSub.PutExtended( rSrcSub, SfxItemState::DONTCARE, SfxItemState::DEFAULT ); rDestSet.Put( SvxSetItem( ATTR_PAGE_HEADERSET, aDestSub ) ); } if ( rSourceSet.GetItemState( ATTR_PAGE_FOOTERSET, false, &pItem ) == SfxItemState::SET ) { - const SfxItemSet& rSrcSub = ((const SvxSetItem*) pItem)->GetItemSet(); + const SfxItemSet& rSrcSub = static_cast<const SvxSetItem*>(pItem)->GetItemSet(); SfxItemSet aDestSub( *rDestSet.GetPool(), rSrcSub.GetRanges() ); aDestSub.PutExtended( rSrcSub, SfxItemState::DONTCARE, SfxItemState::DEFAULT ); rDestSet.Put( SvxSetItem( ATTR_PAGE_FOOTERSET, aDestSub ) ); @@ -241,7 +241,7 @@ void ScStyleSheetPool::CreateStandardStyles() // 1. Standard - pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); + pSheet = static_cast<ScStyleSheet*>( &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ) ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_STD ); // if default fonts for the document's languages are different from the pool default, @@ -272,9 +272,9 @@ void ScStyleSheetPool::CreateStandardStyles() // 2. Ergebnis - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT ), + pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_RESULT ), SFX_STYLE_FAMILY_PARA, - SCSTYLEBIT_STANDARD ); + SCSTYLEBIT_STANDARD ) ); pSheet->SetParent( aStrStandard ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG ); pSet = &pSheet->GetItemSet(); @@ -284,18 +284,18 @@ void ScStyleSheetPool::CreateStandardStyles() // 3. Ergebnis1 - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT1 ), + pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_RESULT1 ), SFX_STYLE_FAMILY_PARA, - SCSTYLEBIT_STANDARD ); + SCSTYLEBIT_STANDARD ) ); pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 ); // 4. Ueberschrift - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE ), + pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_HEADLINE ), SFX_STYLE_FAMILY_PARA, - SCSTYLEBIT_STANDARD ); + SCSTYLEBIT_STANDARD ) ); pSheet->SetParent( aStrStandard ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_UEB ); @@ -307,9 +307,9 @@ void ScStyleSheetPool::CreateStandardStyles() // 5. Ueberschrift1 - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE1 ), + pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_HEADLINE1 ), SFX_STYLE_FAMILY_PARA, - SCSTYLEBIT_STANDARD ); + SCSTYLEBIT_STANDARD ) ); pSheet->SetParent( SCSTR( STR_STYLENAME_HEADLINE ) ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_UEB1 ); @@ -320,15 +320,15 @@ void ScStyleSheetPool::CreateStandardStyles() // 1. Standard - pSheet = (ScStyleSheet*) &Make( aStrStandard, + pSheet = static_cast<ScStyleSheet*>( &Make( aStrStandard, SFX_STYLE_FAMILY_PAGE, - SCSTYLEBIT_STANDARD ); + SCSTYLEBIT_STANDARD ) ); pSet = &pSheet->GetItemSet(); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_PAGE_STD ); // Abstand der Kopf-/Fusszeilen von der Tabelle - pHFSetItem = new SvxSetItem( ((SvxSetItem&)pSet->Get( ATTR_PAGE_HEADERSET ) ) ); + pHFSetItem = new SvxSetItem( static_cast<const SvxSetItem&>(pSet->Get( ATTR_PAGE_HEADERSET ) ) ); pSet->Put( *pHFSetItem, ATTR_PAGE_HEADERSET ); pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); @@ -361,9 +361,9 @@ void ScStyleSheetPool::CreateStandardStyles() // 2. Report - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_REPORT ), + pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_REPORT ), SFX_STYLE_FAMILY_PAGE, - SCSTYLEBIT_STANDARD ); + SCSTYLEBIT_STANDARD ) ); pSet = &pSheet->GetItemSet(); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_PAGE_REP ); @@ -381,7 +381,7 @@ void ScStyleSheetPool::CreateStandardStyles() aBoxInfoItem.SetTable( false ); aBoxInfoItem.SetDist ( true ); - pHFSetItem = new SvxSetItem( ((SvxSetItem&)pSet->Get( ATTR_PAGE_HEADERSET ) ) ); + pHFSetItem = new SvxSetItem( static_cast<const SvxSetItem&>(pSet->Get( ATTR_PAGE_HEADERSET ) ) ); pHFSet = &(pHFSetItem->GetItemSet()); pHFSet->Put( SvxBrushItem( aColGrey, ATTR_BACKGROUND ) ); diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 466a43f92c1e..0d264b06bfd1 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -147,7 +147,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() // GetPrinter wuerde dann auch einen neuen Printer anlegen, weil der // gespeicherte Printer noch nicht geladen ist! - ScDocument* pDoc = ((ScStyleSheetPool&)GetPool()).GetDocument(); + ScDocument* pDoc = static_cast<ScStyleSheetPool&>(GetPool()).GetDocument(); if ( pDoc ) { // Setzen von sinnvollen Default-Werten: @@ -155,8 +155,8 @@ SfxItemSet& ScStyleSheet::GetItemSet() SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetDefaultPaperSize() ); SvxSetItem aHFSetItem( - (const SvxSetItem&) - rItemPool.GetDefaultItem(ATTR_PAGE_HEADERSET) ); + static_cast<const SvxSetItem&>( + rItemPool.GetDefaultItem(ATTR_PAGE_HEADERSET) )); SfxItemSet& rHFSet = aHFSetItem.GetItemSet(); SvxSizeItem aHFSizeItem( // 0,5 cm + Abstand @@ -224,7 +224,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() { if ( !pSet->Count() ) { - ScDocument* pDoc = ((ScStyleSheetPool&)GetPool()).GetDocument(); + ScDocument* pDoc = static_cast<ScStyleSheetPool&>(GetPool()).GetDocument(); if ( pDoc ) { sal_uLong nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,ScGlobal::eLnge ); @@ -242,7 +242,7 @@ bool ScStyleSheet::IsUsed() const { // Always query the document to let it decide if a rescan is necessary, // and store the state. - ScDocument* pDoc = ((ScStyleSheetPool*)pPool)->GetDocument(); + ScDocument* pDoc = static_cast<ScStyleSheetPool*>(pPool)->GetDocument(); if ( pDoc && pDoc->IsStyleSheetUsed( *this, true ) ) eUsage = USED; else @@ -266,7 +266,7 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) const OUString& ScStyleSheet::GetName() const { const OUString& rBase = SfxStyleSheet::GetName(); - const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); + const OUString* pForceStdName = static_cast<ScStyleSheetPool*>(pPool)->GetForceStdName(); if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return *pForceStdName; else @@ -276,7 +276,7 @@ const OUString& ScStyleSheet::GetName() const const OUString& ScStyleSheet::GetParent() const { const OUString& rBase = SfxStyleSheet::GetParent(); - const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); + const OUString* pForceStdName = static_cast<ScStyleSheetPool*>(pPool)->GetForceStdName(); if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return *pForceStdName; else @@ -286,7 +286,7 @@ const OUString& ScStyleSheet::GetParent() const const OUString& ScStyleSheet::GetFollow() const { const OUString& rBase = SfxStyleSheet::GetFollow(); - const OUString* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName(); + const OUString* pForceStdName = static_cast<ScStyleSheetPool*>(pPool)->GetForceStdName(); if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) return *pForceStdName; else diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index d068c0d84fda..bc0b045fc810 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -1195,7 +1195,7 @@ bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, if (bMarked && !rMark.IsCellMarked(nCol,nRow)) return false; - if (bUnprotected && ((const ScProtectionAttr*) + if (bUnprotected && static_cast<const ScProtectionAttr*>( GetAttr(nCol,nRow,ATTR_PROTECTION))->GetProtection()) return false; @@ -1819,7 +1819,7 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d const ScPatternAttr* pPattern = GetPattern( rCol, nRow ); const SfxItemSet* pCondSet = pDocument->GetCondResult( rCol, nRow, nTab ); - SvxCellHorJustify eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) + SvxCellHorJustify eHorJust = (SvxCellHorJustify)static_cast<const SvxHorJustifyItem&>( pPattern->GetItem( ATTR_HOR_JUSTIFY, pCondSet )).GetValue(); if ( eHorJust == SVX_HOR_JUSTIFY_CENTER ) nMissing /= 2; // distributed into both directions diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index e17965098d9e..84af30b7be3f 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -871,7 +871,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScPatternAttr aNewPattern( *pPattern ); SfxItemSet& rNewSet = aNewPattern.GetItemSet(); - const SvxBoxItem& rOldBox = (const SvxBoxItem&)rSet.Get(ATTR_BORDER); + const SvxBoxItem& rOldBox = static_cast<const SvxBoxItem&>(rSet.Get(ATTR_BORDER)); if ( rOldBox.GetTop() || rOldBox.GetBottom() || rOldBox.GetLeft() || rOldBox.GetRight() ) { SvxBoxItem aNew( ATTR_BORDER ); @@ -886,7 +886,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, rNewSet.Put( aNew ); } - const ScMergeAttr& rOldMerge = (const ScMergeAttr&)rSet.Get(ATTR_MERGE); + const ScMergeAttr& rOldMerge = static_cast<const ScMergeAttr&>(rSet.Get(ATTR_MERGE)); if (rOldMerge.IsMerged()) rNewSet.Put( ScMergeAttr( std::min( static_cast<SCsCOL>(rOldMerge.GetRowMerge()), @@ -894,7 +894,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, std::min( static_cast<SCsROW>(rOldMerge.GetColMerge()), static_cast<SCsROW>(MAXROW+1 - (nCol-nCol1))))); - const ScMergeFlagAttr& rOldFlag = (const ScMergeFlagAttr&)rSet.Get(ATTR_MERGE_FLAG); + const ScMergeFlagAttr& rOldFlag = static_cast<const ScMergeFlagAttr&>(rSet.Get(ATTR_MERGE_FLAG)); if (rOldFlag.IsOverlapped()) { sal_Int16 nNewFlags = rOldFlag.GetValue() & ~( SC_MF_HOR | SC_MF_VER ); @@ -1931,7 +1931,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO double nFactor = 0.0; if ( nCol > nX2+1 ) { - long nRotVal = ((const SfxInt32Item&) pPattern-> + long nRotVal = static_cast<const SfxInt32Item&>( pPattern-> GetItem( ATTR_ROTATE_VALUE, pCondSet )).GetValue(); double nRealOrient = nRotVal * F_PI18000; // 1/100 Grad double nCos = cos( nRealOrient ); diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 3558eec3c88d..ce9a07e2c3a2 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -225,7 +225,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (eCellType == CELLTYPE_VALUE) { - sal_uInt32 nFormat = ((const SfxUInt32Item*)GetAttr(nCol,nRow,ATTR_VALUE_FORMAT))->GetValue(); + sal_uInt32 nFormat = static_cast<const SfxUInt32Item*>(GetAttr(nCol,nRow,ATTR_VALUE_FORMAT))->GetValue(); bool bDate = ( pDocument->GetFormatTable()->GetType(nFormat) == NUMBERFORMAT_DATE ); if (bDate) { @@ -1972,11 +1972,11 @@ void ScTable::GetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAut void ScTable::GetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData& rData) { - const SvxBoxItem* pTheBox = (SvxBoxItem*)GetAttr(nCol, nRow, ATTR_BORDER); - const SvxBoxItem* pLeftBox = (SvxBoxItem*)GetAttr(nCol - 1, nRow, ATTR_BORDER); - const SvxBoxItem* pTopBox = (SvxBoxItem*)GetAttr(nCol, nRow - 1, ATTR_BORDER); - const SvxBoxItem* pRightBox = (SvxBoxItem*)GetAttr(nCol + 1, nRow, ATTR_BORDER); - const SvxBoxItem* pBottomBox = (SvxBoxItem*)GetAttr(nCol, nRow + 1, ATTR_BORDER); + const SvxBoxItem* pTheBox = static_cast<const SvxBoxItem*>(GetAttr(nCol, nRow, ATTR_BORDER)); + const SvxBoxItem* pLeftBox = static_cast<const SvxBoxItem*>(GetAttr(nCol - 1, nRow, ATTR_BORDER)); + const SvxBoxItem* pTopBox = static_cast<const SvxBoxItem*>(GetAttr(nCol, nRow - 1, ATTR_BORDER)); + const SvxBoxItem* pRightBox = static_cast<const SvxBoxItem*>(GetAttr(nCol + 1, nRow, ATTR_BORDER)); + const SvxBoxItem* pBottomBox = static_cast<const SvxBoxItem*>(GetAttr(nCol, nRow + 1, ATTR_BORDER)); SvxBoxItem aBox( ATTR_BORDER ); if (nFlags & LF_LEFT) diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 785960ec8876..dac078696532 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -53,7 +53,7 @@ using ::std::set; // STATIC DATA ----------------------------------------------------------- -#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() +#define GET_SCALEVALUE(set,id) static_cast<const SfxUInt16Item&>(set.Get( id )).GetValue() void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) { @@ -134,7 +134,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) if ( pStyleSet->GetItemState( ATTR_PAGE_SCALETOPAGES, false, &pItem ) == SfxItemState::SET ) { OSL_ENSURE( pItem->ISA(SfxUInt16Item), "invalid Item" ); - bSkipColBreaks = bSkipRowBreaks = ( ((const SfxUInt16Item*)pItem)->GetValue() > 0 ); + bSkipColBreaks = bSkipRowBreaks = static_cast<const SfxUInt16Item*>(pItem)->GetValue() > 0; } if ( !bSkipColBreaks && pStyleSet->GetItemState(ATTR_PAGE_SCALETO, false, &pItem) == SfxItemState::SET ) diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 96798f0c07c5..0ecd9e4b9efd 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -292,7 +292,7 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput, SbxVariable* pVar = pRoot->Find( aErrorTitle, SbxCLASS_METHOD ); if ( pVar && pVar->ISA(SbMethod) ) { - SbMethod* pMethod = (SbMethod*)pVar; + SbMethod* pMethod = static_cast<SbMethod*>(pVar); SbModule* pModule = pMethod->GetModule(); SbxObject* pObject = pModule->GetParent(); OUStringBuffer aMacroStr = pObject->GetName(); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 087e612ed887..88f7b5849b70 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -288,7 +288,7 @@ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& rAdjust ) #define READ( aItem, ItemType, nVers ) \ pNew = aItem.Create( rStream, nVers ); \ - aItem = *(ItemType*)pNew; \ + aItem = *static_cast<ItemType*>(pNew); \ delete pNew; bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer ) @@ -333,7 +333,7 @@ bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersio READ( aBackground, SvxBrushItem, rVersions.nBrushVersion) pNew = aAdjust.Create( rStream, rVersions.nAdjustVersion ); - SetAdjust( *(SvxAdjustItem*)pNew ); + SetAdjust( *static_cast<SvxAdjustItem*>(pNew) ); delete pNew; if (nVer >= AUTOFORMAT_DATA_ID_31005) @@ -345,16 +345,16 @@ bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersio READ( aMargin, SvxMarginItem, rVersions.nMarginVersion) pNew = aLinebreak.Create( rStream, rVersions.nBoolVersion ); - SetLinebreak( *(SfxBoolItem*)pNew ); + SetLinebreak( *static_cast<SfxBoolItem*>(pNew) ); delete pNew; if ( nVer >= AUTOFORMAT_DATA_ID_504 ) { pNew = aRotateAngle.Create( rStream, rVersions.nInt32Version ); - SetRotateAngle( *(SfxInt32Item*)pNew ); + SetRotateAngle( *static_cast<SfxInt32Item*>(pNew) ); delete pNew; pNew = aRotateMode.Create( rStream, rVersions.nRotateModeVersion ); - SetRotateMode( *(SvxRotateModeItem*)pNew ); + SetRotateMode( *static_cast<SvxRotateModeItem*>(pNew) ); delete pNew; } @@ -524,35 +524,35 @@ void ScAutoFormatData::PutItem( sal_uInt16 nIndex, const SfxPoolItem& rItem ) ScAutoFormatDataField& rField = GetField( nIndex ); switch( rItem.Which() ) { - case ATTR_FONT: rField.SetFont( (const SvxFontItem&)rItem ); break; - case ATTR_FONT_HEIGHT: rField.SetHeight( (const SvxFontHeightItem&)rItem ); break; - case ATTR_FONT_WEIGHT: rField.SetWeight( (const SvxWeightItem&)rItem ); break; - case ATTR_FONT_POSTURE: rField.SetPosture( (const SvxPostureItem&)rItem ); break; - case ATTR_CJK_FONT: rField.SetCJKFont( (const SvxFontItem&)rItem ); break; - case ATTR_CJK_FONT_HEIGHT: rField.SetCJKHeight( (const SvxFontHeightItem&)rItem ); break; - case ATTR_CJK_FONT_WEIGHT: rField.SetCJKWeight( (const SvxWeightItem&)rItem ); break; - case ATTR_CJK_FONT_POSTURE: rField.SetCJKPosture( (const SvxPostureItem&)rItem ); break; - case ATTR_CTL_FONT: rField.SetCTLFont( (const SvxFontItem&)rItem ); break; - case ATTR_CTL_FONT_HEIGHT: rField.SetCTLHeight( (const SvxFontHeightItem&)rItem ); break; - case ATTR_CTL_FONT_WEIGHT: rField.SetCTLWeight( (const SvxWeightItem&)rItem ); break; - case ATTR_CTL_FONT_POSTURE: rField.SetCTLPosture( (const SvxPostureItem&)rItem ); break; - case ATTR_FONT_UNDERLINE: rField.SetUnderline( (const SvxUnderlineItem&)rItem ); break; - case ATTR_FONT_OVERLINE: rField.SetOverline( (const SvxOverlineItem&)rItem ); break; - case ATTR_FONT_CROSSEDOUT: rField.SetCrossedOut( (const SvxCrossedOutItem&)rItem ); break; - case ATTR_FONT_CONTOUR: rField.SetContour( (const SvxContourItem&)rItem ); break; - case ATTR_FONT_SHADOWED: rField.SetShadowed( (const SvxShadowedItem&)rItem ); break; - case ATTR_FONT_COLOR: rField.SetColor( (const SvxColorItem&)rItem ); break; - case ATTR_BORDER: rField.SetBox( (const SvxBoxItem&)rItem ); break; - case ATTR_BORDER_TLBR: rField.SetTLBR( (const SvxLineItem&)rItem ); break; - case ATTR_BORDER_BLTR: rField.SetBLTR( (const SvxLineItem&)rItem ); break; - case ATTR_BACKGROUND: rField.SetBackground( (const SvxBrushItem&)rItem ); break; - case ATTR_HOR_JUSTIFY: rField.SetHorJustify( (const SvxHorJustifyItem&)rItem ); break; - case ATTR_VER_JUSTIFY: rField.SetVerJustify( (const SvxVerJustifyItem&)rItem ); break; - case ATTR_STACKED: rField.SetStacked( (const SfxBoolItem&)rItem ); break; - case ATTR_MARGIN: rField.SetMargin( (const SvxMarginItem&)rItem ); break; - case ATTR_LINEBREAK: rField.SetLinebreak( (const SfxBoolItem&)rItem ); break; - case ATTR_ROTATE_VALUE: rField.SetRotateAngle( (const SfxInt32Item&)rItem ); break; - case ATTR_ROTATE_MODE: rField.SetRotateMode( (const SvxRotateModeItem&)rItem ); break; + case ATTR_FONT: rField.SetFont( static_cast<const SvxFontItem&>(rItem) ); break; + case ATTR_FONT_HEIGHT: rField.SetHeight( static_cast<const SvxFontHeightItem&>(rItem) ); break; + case ATTR_FONT_WEIGHT: rField.SetWeight( static_cast<const SvxWeightItem&>(rItem) ); break; + case ATTR_FONT_POSTURE: rField.SetPosture( static_cast<const SvxPostureItem&>(rItem) ); break; + case ATTR_CJK_FONT: rField.SetCJKFont( static_cast<const SvxFontItem&>(rItem) ); break; + case ATTR_CJK_FONT_HEIGHT: rField.SetCJKHeight( static_cast<const SvxFontHeightItem&>(rItem) ); break; + case ATTR_CJK_FONT_WEIGHT: rField.SetCJKWeight( static_cast<const SvxWeightItem&>(rItem) ); break; + case ATTR_CJK_FONT_POSTURE: rField.SetCJKPosture( static_cast<const SvxPostureItem&>(rItem) ); break; + case ATTR_CTL_FONT: rField.SetCTLFont( static_cast<const SvxFontItem&>(rItem) ); break; + case ATTR_CTL_FONT_HEIGHT: rField.SetCTLHeight( static_cast<const SvxFontHeightItem&>(rItem) ); break; + case ATTR_CTL_FONT_WEIGHT: rField.SetCTLWeight( static_cast<const SvxWeightItem&>(rItem) ); break; + case ATTR_CTL_FONT_POSTURE: rField.SetCTLPosture( static_cast<const SvxPostureItem&>(rItem) ); break; + case ATTR_FONT_UNDERLINE: rField.SetUnderline( static_cast<const SvxUnderlineItem&>(rItem) ); break; + case ATTR_FONT_OVERLINE: rField.SetOverline( static_cast<const SvxOverlineItem&>(rItem) ); break; + case ATTR_FONT_CROSSEDOUT: rField.SetCrossedOut( static_cast<const SvxCrossedOutItem&>(rItem) ); break; + case ATTR_FONT_CONTOUR: rField.SetContour( static_cast<const SvxContourItem&>(rItem) ); break; + case ATTR_FONT_SHADOWED: rField.SetShadowed( static_cast<const SvxShadowedItem&>(rItem) ); break; + case ATTR_FONT_COLOR: rField.SetColor( static_cast<const SvxColorItem&>(rItem) ); break; + case ATTR_BORDER: rField.SetBox( static_cast<const SvxBoxItem&>(rItem) ); break; + case ATTR_BORDER_TLBR: rField.SetTLBR( static_cast<const SvxLineItem&>(rItem) ); break; + case ATTR_BORDER_BLTR: rField.SetBLTR( static_cast<const SvxLineItem&>(rItem) ); break; + case ATTR_BACKGROUND: rField.SetBackground( static_cast<const SvxBrushItem&>(rItem) ); break; + case ATTR_HOR_JUSTIFY: rField.SetHorJustify( static_cast<const SvxHorJustifyItem&>(rItem) ); break; + case ATTR_VER_JUSTIFY: rField.SetVerJustify( static_cast<const SvxVerJustifyItem&>(rItem) ); break; + case ATTR_STACKED: rField.SetStacked( static_cast<const SfxBoolItem&>(rItem) ); break; + case ATTR_MARGIN: rField.SetMargin( static_cast<const SvxMarginItem&>(rItem) ); break; + case ATTR_LINEBREAK: rField.SetLinebreak( static_cast<const SfxBoolItem&>(rItem) ); break; + case ATTR_ROTATE_VALUE: rField.SetRotateAngle( static_cast<const SfxInt32Item&>(rItem) ); break; + case ATTR_ROTATE_MODE: rField.SetRotateMode( static_cast<const SvxRotateModeItem&>(rItem) ); break; } } @@ -707,34 +707,34 @@ void ScAutoFormatData::GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rIte ScAutoFormatDataField& rField = GetField( nIndex ); rField.SetNumFormat ( rNumFormat); - rField.SetFont ( (const SvxFontItem&) rItemSet.Get( ATTR_FONT ) ); - rField.SetHeight ( (const SvxFontHeightItem&) rItemSet.Get( ATTR_FONT_HEIGHT ) ); - rField.SetWeight ( (const SvxWeightItem&) rItemSet.Get( ATTR_FONT_WEIGHT ) ); - rField.SetPosture ( (const SvxPostureItem&) rItemSet.Get( ATTR_FONT_POSTURE ) ); - rField.SetCJKFont ( (const SvxFontItem&) rItemSet.Get( ATTR_CJK_FONT ) ); - rField.SetCJKHeight ( (const SvxFontHeightItem&) rItemSet.Get( ATTR_CJK_FONT_HEIGHT ) ); - rField.SetCJKWeight ( (const SvxWeightItem&) rItemSet.Get( ATTR_CJK_FONT_WEIGHT ) ); - rField.SetCJKPosture ( (const SvxPostureItem&) rItemSet.Get( ATTR_CJK_FONT_POSTURE ) ); - rField.SetCTLFont ( (const SvxFontItem&) rItemSet.Get( ATTR_CTL_FONT ) ); - rField.SetCTLHeight ( (const SvxFontHeightItem&) rItemSet.Get( ATTR_CTL_FONT_HEIGHT ) ); - rField.SetCTLWeight ( (const SvxWeightItem&) rItemSet.Get( ATTR_CTL_FONT_WEIGHT ) ); - rField.SetCTLPosture ( (const SvxPostureItem&) rItemSet.Get( ATTR_CTL_FONT_POSTURE ) ); - rField.SetUnderline ( (const SvxUnderlineItem&) rItemSet.Get( ATTR_FONT_UNDERLINE ) ); - rField.SetOverline ( (const SvxOverlineItem&) rItemSet.Get( ATTR_FONT_OVERLINE ) ); - rField.SetCrossedOut ( (const SvxCrossedOutItem&) rItemSet.Get( ATTR_FONT_CROSSEDOUT ) ); - rField.SetContour ( (const SvxContourItem&) rItemSet.Get( ATTR_FONT_CONTOUR ) ); - rField.SetShadowed ( (const SvxShadowedItem&) rItemSet.Get( ATTR_FONT_SHADOWED ) ); - rField.SetColor ( (const SvxColorItem&) rItemSet.Get( ATTR_FONT_COLOR ) ); - rField.SetTLBR ( (const SvxLineItem&) rItemSet.Get( ATTR_BORDER_TLBR ) ); - rField.SetBLTR ( (const SvxLineItem&) rItemSet.Get( ATTR_BORDER_BLTR ) ); - rField.SetHorJustify ( (const SvxHorJustifyItem&) rItemSet.Get( ATTR_HOR_JUSTIFY ) ); - rField.SetVerJustify ( (const SvxVerJustifyItem&) rItemSet.Get( ATTR_VER_JUSTIFY ) ); - rField.SetStacked ( (const SfxBoolItem&) rItemSet.Get( ATTR_STACKED ) ); - rField.SetLinebreak ( (const SfxBoolItem&) rItemSet.Get( ATTR_LINEBREAK ) ); - rField.SetMargin ( (const SvxMarginItem&) rItemSet.Get( ATTR_MARGIN ) ); - rField.SetBackground ( (const SvxBrushItem&) rItemSet.Get( ATTR_BACKGROUND ) ); - rField.SetRotateAngle ( (const SfxInt32Item&) rItemSet.Get( ATTR_ROTATE_VALUE ) ); - rField.SetRotateMode ( (const SvxRotateModeItem&) rItemSet.Get( ATTR_ROTATE_MODE ) ); + rField.SetFont ( static_cast<const SvxFontItem&> (rItemSet.Get( ATTR_FONT )) ); + rField.SetHeight ( static_cast<const SvxFontHeightItem&> (rItemSet.Get( ATTR_FONT_HEIGHT )) ); + rField.SetWeight ( static_cast<const SvxWeightItem&> (rItemSet.Get( ATTR_FONT_WEIGHT )) ); + rField.SetPosture ( static_cast<const SvxPostureItem&> (rItemSet.Get( ATTR_FONT_POSTURE )) ); + rField.SetCJKFont ( static_cast<const SvxFontItem&> (rItemSet.Get( ATTR_CJK_FONT )) ); + rField.SetCJKHeight ( static_cast<const SvxFontHeightItem&> (rItemSet.Get( ATTR_CJK_FONT_HEIGHT )) ); + rField.SetCJKWeight ( static_cast<const SvxWeightItem&> (rItemSet.Get( ATTR_CJK_FONT_WEIGHT )) ); + rField.SetCJKPosture ( static_cast<const SvxPostureItem&> (rItemSet.Get( ATTR_CJK_FONT_POSTURE )) ); + rField.SetCTLFont ( static_cast<const SvxFontItem&> (rItemSet.Get( ATTR_CTL_FONT )) ); + rField.SetCTLHeight ( static_cast<const SvxFontHeightItem&> (rItemSet.Get( ATTR_CTL_FONT_HEIGHT )) ); + rField.SetCTLWeight ( static_cast<const SvxWeightItem&> (rItemSet.Get( ATTR_CTL_FONT_WEIGHT )) ); + rField.SetCTLPosture ( static_cast<const SvxPostureItem&> (rItemSet.Get( ATTR_CTL_FONT_POSTURE )) ); + rField.SetUnderline ( static_cast<const SvxUnderlineItem&> (rItemSet.Get( ATTR_FONT_UNDERLINE )) ); + rField.SetOverline ( static_cast<const SvxOverlineItem&> (rItemSet.Get( ATTR_FONT_OVERLINE )) ); + rField.SetCrossedOut ( static_cast<const SvxCrossedOutItem&> (rItemSet.Get( ATTR_FONT_CROSSEDOUT )) ); + rField.SetContour ( static_cast<const SvxContourItem&> (rItemSet.Get( ATTR_FONT_CONTOUR )) ); + rField.SetShadowed ( static_cast<const SvxShadowedItem&> (rItemSet.Get( ATTR_FONT_SHADOWED )) ); + rField.SetColor ( static_cast<const SvxColorItem&> (rItemSet.Get( ATTR_FONT_COLOR )) ); + rField.SetTLBR ( static_cast<const SvxLineItem&> (rItemSet.Get( ATTR_BORDER_TLBR )) ); + rField.SetBLTR ( static_cast<const SvxLineItem&> (rItemSet.Get( ATTR_BORDER_BLTR )) ); + rField.SetHorJustify ( static_cast<const SvxHorJustifyItem&> (rItemSet.Get( ATTR_HOR_JUSTIFY )) ); + rField.SetVerJustify ( static_cast<const SvxVerJustifyItem&> (rItemSet.Get( ATTR_VER_JUSTIFY )) ); + rField.SetStacked ( static_cast<const SfxBoolItem&> (rItemSet.Get( ATTR_STACKED )) ); + rField.SetLinebreak ( static_cast<const SfxBoolItem&> (rItemSet.Get( ATTR_LINEBREAK )) ); + rField.SetMargin ( static_cast<const SvxMarginItem&> (rItemSet.Get( ATTR_MARGIN )) ); + rField.SetBackground ( static_cast<const SvxBrushItem&> (rItemSet.Get( ATTR_BACKGROUND )) ); + rField.SetRotateAngle ( static_cast<const SfxInt32Item&> (rItemSet.Get( ATTR_ROTATE_VALUE )) ); + rField.SetRotateMode ( static_cast<const SvxRotateModeItem&> (rItemSet.Get( ATTR_ROTATE_MODE )) ); } bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions ) diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 012eb872dae5..7954851a3a17 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -58,7 +58,7 @@ sal_uInt16 lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAl { if ( pObject->GetObjIdentifier() == OBJ_OLE2 && pDoc->IsChart( pObject ) ) { - OUString aName = ((SdrOle2Obj*)pObject)->GetPersistName(); + OUString aName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); bool bHit = true; if ( !bAllCharts ) { @@ -134,9 +134,9 @@ void ScChartHelper::AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, SdrObject* pObject = aIter.Next(); while( pObject ) { - if( pObject->GetObjIdentifier() == OBJ_OLE2 && ((SdrOle2Obj*)pObject)->IsChart() ) + if( pObject->GetObjIdentifier() == OBJ_OLE2 && static_cast<SdrOle2Obj*>(pObject)->IsChart() ) { - OUString aChartName = ((SdrOle2Obj*)pObject)->GetPersistName(); + OUString aChartName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); Reference< chart2::XChartDocument > xChartDoc( pDestDoc->GetChartByName( aChartName ) ); Reference< chart2::data::XDataReceiver > xReceiver( xChartDoc, uno::UNO_QUERY ); @@ -174,9 +174,9 @@ void ScChartHelper::UpdateChartsOnDestinationPage( ScDocument* pDestDoc, const S SdrObject* pObject = aIter.Next(); while( pObject ) { - if( pObject->GetObjIdentifier() == OBJ_OLE2 && ((SdrOle2Obj*)pObject)->IsChart() ) + if( pObject->GetObjIdentifier() == OBJ_OLE2 && static_cast<SdrOle2Obj*>(pObject)->IsChart() ) { - OUString aChartName = ((SdrOle2Obj*)pObject)->GetPersistName(); + OUString aChartName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); Reference< chart2::XChartDocument > xChartDoc( pDestDoc->GetChartByName( aChartName ) ); Reference< util::XModifiable > xModif(xChartDoc, uno::UNO_QUERY_THROW); xModif->setModified( sal_True); @@ -191,9 +191,9 @@ uno::Reference< chart2::XChartDocument > ScChartHelper::GetChartFromSdrObject( S uno::Reference< chart2::XChartDocument > xReturn; if( pObject ) { - if( pObject->GetObjIdentifier() == OBJ_OLE2 && ((SdrOle2Obj*)pObject)->IsChart() ) + if( pObject->GetObjIdentifier() == OBJ_OLE2 && static_cast<SdrOle2Obj*>(pObject)->IsChart() ) { - uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pObject)->GetObjRef(); + uno::Reference< embed::XEmbeddedObject > xIPObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); if( xIPObj.is() ) { svt::EmbeddedObjectRef::TryRunningState( xIPObj ); diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index b63d3b93bd7c..d71643dae148 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -59,7 +59,7 @@ std::vector< WeakReference< frame::XModel > > lcl_getAllLivingCharts( ScDocument { if( pDoc->IsChart( pObject ) ) { - uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pObject)->GetObjRef(); + uno::Reference< embed::XEmbeddedObject > xIPObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); uno::Reference< embed::XComponentSupplier > xCompSupp( xIPObj, uno::UNO_QUERY ); if( xCompSupp.is()) { diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index f3b49468ced0..22e553990dce 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -47,7 +47,7 @@ ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xP try { uno::Reference< ov::msforms::XFillFormat > xFillFormat( xInternalParent, uno::UNO_QUERY_THROW ); - m_pFillFormat = ( ScVbaFillFormat* )( xFillFormat.get() ); + m_pFillFormat = static_cast<ScVbaFillFormat*>( xFillFormat.get() ); }catch ( uno::RuntimeException& ) { m_pFillFormat = NULL; diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index 6c69943e4aa8..8b6384d37e42 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -65,8 +65,8 @@ VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExcept nValue = SUPERSCRIPT; nValue2 = SUPERSCRIPTHEIGHT; } - mxFont->setPropertyValue( "CharEscapement" , ( uno::Any )nValue ); - mxFont->setPropertyValue( "CharEscapementHeight" , ( uno::Any )nValue2 ); + mxFont->setPropertyValue( "CharEscapement" , uno::Any(nValue) ); + mxFont->setPropertyValue( "CharEscapementHeight" , uno::Any(nValue2) ); } uno::Any SAL_CALL @@ -97,8 +97,8 @@ VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio nValue2 = SUBSCRIPTHEIGHT; } - mxFont->setPropertyValue( "CharEscapementHeight" , ( uno::Any )nValue2 ); - mxFont->setPropertyValue( "CharEscapement" , ( uno::Any )nValue ); + mxFont->setPropertyValue( "CharEscapementHeight" , uno::Any(nValue2) ); + mxFont->setPropertyValue( "CharEscapement" , uno::Any(nValue) ); } |