diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-09-30 16:10:07 +0200 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2015-10-06 07:29:37 +0000 |
| commit | 89d39bc100aabf5dccbe77c0b5c0c85736e85b39 (patch) | |
| tree | 871a91210913ecee91530c95392534bf18f80f3f /sc | |
| parent | 32b9901dae7403453d773f5904de15551a323595 (diff) | |
tdf#94559: 4th step to remove rtti.hxx
replaced use of PTR_CAST, IS_TYPE, ISA in
idl, editeng, sc, sd, sw, sfx2, sot, starmath
Change-Id: I4a5bba4fdc4829099618c09b690c83f876a3d653
Reviewed-on: https://gerrit.libreoffice.org/19132
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'sc')
110 files changed, 401 insertions, 420 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index d391733fd9ed..e6d9081ff1cc 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -6764,8 +6764,7 @@ void Test::testUndoDataAnchor() ScDocShell* Test::findLoadedDocShellByName(const OUString& rName) { - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType, false)); + ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>, false)); while (pShell) { SfxMedium* pMedium = pShell->GetMedium(); @@ -6775,7 +6774,7 @@ ScDocShell* Test::findLoadedDocShellByName(const OUString& rName) if (aName.equals(rName)) return pShell; } - pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, &aType, false)); + pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, checkSfxObjectShell<ScDocShell>, false)); } return NULL; } diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index d9e9bd376ebd..15818a927a10 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -726,7 +726,7 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const for (i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScDdeLink)) + if (dynamic_cast<const ScDdeLink*>( pBase) != nullptr) if ( !bExport40 || static_cast<ScDdeLink*>(pBase)->GetMode() == SC_DDE_DEFAULT ) ++nDdeCount; } @@ -741,7 +741,7 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const for (i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScDdeLink)) + if (dynamic_cast<const ScDdeLink*>( pBase) != nullptr) { ScDdeLink* pLink = static_cast<ScDdeLink*>(pBase); if ( !bExport40 || pLink->GetMode() == SC_DDE_DEFAULT ) @@ -893,7 +893,7 @@ void ScDocument::CopyDdeLinks( ScDocument* pDestDoc ) const for (size_t i = 0, n = rLinks.size(); i < n; ++i) { const sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScDdeLink)) + if (dynamic_cast<const ScDdeLink*>( pBase) != nullptr) { const ScDdeLink* p = static_cast<const ScDdeLink*>(pBase); ScDdeLink* pNew = new ScDdeLink(pDestDoc, *p); @@ -922,7 +922,7 @@ ScDdeLink* lclGetDdeLink( for( size_t nIndex = 0; nIndex < nCount; ++nIndex ) { ::sfx2::SvBaseLink* pLink = *rLinks[ nIndex ]; - if( ScDdeLink* pDdeLink = PTR_CAST( ScDdeLink, pLink ) ) + if( ScDdeLink* pDdeLink = dynamic_cast<ScDdeLink*>( pLink ) ) { if( (OUString(pDdeLink->GetAppl()) == rAppl) && (OUString(pDdeLink->GetTopic()) == rTopic) && @@ -949,7 +949,7 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, size_t nDdePos for( size_t nIndex = 0; nIndex < nCount; ++nIndex ) { ::sfx2::SvBaseLink* pLink = *rLinks[ nIndex ]; - if( ScDdeLink* pDdeLink = PTR_CAST( ScDdeLink, pLink ) ) + if( ScDdeLink* pDdeLink = dynamic_cast<ScDdeLink*>( pLink ) ) { if( nDdeIndex == nDdePos ) return pDdeLink; @@ -1046,7 +1046,7 @@ bool ScDocument::HasAreaLinks() const const ::sfx2::SvBaseLinks& rLinks = pMgr->GetLinks(); sal_uInt16 nCount = rLinks.size(); for (sal_uInt16 i=0; i<nCount; i++) - if ((*rLinks[i])->ISA(ScAreaLink)) + if (0 != dynamic_cast<const ScAreaLink* >((*rLinks[i]).get())) return true; return false; @@ -1062,7 +1062,7 @@ void ScDocument::UpdateAreaLinks() for (size_t i=0; i<rLinks.size(); i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) pBase->Update(); } } @@ -1078,7 +1078,7 @@ void ScDocument::DeleteAreaLinksOnTab( SCTAB nTab ) while ( nPos < rLinks.size() ) { const ::sfx2::SvBaseLink* pBase = *rLinks[nPos]; - if ( pBase->ISA(ScAreaLink) && + if ( dynamic_cast<const ScAreaLink*>( pBase) != nullptr && static_cast<const ScAreaLink*>(pBase)->GetDestArea().aStart.Tab() == nTab ) pMgr->Remove(nPos); else @@ -1100,7 +1100,7 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, for (sal_uInt16 i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) { ScAreaLink* pLink = static_cast<ScAreaLink*>(pBase); ScRange aOutRange = pLink->GetDestArea(); @@ -1136,13 +1136,13 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, { bool bFound = false; ::sfx2::SvBaseLink* pFirst = *rLinks[nFirstIndex]; - if ( pFirst->ISA(ScAreaLink) ) + if ( dynamic_cast<const ScAreaLink*>( pFirst) != nullptr ) { ScAddress aFirstPos = static_cast<ScAreaLink*>(pFirst)->GetDestArea().aStart; for ( sal_uInt16 nSecondIndex = nFirstIndex + 1; nSecondIndex < nCount && !bFound; ++nSecondIndex ) { ::sfx2::SvBaseLink* pSecond = *rLinks[nSecondIndex]; - if ( pSecond->ISA(ScAreaLink) && + if ( dynamic_cast<const ScAreaLink*>( pSecond) != nullptr && static_cast<ScAreaLink*>(pSecond)->GetDestArea().aStart == aFirstPos ) { // remove the first link, exit the inner loop, don't increment nFirstIndex diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 0c9ad39acfc5..9ca20922cded 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -344,7 +344,7 @@ void ScDocument::StartAnimations( SCTAB nTab, vcl::Window* pWin ) SdrObject* pObject = aIter.Next(); while (pObject) { - if (pObject->ISA(SdrGrafObj)) + if (dynamic_cast<const SdrGrafObj*>( pObject) != nullptr) { SdrGrafObj* pGrafObj = static_cast<SdrGrafObj*>(pObject); if ( pGrafObj->IsAnimated() ) diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 68d99591386e..8fafa7b3b3dc 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4818,7 +4818,7 @@ bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllSt for ( const SfxStyleSheetBase* pStyle = aIter.First(); pStyle; pStyle = aIter.Next() ) { - const ScStyleSheet* pScStyle = PTR_CAST( ScStyleSheet, pStyle ); + const ScStyleSheet* pScStyle = dynamic_cast<const ScStyleSheet*>( pStyle ); if ( pScStyle ) pScStyle->SetUsage( ScStyleSheet::NOTUSED ); } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index dc7576ce81aa..f87954f742c5 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -552,7 +552,7 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC } if (bChange) { - if ( pObj->ISA( SdrRectObj ) && pData->maStart.IsValid() && pData->maEnd.IsValid() ) + if ( dynamic_cast<const SdrRectObj*>( pObj) != nullptr && pData->maStart.IsValid() && pData->maEnd.IsValid() ) pData->maStart.PutInOrder( pData->maEnd ); // Update also an untransformed anchor thats what we stored ( and still do ) to xml @@ -2047,7 +2047,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, Graphic aGraphic; bool bObjSupported = false; - if ( pObj->ISA( SdrGrafObj ) ) // Simple Graphics object + if ( dynamic_cast<const SdrGrafObj*>( pObj) != nullptr ) // Simple Graphics object { const SdrGrafObj* pGrafObj = static_cast<const SdrGrafObj*>( pObj ); const GeoStat& rGeo = pGrafObj->GetGeoStat(); @@ -2075,7 +2075,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, bObjSupported = true; } - else if ( pObj->ISA( SdrOle2Obj ) ) // OLE object + else if ( dynamic_cast<const SdrOle2Obj*>( pObj) != nullptr ) // OLE object { // TODO/LEAN: working with visual area needs running state aGraphSize = static_cast<const SdrOle2Obj*>(pObj)->GetOrigObjSize(); diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index d175cc75c9ab..ecc6b45f3327 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -110,7 +110,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) { - OSL_ENSURE( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" ); + OSL_ENSURE( dynamic_cast<const ScStyleSheet*>( &rStyle) != nullptr, "Invalid StyleSheet-class! :-/" ); return new ScStyleSheet( static_cast<const ScStyleSheet&>(rStyle) ); } diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index e54eaa7f5f22..fe8db9143d8c 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -133,7 +133,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) { if ( pStyleSet->GetItemState( ATTR_PAGE_SCALETOPAGES, false, &pItem ) == SfxItemState::SET ) { - OSL_ENSURE( pItem->ISA(SfxUInt16Item), "invalid Item" ); + OSL_ENSURE( dynamic_cast<const SfxUInt16Item*>( pItem) != nullptr, "invalid Item" ); bSkipColBreaks = bSkipRowBreaks = static_cast<const SfxUInt16Item*>(pItem)->GetValue() > 0; } diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index e168ec6110f1..2e77adac1745 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -289,7 +289,7 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput, StarBASIC* pRoot = pDocSh->GetBasic(); SbxVariable* pVar = pRoot->Find( aErrorTitle, SbxCLASS_METHOD ); - if ( pVar && pVar->ISA(SbMethod) ) + if ( pVar && dynamic_cast<const SbMethod*>( pVar) != nullptr ) { SbMethod* pMethod = static_cast<SbMethod*>(pVar); SbModule* pModule = pMethod->GetModule(); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 41c526ee7ff5..91bef3d0c2fd 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -3064,7 +3064,7 @@ bool ScCompiler::IsMacro( const OUString& rName ) // It really should be a BASIC function! if( pMeth->GetType() == SbxVOID || ( pMeth->IsFixed() && pMeth->GetType() == SbxEMPTY ) - || !pMeth->ISA(SbMethod) ) + || dynamic_cast<const SbMethod*>( pMeth) == nullptr ) { return false; } diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index be0c53cf5c7b..1b318010fa6d 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1251,7 +1251,7 @@ bool ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat ) bool bDoThis = true; if ( eWhat != SC_DET_ALL ) { - bool bCircle = ( pObject->ISA(SdrCircObj) ); + bool bCircle = ( dynamic_cast<const SdrCircObj*>( pObject) != nullptr ); bool bCaption = ScDrawLayer::IsNoteCaption( pObject ); if ( eWhat == SC_DET_DETECTIVE ) // detektive, from menue bDoThis = !bCaption; // also circles @@ -1502,7 +1502,7 @@ void ScDetectiveFunc::UpdateAllArrowColors() { // frame for area reference has no ObjType, always gets arrow color - if ( pObject->ISA( SdrRectObj ) && !pObject->ISA( SdrCaptionObj ) ) + if ( dynamic_cast<const SdrRectObj*>( pObject) != nullptr && dynamic_cast<const SdrCaptionObj*>( pObject) == nullptr ) { bArrow = true; } @@ -1544,7 +1544,7 @@ bool ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange ) { SdrObject* pPrevObj = pPage->GetObj(nOrdNum - 1); - if ( pPrevObj && pPrevObj->GetLayer() == SC_LAYER_INTERN && pPrevObj->ISA(SdrRectObj) ) + if ( pPrevObj && pPrevObj->GetLayer() == SC_LAYER_INTERN && dynamic_cast<const SdrRectObj*>( pPrevObj) != nullptr ) { ScDrawObjData* pPrevData = ScDrawLayer::GetObjDataTab( pPrevObj, rRange.aStart.Tab() ); if ( pPrevData && pPrevData->maStart.IsValid() && pPrevData->maEnd.IsValid() && (pPrevData->maStart == rRange.aStart) ) @@ -1596,7 +1596,7 @@ ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject, if ( nObjColor == GetErrorColor() && nObjColor != GetArrowColor() ) rRedLine = true; } - else if ( pObject->ISA(SdrCircObj) ) + else if ( dynamic_cast<const SdrCircObj*>( pObject) != nullptr ) { if ( bValidStart ) { diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 4d797ccda674..c2fedb2749c4 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -877,7 +877,7 @@ void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_Int32, sal { const SvxFieldData* pFld = rField.GetField(); - if ( pFld && pFld->ISA( SvxURLField ) && bExecuteURL ) + if ( pFld && dynamic_cast<const SvxURLField*>( pFld) != nullptr && bExecuteURL ) { const SvxURLField* pURLField = static_cast<const SvxURLField*>(pFld); ScGlobal::OpenURL( pURLField->GetURL(), pURLField->GetTargetFrame() ); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 677f2d305208..ce1fdda1cd91 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2346,7 +2346,7 @@ static ScDdeLink* lcl_GetDdeLink( sfx2::LinkManager* pLinkMgr, for (size_t i=0; i<nCount; i++ ) { ::sfx2::SvBaseLink* pBase = *pLinkMgr->GetLinks()[i]; - if (pBase->ISA(ScDdeLink)) + if (dynamic_cast<const ScDdeLink*>( pBase) != nullptr) { ScDdeLink* pLink = static_cast<ScDdeLink*>(pBase); if ( pLink->GetAppl() == rA && diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 68d182ca5f83..211ac7cb49f1 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -2907,7 +2907,7 @@ void ScInterpreter::ScMacro() } SbxVariable* pVar = pRoot ? pRoot->Find(aMacro, SbxCLASS_METHOD) : NULL; - if( !pVar || pVar->GetType() == SbxVOID || !pVar->ISA(SbMethod) ) + if( !pVar || pVar->GetType() == SbxVOID || dynamic_cast<const SbMethod*>( pVar) == nullptr ) { PushError( errNoMacro ); return; @@ -2919,7 +2919,7 @@ void ScInterpreter::ScMacro() SbModule* pModule = pMethod->GetModule(); bool bUseVBAObjects = pModule->IsVBACompat(); SbxObject* pObject = pModule->GetParent(); - OSL_ENSURE(pObject->IsA(TYPE(StarBASIC)), "No Basic found!"); + OSL_ENSURE(dynamic_cast<const StarBASIC *>(pObject) != nullptr, "No Basic found!"); OUString aMacroStr = pObject->GetName() + "." + pModule->GetName() + "." + pMethod->GetName(); OUString aBasicStr; if (pObject->GetParent()) @@ -3095,7 +3095,7 @@ void ScInterpreter::ScMacro() else if ( eResType & SbxARRAY ) { SbxBase* pElemObj = refRes->GetObject(); - SbxDimArray* pDimArray = PTR_CAST(SbxDimArray,pElemObj); + SbxDimArray* pDimArray = dynamic_cast< SbxDimArray *>( pElemObj ); short nDim = pDimArray->GetDims(); if ( 1 <= nDim && nDim <= 2 ) { diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index ab144bba1f76..e67cba02f623 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -465,7 +465,7 @@ XclExpStringRef lclCreateFormattedString( if( aEditSet.GetItemState( EE_FEATURE_FIELD, false, &pItem ) == SfxItemState::SET ) { const SvxFieldData* pField = static_cast< const SvxFieldItem* >( pItem )->GetField(); - if( const SvxURLField* pUrlField = PTR_CAST( SvxURLField, pField ) ) + if( const SvxURLField* pUrlField = dynamic_cast<const SvxURLField*>( pField ) ) { // convert URL field to string representation aXclPortionText = pLinkHelper ? @@ -808,19 +808,19 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico { if( const SvxFieldData* pFieldData = static_cast< const SvxFieldItem* >( pItem )->GetField() ) { - if( pFieldData->ISA( SvxPageField ) ) + if( dynamic_cast<const SvxPageField*>( pFieldData) != nullptr ) aParaText += "&P"; - else if( pFieldData->ISA( SvxPagesField ) ) + else if( dynamic_cast<const SvxPagesField*>( pFieldData) != nullptr ) aParaText += "&N"; - else if( pFieldData->ISA( SvxDateField ) ) + else if( dynamic_cast<const SvxDateField*>( pFieldData) != nullptr ) aParaText += "&D"; - else if( pFieldData->ISA( SvxTimeField ) || pFieldData->ISA( SvxExtTimeField ) ) + else if( dynamic_cast<const SvxTimeField*>( pFieldData) != nullptr || dynamic_cast<const SvxExtTimeField*>( pFieldData) != nullptr ) aParaText += "&T"; - else if( pFieldData->ISA( SvxTableField ) ) + else if( dynamic_cast<const SvxTableField*>( pFieldData) != nullptr ) aParaText += "&A"; - else if( pFieldData->ISA( SvxFileField ) ) // title -> file name + else if( dynamic_cast<const SvxFileField*>( pFieldData) != nullptr ) // title -> file name aParaText += "&F"; - else if( const SvxExtFileField* pFileField = PTR_CAST( SvxExtFileField, pFieldData ) ) + else if( const SvxExtFileField* pFileField = dynamic_cast<const SvxExtFileField*>( pFieldData ) ) { switch( pFileField->GetFormat() ) { diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 8ddd831875bb..c8d362275788 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1268,7 +1268,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) if ( aSet.GetItemState( EE_FEATURE_FIELD, false, &pItem ) == SfxItemState::SET ) { const SvxFieldData* pField = static_cast<const SvxFieldItem*>(pItem)->GetField(); - if ( pField && pField->ISA(SvxURLField) ) + if ( pField && dynamic_cast<const SvxURLField*>( pField) != nullptr ) { bUrl = true; const SvxURLField* pURLField = static_cast<const SvxURLField*>(pField); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 0191c89cc081..6a36a78eb98b 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -287,7 +287,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape pAnchor->SetFlags( *pObj ); pCurrAppData->SetClientAnchor( pAnchor ); } - const SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, pObj ); + const SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( pObj ); if( pTextObj && !lcl_IsFontwork( pTextObj ) && (pObj->GetObjIdentifier() != OBJ_CAPTION) ) { const OutlinerParaObject* pParaObj = pTextObj->GetOutlinerParaObject(); diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 0fea634e739b..11702c6efc23 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -80,7 +80,7 @@ SdrOle2Obj* ScClient::GetDrawObj() void ScClient::RequestNewObjectArea( Rectangle& aLogicRect ) { SfxViewShell* pSfxViewSh = GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( pSfxViewSh ); if (!pViewSh) { OSL_FAIL("Wrong ViewShell"); @@ -142,7 +142,7 @@ void ScClient::RequestNewObjectArea( Rectangle& aLogicRect ) void ScClient::ObjectAreaChanged() { SfxViewShell* pSfxViewSh = GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( pSfxViewSh ); if (!pViewSh) { OSL_FAIL("Wrong ViewShell"); @@ -174,7 +174,7 @@ void ScClient::ObjectAreaChanged() // set document modified (SdrModel::SetChanged is not used) // TODO/LATER: is there a reason that this code is not executed in Draw? // SfxViewShell* pSfxViewSh = GetViewShell(); -// ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); +// ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( pSfxViewSh ); if (pViewSh) pViewSh->GetViewData().GetDocShell()->SetDrawModified(); } @@ -226,7 +226,7 @@ void ScClient::ViewChanged() //SetObjArea( aObjArea ); SfxViewShell* pSfxViewSh = GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( pSfxViewSh ); if ( pViewSh ) { vcl::Window* pWin = pViewSh->GetActiveWin(); diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index c2182667c703..4cd8e87c5b3b 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -127,7 +127,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // URL button - SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObject); + SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObject ); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); @@ -267,7 +267,7 @@ static bool lcl_HasOnlyControls( SdrModel* pModel ) bOnlyControls = true; // only set if there are any objects at all while ( pObj ) { - if (!pObj->ISA(SdrUnoObj)) + if (dynamic_cast<const SdrUnoObj*>( pObj) == nullptr) { bOnlyControls = false; break; @@ -746,7 +746,7 @@ void ScDrawTransferObj::InitDocShell() SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrUnoObj*>( pObject) != nullptr ) pObject->NbcSetLayer(SC_LAYER_CONTROLS); else pObject->NbcSetLayer(SC_LAYER_FRONT); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 8cabdcb91706..9d5567df845b 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1676,7 +1676,7 @@ void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // Executed synchron UpdateAutoCorrFlag(); } - pActiveViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + pActiveViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pActiveViewSh && pActiveViewSh == pViewSh ) { @@ -2226,7 +2226,7 @@ void ScInputHandler::ShowRefFrame() // Modifying pActiveViewSh here would interfere with the bInEnterHandler / bRepeat // checks in NotifyChange, and lead to keeping the wrong value in pActiveViewSh. // A local variable is used instead. - ScTabViewShell* pVisibleSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + ScTabViewShell* pVisibleSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pRefViewSh && pRefViewSh != pVisibleSh ) { bool bFound = false; @@ -3395,7 +3395,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, if ( pSourceSh ) pActiveViewSh = pSourceSh; else - pActiveViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + pActiveViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); ImplCreateEditEngine(); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a717f00fdd38..ae0554381779 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -161,7 +161,7 @@ static VclPtr<ScTextWndBase> lcl_chooseRuntimeImpl( vcl::Window* pParent, SfxBin { SfxViewFrame* pViewFrm = pDisp->GetFrame(); if ( pViewFrm ) - pViewSh = PTR_CAST( ScTabViewShell, pViewFrm->GetViewShell() ); + pViewSh = dynamic_cast<ScTabViewShell*>( pViewFrm->GetViewShell() ); } if ( !lcl_isExperimentalMode() ) @@ -196,7 +196,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) : { SfxViewFrame* pViewFrm = pDisp->GetFrame(); if ( pViewFrm ) - pViewSh = PTR_CAST( ScTabViewShell, pViewFrm->GetViewShell() ); + pViewSh = dynamic_cast<ScTabViewShell*>( pViewFrm->GetViewShell() ); } OSL_ENSURE( pViewSh, "no view shell for input window" ); @@ -271,8 +271,7 @@ void ScInputWindow::dispose() if ( !bDown ) { - TypeId aScType = TYPE(ScTabViewShell); - SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); + SfxViewShell* pSh = SfxViewShell::GetFirst( true, checkSfxViewShell<ScTabViewShell> ); while ( pSh ) { ScInputHandler* pHdl = static_cast<ScTabViewShell*>(pSh)->GetInputHandler(); @@ -281,7 +280,7 @@ void ScInputWindow::dispose() pHdl->SetInputWindow( NULL ); pHdl->StopInputWinEngine( false ); // reset pTopView pointer } - pSh = SfxViewShell::GetNext( *pSh, &aScType ); + pSh = SfxViewShell::GetNext( *pSh, true, checkSfxViewShell<ScTabViewShell> ); } } @@ -309,7 +308,7 @@ void ScInputWindow::SetInputHandler( ScInputHandler* pNew ) bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) { bool bSubTotal = false; - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pViewSh ) { ScDocument* pDoc = pViewSh->GetViewData().GetDocument(); @@ -401,7 +400,7 @@ void ScInputWindow::Select() case SID_INPUT_SUM: { - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pViewSh ) { const ScMarkData& rMark = pViewSh->GetViewData().GetMarkData(); @@ -511,7 +510,7 @@ void ScInputWindow::Select() sal_Int32 nStartPos = 1; sal_Int32 nEndPos = 1; - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pViewSh ) { const OUString& rString = aTextWindow.GetTextString(); @@ -1799,7 +1798,7 @@ void ScTextWnd::StartEditEngine() // as long as EditEngine and DrawText sometimes differ for CTL text, // repaint now to have the EditEngine's version visible // SfxObjectShell* pObjSh = SfxObjectShell::Current(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocument& rDoc = static_cast<ScDocShell*>(pObjSh)->GetDocument(); // any document SvtScriptType nScript = rDoc.GetStringScriptType( aString ); @@ -1896,7 +1895,7 @@ void ScTextWnd::SetTextString( const OUString& rNewString ) SvtScriptType nOldScript = SvtScriptType::NONE; SvtScriptType nNewScript = SvtScriptType::NONE; SfxObjectShell* pObjSh = SfxObjectShell::Current(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { // any document can be used (used only for its break iterator) ScDocument& rDoc = static_cast<ScDocShell*>(pObjSh)->GetDocument(); @@ -2140,7 +2139,7 @@ void ScPosWnd::FillRangeNames() Clear(); SfxObjectShell* pObjSh = SfxObjectShell::Current(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocument& rDoc = static_cast<ScDocShell*>(pObjSh)->GetDocument(); @@ -2392,7 +2391,7 @@ void ScPosWnd::DoEnter() } else { - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); ScInputHandler* pHdl = pScMod->GetInputHdl( pViewSh ); if (pHdl) pHdl->InsertFunction( aText ); @@ -2531,7 +2530,7 @@ void ScPosWnd::ReleaseFocus_Impl() HideTip(); SfxViewShell* pCurSh = SfxViewShell::Current(); - ScInputHandler* pHdl = SC_MOD()->GetInputHdl( PTR_CAST( ScTabViewShell, pCurSh ) ); + ScInputHandler* pHdl = SC_MOD()->GetInputHdl( dynamic_cast<ScTabViewShell*>( pCurSh ) ); if ( pHdl && pHdl->IsTopMode() ) { // Focus back in input row? diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 1265653b1081..81626abc9dc4 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -246,7 +246,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 SfxViewShell* pViewShell = SfxViewShell::GetFirst(); while(pViewShell) { - if ( pViewShell->ISA(ScTabViewShell) ) + if ( dynamic_cast<const ScTabViewShell*>( pViewShell) != nullptr ) { ScTabViewShell* pViewSh = static_cast<ScTabViewShell*>(pViewShell); pViewSh->PaintGrid(); @@ -258,7 +258,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 if ( pHdl ) pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change } - else if ( pViewShell->ISA(ScPreviewShell) ) + else if ( dynamic_cast<const ScPreviewShell*>( pViewShell) != nullptr ) { vcl::Window* pWin = pViewShell->GetWindow(); if (pWin) @@ -293,7 +293,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 SfxViewShell* pSh = SfxViewShell::GetFirst(); while ( pSh ) { - if ( pSh->ISA( ScTabViewShell ) ) + if ( dynamic_cast<const ScTabViewShell*>( pSh) != nullptr ) { ScTabViewShell* pViewSh = static_cast<ScTabViewShell*>(pSh); @@ -305,7 +305,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 pViewSh->DigitLanguageChanged(); pViewSh->PaintGrid(); } - else if ( pSh->ISA( ScPreviewShell ) ) + else if ( dynamic_cast<const ScPreviewShell*>( pSh) != nullptr ) { ScPreviewShell* pPreviewSh = static_cast<ScPreviewShell*>(pSh); ScPreview* pPreview = pPreviewSh->GetPreview(); @@ -398,7 +398,7 @@ void ScModule::Execute( SfxRequest& rReq ) bSet = static_cast<const SfxBoolItem*>(pItem)->GetValue(); else { // Toggle - ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); if ( pDocSh ) bSet = !pDocSh->GetDocument().GetDocOptions().IsAutoSpell(); else @@ -476,7 +476,7 @@ void ScModule::Execute( SfxRequest& rReq ) if (pReqArgs) { const SfxUInt16Item& rItem = static_cast<const SfxUInt16Item&>(pReqArgs->Get(SID_PSZ_FUNCTION)); - OSL_ENSURE(rItem.ISA(SfxUInt16Item),"wrong Parameter"); + OSL_ENSURE(dynamic_cast<const SfxUInt16Item*>( &rItem) != nullptr,"wrong Parameter"); ScAppOptions aNewOpts( GetAppOptions() ); aNewOpts.SetStatusFunc( rItem.GetValue() ); @@ -501,7 +501,7 @@ void ScModule::Execute( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( GetPool().GetWhich(nSlot), true, &pItem ) ) { - ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); if ( pDocSh ) { ScDocument& rDoc = pDocSh->GetDocument(); @@ -524,7 +524,7 @@ void ScModule::Execute( SfxRequest& rReq ) ScInputHandler* pInputHandler = GetInputHdl(); if ( pInputHandler ) pInputHandler->UpdateSpellSettings(); // EditEngine flags - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pViewSh ) pViewSh->UpdateDrawTextOutliner(); // EditEngine flags @@ -570,7 +570,7 @@ void ScModule::Execute( SfxRequest& rReq ) void ScModule::GetState( SfxItemSet& rSet ) { - ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); bool bTabView = pDocSh && (pDocSh->GetBestViewShell() != NULL); SfxWhichIter aIter(rSet); @@ -961,8 +961,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); - ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); ScDocument* pDoc = pDocSh ? &pDocSh->GetDocument() : NULL; const SfxPoolItem* pItem = NULL; bool bRepaint = false; @@ -1331,8 +1331,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } // for all (tab-) views: - TypeId aScType = TYPE(ScTabViewShell); - SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); + SfxViewShell* pSh = SfxViewShell::GetFirst( true, checkSfxViewShell<ScTabViewShell> ); while ( pSh ) { ScTabViewShell* pOneViewSh = static_cast<ScTabViewShell*>(pSh); @@ -1351,7 +1350,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pOneViewSh->PaintTop(); pOneViewSh->PaintLeft(); - pSh = SfxViewShell::GetNext( *pSh, &aScType ); + pSh = SfxViewShell::GetNext( *pSh, true, checkSfxViewShell<ScTabViewShell> ); } } } @@ -1369,7 +1368,7 @@ ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef ) { // in case a UIActive embedded object has no ViewShell (UNO component) // the own calc view shell will be set as current, but no handling should happen - ScTabViewShell* pCurViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + ScTabViewShell* pCurViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pCurViewSh && !pCurViewSh->GetUIActiveClient() ) pViewSh = pCurViewSh; } @@ -1552,7 +1551,7 @@ void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) { // store the dialog id also in the view shell SfxViewShell* pViewSh = pViewFrm->GetViewShell(); - if ( pViewSh && pViewSh->ISA( ScTabViewShell ) ) + if ( pViewSh && dynamic_cast<const ScTabViewShell*>( pViewSh) != nullptr ) static_cast<ScTabViewShell*>(pViewSh)->SetCurRefDlgId( nCurRefDlgId ); else { @@ -1834,7 +1833,7 @@ static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) while ( pFrame ) { SfxViewShell* p = pFrame->GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( p ); if ( pViewSh ) pViewSh->CheckNeedsRepaint(); pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); @@ -1966,14 +1965,12 @@ SfxItemSet* ScModule::CreateItemSet( sal_uInt16 nId ) const ScAppOptions& rAppOpt = GetAppOptions(); - ScDocShell* pDocSh = PTR_CAST(ScDocShell, - SfxObjectShell::Current()); + ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() ); ScDocOptions aCalcOpt = pDocSh ? pDocSh->GetDocument().GetDocOptions() : GetDocOptions(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, - SfxViewShell::Current()); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( SfxViewShell::Current() ); ScViewOptions aViewOpt = pViewSh ? pViewSh->GetViewData().GetOptions() : GetViewOptions(); @@ -2149,7 +2146,7 @@ IMPL_LINK_TYPED( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) const SvxFieldItem& rField = pInfo->GetField(); const SvxFieldData* pField = rField.GetField(); - if (pField && pField->ISA(SvxURLField)) + if (pField && dynamic_cast<const SvxURLField*>( pField) != nullptr) { // URLField const SvxURLField* pURLField = static_cast<const SvxURLField*>(pField); diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index b48acb4c89df..0e199354d94f 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -43,7 +43,7 @@ static bool lcl_IsURLButton( SdrObject* pObject ) { bool bRet = false; - SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObject); + SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObject ); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 44c59c04ba35..79d4b92b2b1e 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -61,7 +61,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState ScZoomSliderWnd* pBox = static_cast<ScZoomSliderWnd*>(rTbx.GetItemWindow( nId )); OSL_ENSURE( pBox ,"Control not found!" ); - if ( SfxItemState::DEFAULT != eState || pState->ISA( SfxVoidItem ) ) + if ( SfxItemState::DEFAULT != eState || dynamic_cast<const SfxVoidItem*>( pState) != nullptr ) { SvxZoomSliderItem aZoomSliderItem( 100 ); pBox->Disable(); @@ -70,7 +70,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState else { pBox->Enable(); - OSL_ENSURE( pState->ISA( SvxZoomSliderItem ), "invalid item type" ); + OSL_ENSURE( dynamic_cast<const SvxZoomSliderItem*>( pState) != nullptr, "invalid item type" ); const SvxZoomSliderItem* pZoomSliderItem = dynamic_cast< const SvxZoomSliderItem* >( pState ); OSL_ENSURE( pZoomSliderItem, "Sc::ScZoomSliderControl::StateChanged(), wrong item type!" ); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 98c77dae318e..5ca9b8f5dfc0 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -208,7 +208,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( m_pCbQuoteAll->Show(); m_pCbQuoteAll->Check( false ); m_pCbFormulas->Show(); - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current()); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); bool bFormulas = pViewSh && pViewSh->GetViewData().GetOptions().GetOption( VOPT_FORMULAS); m_pCbFormulas->Check( bFormulas ); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index c982dcb1bfa0..f1f24800df08 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -72,7 +72,7 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile, bInCreate (false), bDoInsert (true) { - OSL_ENSURE(pShell->ISA(ScDocShell), "ScAreaLink mit falscher ObjectShell"); + OSL_ENSURE(dynamic_cast< const ScDocShell *>( pShell ) != nullptr, "ScAreaLink mit falscher ObjectShell"); pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell ); SetRefreshHandler( LINK( this, ScAreaLink, RefreshHdl ) ); SetRefreshControl( &pImpl->m_pDocSh->GetDocument().GetRefreshTimerControlAddress() ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 15fa0ece667a..b554dd29060b 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5220,7 +5220,7 @@ bool ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, while (nLinkPos<nLinkCount) { ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[nLinkPos]; - if ( pBase->ISA(ScAreaLink) && + if ( dynamic_cast< const ScAreaLink *>( pBase ) != nullptr && static_cast<ScAreaLink*>(pBase)->GetDestArea().aStart == rDestRange.aStart ) { if ( bUndo ) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 9860e53bc953..b3fd054626bc 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2501,7 +2501,7 @@ bool ScDocShell::PrepareClose( bool bUI ) if( pFrame ) { SfxViewShell* p = pFrame->GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( p ); if(pViewSh!=NULL) { vcl::Window *pWin=pViewSh->GetWindow(); @@ -2887,7 +2887,7 @@ VclPtr<SfxDocumentInfoDialog> ScDocShell::CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) { VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( pParent, rSet ); - ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); + ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() ); // Only for statistics, if this Doc is shown; not from the Doc Manager if( pDocSh == this ) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 0671e754a2fb..a1135db48cbb 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -480,7 +480,7 @@ sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlag while (pFrame) { SfxViewShell* pSh = pFrame->GetViewShell(); - if (pSh && pSh->ISA(ScTabViewShell)) + if (pSh && dynamic_cast<const ScTabViewShell*>( pSh) != nullptr) { ScTabViewShell* pViewSh = static_cast<ScTabViewShell*>(pSh); ScInputHandler* pInputHdl = pScMod->GetInputHdl(pViewSh); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 262b902ab9d4..79cabb134d8c 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -677,26 +677,26 @@ void ScDocShell::Execute( SfxRequest& rReq ) SfxMedium* pMed = NULL; if ( pReqArgs && pReqArgs->GetItemState( SID_FILE_NAME, true, &pItem ) == SfxItemState::SET && - pItem->ISA(SfxStringItem) ) + dynamic_cast<const SfxStringItem*>( pItem) != nullptr ) { OUString aFileName = static_cast<const SfxStringItem*>(pItem)->GetValue(); OUString aFilterName; if ( pReqArgs->GetItemState( SID_FILTER_NAME, true, &pItem ) == SfxItemState::SET && - pItem->ISA(SfxStringItem) ) + dynamic_cast<const SfxStringItem*>( pItem) != nullptr ) { aFilterName = static_cast<const SfxStringItem*>(pItem)->GetValue(); } OUString aOptions; if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) == SfxItemState::SET && - pItem->ISA(SfxStringItem) ) + dynamic_cast<const SfxStringItem*>( pItem) != nullptr ) { aOptions = static_cast<const SfxStringItem*>(pItem)->GetValue(); } short nVersion = 0; if ( pReqArgs->GetItemState( SID_VERSION, true, &pItem ) == SfxItemState::SET && - pItem->ISA(SfxInt16Item) ) + dynamic_cast<const SfxInt16Item*>( pItem) != nullptr ) { nVersion = static_cast<const SfxInt16Item*>(pItem)->GetValue(); } @@ -817,7 +817,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET ) { - if ( pItem->ISA(SfxStringItem) ) + if ( dynamic_cast<const SfxStringItem*>( pItem) != nullptr ) { OUString aName = static_cast<const SfxStringItem*>(pItem)->GetValue(); SCTAB nTab; @@ -845,7 +845,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET ) { - if ( pItem->ISA(SfxStringItem) ) + if ( dynamic_cast<const SfxStringItem*>( pItem) != nullptr ) { OUString aName = static_cast<const SfxStringItem*>(pItem)->GetValue(); SCTAB nTab; @@ -893,7 +893,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET ) { - if ( pItem->ISA(SfxUInt16Item) ) + if ( dynamic_cast<const SfxUInt16Item*>( pItem) != nullptr ) { sal_uInt16 nY2k = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); // immer an den DocOptions setzen, damit das auch fuer SO50 @@ -2205,7 +2205,7 @@ bool ScDocShell::DdeSetData( const OUString& rItem, ScViewData* ScDocShell::GetViewData() { SfxViewShell* pCur = SfxViewShell::Current(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,pCur); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( pCur ); return pViewSh ? &pViewSh->GetViewData() : NULL; } @@ -2231,7 +2231,7 @@ ScTabViewShell* ScDocShell::GetBestViewShell( bool bOnlyVisible ) if( pFrame ) { SfxViewShell* p = pFrame->GetViewShell(); - pViewSh = PTR_CAST(ScTabViewShell,p); + pViewSh = dynamic_cast< ScTabViewShell *>( p ); } } return pViewSh; @@ -2295,7 +2295,7 @@ IMPL_LINK_TYPED( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg SfxItemSet* pSet = pMed->GetItemSet(); if ( pSet && pSet->GetItemState( SID_VERSION, true, &pItem ) == SfxItemState::SET && - pItem->ISA( SfxInt16Item ) ) + dynamic_cast<const SfxInt16Item*>( pItem) != nullptr ) { pImpl->pRequest->AppendItem( *pItem ); } diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 5acc3dd912da..737423695da7 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -354,7 +354,7 @@ void ScDocShell::UpdateLinks() { --k; ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[k]; - if (pBase->ISA(ScTableLink)) + if (dynamic_cast<const ScTableLink*>( pBase) != nullptr) { ScTableLink* pTabLink = static_cast<ScTableLink*>(pBase); if (pTabLink->IsUsed()) @@ -418,7 +418,7 @@ bool ScDocShell::ReloadTabLinks() for (size_t i=0; i<nCount; i++ ) { ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i]; - if (pBase->ISA(ScTableLink)) + if (dynamic_cast<const ScTableLink*>( pBase) != nullptr) { ScTableLink* pTabLink = static_cast<ScTableLink*>(pBase); // pTabLink->SetAddUndo(sal_False); //! Undo's zusammenfassen diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 1a32289a8540..0730927a608f 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2257,8 +2257,7 @@ ScDocument* ScExternalRefManager::getInMemorySrcDocument(sal_uInt16 nFileId) return NULL; ScDocument* pSrcDoc = NULL; - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType, false)); + ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>, false)); while (pShell) { SfxMedium* pMedium = pShell->GetMedium(); @@ -2287,7 +2286,7 @@ ScDocument* ScExternalRefManager::getInMemorySrcDocument(sal_uInt16 nFileId) break; } } - pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, &aType, false)); + pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, checkSfxObjectShell<ScDocShell>, false)); } initDocInCache(maRefCache, pSrcDoc, nFileId); @@ -2556,14 +2555,13 @@ bool ScExternalRefManager::isOwnDocument(const OUString& rFile) const void ScExternalRefManager::convertToAbsName(OUString& rFile) const { // unsaved documents have no AbsName - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType, false)); + ScDocShell* pShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>, false)); while (pShell) { if (rFile == pShell->GetName()) return; - pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, &aType, false)); + pShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pShell, checkSfxObjectShell<ScDocShell>, false)); } SfxObjectShell* pDocShell = mpDoc->GetDocumentShell(); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 4feaccc3af15..0e84f2da3246 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -80,7 +80,7 @@ enum SylkVersion // Whole document without Undo ScImportExport::ScImportExport( ScDocument* p ) - : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), + : pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), bFormulas( false ), bIncludeFiltered( true ), bAll( true ), bSingle( true ), bUndo( false ), @@ -94,7 +94,7 @@ ScImportExport::ScImportExport( ScDocument* p ) // Insert am current cell without range(es) ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) - : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), + : pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), aRange( rPt ), nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), bFormulas( false ), bIncludeFiltered( true ), @@ -110,7 +110,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) // ctor with a range is only used for export //! ctor with a string (and bSingle=true) is also used for DdeSetData ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) - : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), + : pDocSh( dynamic_cast<ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), aRange( r ), nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), bFormulas( false ), bIncludeFiltered( true ), @@ -128,7 +128,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) // Evaluate input string - either range, cell or the whole document (when error) // If a View exists, the TabNo of the view will be used. ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos ) - : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), + : pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), bFormulas( false ), bIncludeFiltered( true ), bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ), diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 8fddc9b74427..e090bd26724b 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -209,7 +209,7 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) // don't access DocShell anymore for EndListening etc. } } - else if (rBC.ISA(SfxApplication)) + else if (dynamic_cast<const SfxApplication*>( &rBC) != nullptr) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint ); if ( !aItemStr.isEmpty() && pSimpleHint && diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 07d5c7a3ba92..4cb613f5fd51 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -442,8 +442,7 @@ bool ScDocumentLoader::GetFilterName( const OUString& rFileName, OUString& rFilter, OUString& rOptions, bool bWithContent, bool bWithInteraction ) { - TypeId aScType = TYPE(ScDocShell); - SfxObjectShell* pDocSh = SfxObjectShell::GetFirst( &aScType ); + SfxObjectShell* pDocSh = SfxObjectShell::GetFirst( checkSfxObjectShell<ScDocShell> ); while ( pDocSh ) { if ( pDocSh->HasName() ) @@ -456,7 +455,7 @@ bool ScDocumentLoader::GetFilterName( const OUString& rFileName, return true; } } - pDocSh = SfxObjectShell::GetNext( *pDocSh, &aScType ); + pDocSh = SfxObjectShell::GetNext( *pDocSh, checkSfxObjectShell<ScDocShell> ); } INetURLObject aUrl( rFileName ); diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 0be22a9b0428..2675f2834263 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -39,7 +39,7 @@ ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ) get(m_pFtCells,"nocells"); get(m_pFtPages,"nopages"); get(m_pFtFormula,"noformula"); - ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); ScDocStat aDocStat; if ( pDocSh ) diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 07752f6aac77..1fb50a91877c 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -78,7 +78,7 @@ void ScChartShell::GetExportAsGraphicState( SfxItemSet& rSet ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrOle2Obj ) ) + if( pObj && dynamic_cast<const SdrOle2Obj*>( pObj) != nullptr ) bEnable = true; } @@ -95,7 +95,7 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& ) { SdrObject* pObject = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObject && pObject->ISA( SdrOle2Obj ) ) + if( pObject && dynamic_cast<const SdrOle2Obj*>( pObject) != nullptr ) { Reference< drawing::XShape > xSourceDoc = Reference< drawing::XShape >( pObject->getUnoShape(), UNO_QUERY_THROW ); GraphicHelper::SaveShapeAsGraphic( xSourceDoc ); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index d582b3a9778e..24d69a1907bb 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -365,7 +365,7 @@ bool ScDrawShell::AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rM for (size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj(); - if ( !pObj->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrUnoObj*>( pObj) == nullptr ) { if(nLayerNo!=pObj->GetLayer()) { diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index cdb6999bbad4..8a94c121896f 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -80,7 +80,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink aHLinkItem.SetURL( pInfo->GetHlink() ); aHLinkItem.SetInsertMode(HLINK_FIELD); } - SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj); + SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj ); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel(); @@ -166,7 +166,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) if ( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj ); + SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj ); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { uno::Reference<awt::XControlModel> xControlModel = diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 04b9d34dc68c..a0c259259b13 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -182,7 +182,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) const SfxPoolItem* pItem; if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET && - pItem->ISA(SfxUInt32Item) ) + dynamic_cast<const SfxUInt32Item*>( pItem) != nullptr ) { nFormat = static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pItem)->GetValue()); } @@ -227,7 +227,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) aString = static_cast<const SfxStringItem*>(pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem); - const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); + const SfxStringItem* pFontItem = dynamic_cast<const SfxStringItem*>( pFtItem ); if ( pFontItem ) { OUString aFontName(pFontItem->GetValue()); @@ -274,7 +274,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) if (pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); - if ( pField && pField->ISA(SvxURLField) ) + if ( pField && dynamic_cast<const SvxURLField*>( pField) != nullptr ) { // altes Feld selektieren @@ -323,7 +323,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) if ( pFieldItem ) { const SvxFieldData* pField = pFieldItem->GetField(); - if( pField && pField->ISA( SvxURLField ) ) + if( pField && dynamic_cast<const SvxURLField*>( pField) != nullptr ) { const SvxURLField* pURLField = static_cast< const SvxURLField* >( pField ); ScGlobal::OpenURL( pURLField->GetURL(), pURLField->GetTargetFrame() ); @@ -391,7 +391,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) if (pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); - if ( pField && pField->ISA(SvxURLField) ) + if ( pField && dynamic_cast<const SvxURLField*>( pField) != nullptr ) { const SvxURLField* pURLField = static_cast<const SvxURLField*>(pField); aHLinkItem.SetName( pURLField->GetRepresentation() ); @@ -423,7 +423,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) if ( pFieldItem ) { const SvxFieldData* pField = pFieldItem->GetField(); - bEnable = pField && pField->ISA( SvxURLField ); + bEnable = pField && dynamic_cast<const SvxURLField*>( pField) != nullptr; } } if( !bEnable ) diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index c916a5177cf9..dcfaa8281380 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -189,7 +189,7 @@ SdrObject* FuConstArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle if(pObj) { - if(pObj->ISA(SdrCircObj)) + if(dynamic_cast<const SdrCircObj*>( pObj) != nullptr) { Rectangle aRect(rRectangle); diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 2132b081d9eb..aa8ff4fc65b0 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -242,7 +242,7 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta if(pObj) { - if(pObj->ISA(SdrPathObj)) + if(dynamic_cast<const SdrPathObj*>( pObj) != nullptr) { basegfx::B2DPolyPolygon aPoly; diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index a39f12fc9235..5698732d94c8 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -129,7 +129,7 @@ bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); // create OutlinerParaObject now so it can be set to vertical - if ( pObj->ISA(SdrTextObj) ) + if ( dynamic_cast<const SdrTextObj*>( pObj) != nullptr ) static_cast<SdrTextObj*>(pObj)->ForceOutlinerParaObject(); OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); if( pOPO && !pOPO->IsVertical() ) @@ -232,7 +232,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec { case SID_DRAW_LINE: { - if(pObj->ISA(SdrPathObj)) + if(dynamic_cast<const SdrPathObj*>( pObj) != nullptr) { sal_Int32 nYMiddle((aRect.Top() + aRect.Bottom()) / 2); basegfx::B2DPolygon aPoly; @@ -250,7 +250,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec case SID_DRAW_CAPTION: case SID_DRAW_CAPTION_VERTICAL: { - if(pObj->ISA(SdrCaptionObj)) + if(dynamic_cast<const SdrCaptionObj*>( pObj) != nullptr) { bool bIsVertical(SID_DRAW_CAPTION_VERTICAL == nID); diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 60447d90decd..b8cc232ca08e 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -230,7 +230,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) SdrObject* pObj = pMark->GetMarkedSdrObj(); // bei Uno-Controls nicht in Textmodus - if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrTextObj*>( pObj) != nullptr && dynamic_cast<const SdrUnoObj*>( pObj) == nullptr ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); bool bVertical = ( pOPO && pOPO->IsVertical() ); diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index aeefe44bbab3..073508bb4aaf 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -186,7 +186,7 @@ bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) static bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey ) { bool bReturn = false; - if ( pObj && pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) ) + if ( pObj && dynamic_cast<const SdrTextObj*>( pObj) != nullptr && dynamic_cast<const SdrUnoObj*>( pObj) == nullptr ) { // start text edit - like FuSelection::MouseButtonUp, // but with bCursorToEnd instead of mouse position @@ -269,7 +269,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) { bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace(); SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrOle2Obj ) && !bOle ) + if( pObj && dynamic_cast<const SdrOle2Obj*>( pObj) != nullptr && !bOle ) { pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 ); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 7670949fa3d8..c7fd4c96c8ae 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -342,7 +342,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, if( pReqArgs ) { - const SfxStringItem* pStringItem = PTR_CAST( SfxStringItem, &pReqArgs->Get( rReq.GetSlot() ) ); + const SfxStringItem* pStringItem = dynamic_cast<const SfxStringItem*>( &pReqArgs->Get( rReq.GetSlot() ) ); if( pStringItem ) { diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 02c5ecca76fb..cb472fc4c90f 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -551,9 +551,9 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV if( pReqArgs->HasItem( FN_PARAM_4, &pItem ) ) { - if ( pItem->ISA( SfxUInt16Item ) ) + if ( dynamic_cast<const SfxUInt16Item*>( pItem) != nullptr ) nToTable = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); - else if ( pItem->ISA( SfxBoolItem ) ) + else if ( dynamic_cast<const SfxBoolItem*>( pItem) != nullptr ) { // in der idl fuer Basic steht FN_PARAM_4 als SfxBoolItem // -> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index f3e172db308c..02fb2c9fea2a 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -535,7 +535,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // not in UNO controls // #i32352# not in media objects - else if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) && !pObj->ISA(SdrMediaObj) ) + else if ( dynamic_cast<const SdrTextObj*>( pObj) != nullptr && dynamic_cast<const SdrUnoObj*>( pObj) == nullptr && dynamic_cast<const SdrMediaObj*>( pObj) == nullptr ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); bool bVertical = ( pOPO && pOPO->IsVertical() ); diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index f9581a437493..b7996f533f26 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -474,7 +474,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) if(rMarkList.GetMark(0)) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if(pObj && pObj->ISA(SdrTextObj)) + if(pObj && dynamic_cast<const SdrTextObj*>( pObj) != nullptr) { SdrTextObj* pText = static_cast<SdrTextObj*>(pObj); SfxItemSet aSet(pDrDoc->GetItemPool()); @@ -651,7 +651,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel, if (nSdrObjKind == OBJ_TEXT || nSdrObjKind == OBJ_TITLETEXT || nSdrObjKind == OBJ_OUTLINETEXT || - pObj->ISA(SdrTextObj)) + dynamic_cast<const SdrTextObj*>( pObj) != nullptr) { SdrPageView* pPV = pView->GetSdrPageView(); @@ -728,7 +728,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR if(pObj) { - if(pObj->ISA(SdrTextObj)) + if(dynamic_cast<const SdrTextObj*>( pObj) != nullptr) { SdrTextObj* pText = static_cast<SdrTextObj*>(pObj); pText->SetLogicRect(rRectangle); diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 61f8d809eedb..2c4e8ed7ffc4 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -88,7 +88,7 @@ void FuText::StopEditMode(bool /*bTextDirection*/) /* Note has been created before editing, if first undo action is an insert action. Needed below to decide whether to drop the undo if editing a new note has been cancelled. */ - bNewNote = (pCalcUndo->GetActionCount() > 0) && pCalcUndo->GetAction( 0 )->ISA( SdrUndoNewObj ); + bNewNote = (pCalcUndo->GetActionCount() > 0) && dynamic_cast< SdrUndoNewObj* >(pCalcUndo->GetAction( 0 )); // create a "insert note" undo action if needed if( bNewNote ) diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 94742a0a177c..b3145732e6e6 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -94,7 +94,7 @@ void ScGraphicShell::GetFilterState( SfxItemSet& rSet ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) bEnable = true; } @@ -111,7 +111,7 @@ void ScGraphicShell::ExecuteFilter( SfxRequest& rReq ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) { GraphicObject aFilterObj( static_cast<SdrGrafObj*>(pObj)->GetGraphicObject() ); @@ -145,7 +145,7 @@ void ScGraphicShell::GetExternalEditState( SfxItemSet& rSet ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) bEnable = true; } @@ -162,7 +162,7 @@ void ScGraphicShell::ExecuteExternalEdit( SfxRequest& ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) { GraphicObject aGraphicObject( static_cast<SdrGrafObj*>(pObj)->GetGraphicObject() ); m_ExternalEdits.push_back( std::unique_ptr<SdrExternalToolEdit>( @@ -183,7 +183,7 @@ void ScGraphicShell::GetCompressGraphicState( SfxItemSet& rSet ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) bEnable = true; } @@ -200,7 +200,7 @@ void ScGraphicShell::ExecuteCompressGraphic( SfxRequest& ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) { SdrGrafObj* pGraphicObj = static_cast<SdrGrafObj*>(pObj); ScopedVclPtrInstance< CompressGraphicsDialog > dialog( GetViewData()->GetDialogParent(), pGraphicObj, GetViewData()->GetBindings() ); @@ -228,7 +228,7 @@ void ScGraphicShell::GetCropGraphicState( SfxItemSet& rSet ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) + if( pObj && 0 != dynamic_cast<const SdrGrafObj*>( pObj) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) bEnable = true; } @@ -245,7 +245,7 @@ void ScGraphicShell::ExecuteCropGraphic( SfxRequest& ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) { pView->SetEditMode(SDREDITMODE_EDIT); pView->SetDragMode(SDRDRAG_CROP); @@ -262,7 +262,7 @@ void ScGraphicShell::ExecuteSaveGraphic(SfxRequest& /*rReq*/) if( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) { GraphicObject aGraphicObject( static_cast<SdrGrafObj*>( pObj )->GetGraphicObject() ); { @@ -283,7 +283,7 @@ void ScGraphicShell::GetSaveGraphicState(SfxItemSet &rSet) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) bEnable = true; } @@ -300,7 +300,7 @@ void ScGraphicShell::ExecuteChangePicture(SfxRequest& /*rReq*/) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) + if( pObj && 0 != dynamic_cast<const SdrGrafObj*>( pObj) && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) { SdrGrafObj* pGraphicObj = static_cast<SdrGrafObj*>(pObj); SvxOpenGraphicDialog aDlg(ScResId(STR_INSERTGRAPHIC)); @@ -335,7 +335,7 @@ void ScGraphicShell::GetChangePictureState(SfxItemSet &rSet) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrGrafObj ) && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) + if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && ( static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GRAPHIC_BITMAP ) ) bEnable = true; } diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 17d3dd569e43..a7281ad77115 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -78,7 +78,7 @@ void ScMediaShell::GetMediaState( SfxItemSet& rSet ) { SdrObject* pObj = pMarkList->GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrMediaObj ) ) + if( pObj && dynamic_cast<const SdrMediaObj*>( pObj) != nullptr ) { ::avmedia::MediaItem aItem( SID_AVMEDIA_TOOLBOX ); @@ -117,7 +117,7 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq ) { SdrObject* pObj = pMarkList->GetMark( 0 )->GetMarkedSdrObj(); - if( pObj && pObj->ISA( SdrMediaObj ) ) + if( pObj && dynamic_cast<const SdrMediaObj*>( pObj) != nullptr ) { static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( pObj->GetViewContact() ).executeMediaItem( static_cast< const ::avmedia::MediaItem& >( *pItem ) ); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 766575a007b3..9ea7238a0864 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -817,7 +817,7 @@ void ScFunctionDockWin::DoEnter() { ScModule* pScMod = SC_MOD(); - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pCurSh); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( pCurSh ); ScInputHandler* pHdl = pScMod->GetInputHdl( pViewSh ); if(!pScMod->IsEditMode()) { diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index b2ae1297d81e..4e51d2e1969d 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -84,7 +84,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, SfxViewFrame* pMyViewFrm = pMyDisp->GetFrame(); if (pMyViewFrm) { - pScViewShell = PTR_CAST( ScTabViewShell, pMyViewFrm->GetViewShell() ); + pScViewShell = dynamic_cast<ScTabViewShell*>( pMyViewFrm->GetViewShell() ); if( pScViewShell ) pScViewShell->UpdateInputHandler(true); } @@ -265,13 +265,12 @@ bool ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl) // belongs InputHandler to a ViewShell? - TypeId aScType = TYPE(ScTabViewShell); - SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); + SfxViewShell* pSh = SfxViewShell::GetFirst( true, checkSfxViewShell<ScTabViewShell> ); while ( pSh && !bAlive ) { if (static_cast<ScTabViewShell*>(pSh)->GetInputHandler() == pHdl) bAlive = true; - pSh = SfxViewShell::GetNext( *pSh, &aScType ); + pSh = SfxViewShell::GetNext( *pSh, true, checkSfxViewShell<ScTabViewShell> ); } return bAlive; @@ -286,7 +285,7 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell, ScTabVi while( pFrame && pHdl==NULL) { SfxViewShell* p = pFrame->GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( p ); if(pViewSh!=NULL) { pHdl=pViewSh->GetInputHandler(); @@ -560,7 +559,7 @@ void ScFormulaDlg::clear() pScMod->SetRefInputHdl(NULL); // force Enable() of edit line - ScTabViewShell* pScViewShell = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + ScTabViewShell* pScViewShell = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pScViewShell ) pScViewShell->UpdateInputHandler(); } @@ -577,7 +576,7 @@ void ScFormulaDlg::switchBack() } // restore current chart (cause mouse-RefInput) - ScTabViewShell* pScViewShell = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + ScTabViewShell* pScViewShell = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); if ( pScViewShell ) { ScViewData& rVD=pScViewShell->GetViewData(); diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx index aec24f93d6cd..bfedab53af8d 100644 --- a/sc/source/ui/inc/ChildWindowWrapper.hxx +++ b/sc/source/ui/inc/ChildWindowWrapper.hxx @@ -28,7 +28,7 @@ public: { ScTabViewShell* pViewShell = getTabViewShell( pBindings ); if (!pViewShell) - pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + pViewShell = dynamic_cast< ScTabViewShell *>( SfxViewShell::Current() ); OSL_ENSURE(pViewShell, "Missing view shell!"); if (pViewShell) diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 796c9594406e..43c8b1bfce97 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -36,7 +36,7 @@ struct ScHeaderFieldData; class ScPreviewLocationData; class CommandEvent; -class ScPreviewShell: public SfxViewShell +class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell { ScDocShell* pDocShell; @@ -75,7 +75,7 @@ protected: virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; public: - TYPEINFO_VISIBILITY_OVERRIDE( SC_DLLPUBLIC ); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL) SFX_DECL_VIEWFACTORY(ScPreviewShell); @@ -116,7 +116,7 @@ public: const ScPreviewLocationData& GetLocationData(); ScDocument& GetDocument(); - SC_DLLPUBLIC ScPreview* GetPreview() { return pPreview; } + ScPreview* GetPreview() { return pPreview; } }; #endif diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 9a0bf9f20437..f636120fe131 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -89,7 +89,7 @@ enum ObjectSelectionType OST_Media }; -class ScTabViewShell: public SfxViewShell, public ScDBFunc +class SC_DLLPUBLIC ScTabViewShell: public SfxViewShell, public ScDBFunc { private: SvxHtmlOptions aHTMLOpt; @@ -220,7 +220,7 @@ protected: virtual SdrView* GetDrawView() const SAL_OVERRIDE; public: - TYPEINFO_VISIBILITY_OVERRIDE(SC_DLLPUBLIC); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_TABVIEW_SHELL) SFX_DECL_VIEWFACTORY(ScTabViewShell); @@ -236,7 +236,7 @@ public: virtual ~ScTabViewShell(); - SC_DLLPUBLIC vcl::Window* GetDialogParent(); + vcl::Window* GetDialogParent(); bool IsRefInputMode() const; void ExecuteInputDirect(); @@ -252,8 +252,8 @@ public: ::editeng::SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; } void SetDefaultFrameLine(const ::editeng::SvxBorderLine* pLine ); - SC_DLLPUBLIC void Execute( SfxRequest& rReq ); - SC_DLLPUBLIC void GetState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); void ExecuteTable( SfxRequest& rReq ); void GetStateTable( SfxItemSet& rSet ); @@ -340,7 +340,7 @@ public: void DeactivateOle(); - SC_DLLPUBLIC static ScTabViewShell* GetActiveViewShell(); + static ScTabViewShell* GetActiveViewShell(); VclPtr<SfxModelessDialog> CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, vcl::Window* pParent, sal_uInt16 nSlotId ); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 93232fde5e22..385537a20f26 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -92,8 +92,7 @@ void ScFormulaReferenceHelper::dispose() void ScFormulaReferenceHelper::enableInput( bool bEnable ) { - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType)); + ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>)); while( pDocShell ) { SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); @@ -103,7 +102,7 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable ) if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( p ); if(pViewSh!=NULL) { vcl::Window *pWin=pViewSh->GetWindow(); @@ -122,7 +121,7 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable ) pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); } - pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, &aType)); + pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, checkSfxObjectShell<ScDocShell>)); } } @@ -655,8 +654,7 @@ void ScFormulaReferenceHelper::SetDispatcherLock( bool bLock ) { // lock / unlock only the dispatchers of Calc documents - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType)); + ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>)); while( pDocShell ) { SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); @@ -668,7 +666,7 @@ void ScFormulaReferenceHelper::SetDispatcherLock( bool bLock ) pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); } - pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, &aType)); + pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, checkSfxObjectShell<ScDocShell>)); } // if a new view is created while the dialog is open, @@ -684,8 +682,7 @@ void ScFormulaReferenceHelper::ViewShellChanged() } void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) { - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType)); + ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>)); while( pDocShell ) { SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); @@ -695,7 +692,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( p ); if(pViewSh!=NULL) { vcl::Window *pWin=pViewSh->GetWindow(); @@ -714,14 +711,13 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); } - pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, &aType)); + pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, checkSfxObjectShell<ScDocShell>)); } } static void lcl_InvalidateWindows() { - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(&aType)); + ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>)); while( pDocShell ) { SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); @@ -731,7 +727,7 @@ static void lcl_InvalidateWindows() if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( p ); if(pViewSh!=NULL) { vcl::Window *pWin=pViewSh->GetWindow(); @@ -746,18 +742,17 @@ static void lcl_InvalidateWindows() pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); } - pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, &aType)); + pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetNext(*pDocShell, checkSfxObjectShell<ScDocShell>)); } } static void lcl_HideAllReferences() { - TypeId aScType = TYPE(ScTabViewShell); - SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); + SfxViewShell* pSh = SfxViewShell::GetFirst( true, checkSfxViewShell<ScTabViewShell> ); while ( pSh ) { static_cast<ScTabViewShell*>(pSh)->ClearHighlightRanges(); - pSh = SfxViewShell::GetNext( *pSh, &aScType ); + pSh = SfxViewShell::GetNext( *pSh, true, checkSfxViewShell<ScTabViewShell> ); } } @@ -799,7 +794,7 @@ bool ScRefHandler::EnterRefMode() SfxViewFrame* pMyViewFrm = pMyDisp->GetFrame(); if (pMyViewFrm) { - pScViewShell = PTR_CAST( ScTabViewShell, pMyViewFrm->GetViewShell() ); + pScViewShell = dynamic_cast<ScTabViewShell*>( pMyViewFrm->GetViewShell() ); if( pScViewShell ) pScViewShell->UpdateInputHandler(true); pParentDoc = pMyViewFrm->GetObjectShell(); @@ -875,8 +870,7 @@ void ScRefHandler::SwitchToDocument() } } - TypeId aScType = TYPE(ScTabViewShell); - SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); + SfxViewShell* pSh = SfxViewShell::GetFirst( true, checkSfxViewShell<ScTabViewShell> ); while ( pSh ) { SfxObjectShell* pObjSh = pSh->GetObjectShell(); @@ -886,7 +880,7 @@ void ScRefHandler::SwitchToDocument() static_cast<ScTabViewShell*>(pSh)->SetActive(); return; } - pSh = SfxViewShell::GetNext( *pSh, &aScType ); + pSh = SfxViewShell::GetNext( *pSh, true, checkSfxViewShell<ScTabViewShell> ); } } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index a6f2f24620fe..e1f9226ae5d9 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -227,7 +227,7 @@ void ScMoveTableDlg::InitDocListBox() while ( pSh ) { - pScSh = PTR_CAST( ScDocShell, pSh ); + pScSh = dynamic_cast<ScDocShell*>( pSh ); if ( pScSh ) { diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b6c79df9dafb..9b03f5b0eff3 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -85,13 +85,12 @@ ScDocShell* ScContentTree::GetManualOrCurrent() ScDocShell* pSh = NULL; if ( !aManualDoc.isEmpty() ) { - TypeId aScType = TYPE(ScDocShell); - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst( &aScType ); + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst( checkSfxObjectShell<ScDocShell> ); while ( pObjSh && !pSh ) { if ( pObjSh->GetTitle() == aManualDoc ) - pSh = PTR_CAST( ScDocShell, pObjSh ); - pObjSh = SfxObjectShell::GetNext( *pObjSh, &aScType ); + pSh = dynamic_cast<ScDocShell*>( pObjSh ); + pObjSh = SfxObjectShell::GetNext( *pObjSh, checkSfxObjectShell<ScDocShell> ); } } else @@ -103,7 +102,7 @@ ScDocShell* ScContentTree::GetManualOrCurrent() if ( pViewSh ) { SfxObjectShell* pObjSh = pViewSh->GetViewFrame()->GetObjectShell(); - pSh = PTR_CAST( ScDocShell, pObjSh ); + pSh = dynamic_cast<ScDocShell*>( pObjSh ); } } @@ -593,11 +592,11 @@ void ScContentTree::Command( const CommandEvent& rCEvt ) sal_uInt16 i=0; sal_uInt16 nPos=0; // geladene Dokumente - ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); + ScDocShell* pCurrentSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); SfxObjectShell* pSh = SfxObjectShell::GetFirst(); while ( pSh ) { - if ( pSh->ISA(ScDocShell) ) + if ( dynamic_cast<const ScDocShell*>( pSh) != nullptr ) { OUString aName = pSh->GetTitle(); OUString aEntry = aName; @@ -1028,7 +1027,7 @@ void ScContentTree::GetLinkNames() for (sal_uInt16 i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) InsertContent( ScContentId::AREALINK, static_cast<ScAreaLink*>(pBase)->GetSource() ); // in der Liste die Namen der Quellbereiche @@ -1049,7 +1048,7 @@ const ScAreaLink* ScContentTree::GetLink( sal_uLong nIndex ) for (sal_uInt16 i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) { if (nFound == nIndex) return static_cast<const ScAreaLink*>(pBase); @@ -1592,7 +1591,7 @@ void ScContentTree::SelectDoc(const OUString& rName) // rName wie im Menue/ SfxObjectShell* pSh = SfxObjectShell::GetFirst(); while ( pSh && !bLoaded ) { - if ( pSh->ISA(ScDocShell) ) + if ( dynamic_cast<const ScDocShell*>( pSh) != nullptr ) if ( pSh->GetTitle() == aRealName ) bLoaded = true; pSh = SfxObjectShell::GetNext( *pSh ); diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index ef981c99aaea..bfbf7fe90759 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -43,7 +43,7 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat case SID_CURRENTCELL: if ( pItem ) { - const SfxStringItem* pCellPosItem = PTR_CAST(SfxStringItem, pItem); + const SfxStringItem* pCellPosItem = dynamic_cast<const SfxStringItem*>( pItem ); OSL_ENSURE( pCellPosItem, "SfxStringItem expected!" ); @@ -65,7 +65,7 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat case SID_CURRENTTAB: if ( pItem ) { - const SfxUInt16Item* pTabItem = PTR_CAST(SfxUInt16Item, pItem); + const SfxUInt16Item* pTabItem = dynamic_cast< const SfxUInt16Item *>( pItem ); OSL_ENSURE( pTabItem, "SfxUInt16Item expected!" ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 382488ba777b..0b564f1c93bd 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -990,7 +990,7 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // activat ScTabViewShell* ScNavigatorDlg::GetTabViewShell() { - return PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + return dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); } ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings() @@ -1204,13 +1204,13 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) aLbDocuments->Clear(); aLbDocuments->SetUpdateMode( false ); - ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); + ScDocShell* pCurrentSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); OUString aSelEntry; SfxObjectShell* pSh = SfxObjectShell::GetFirst(); while ( pSh ) { - if ( pSh->ISA(ScDocShell) ) + if ( dynamic_cast<const ScDocShell*>( pSh) != nullptr ) { OUString aName = pSh->GetTitle(); OUString aEntry = aName; diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index a8e53ab997a5..322a154c9965 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -252,7 +252,7 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) { aLbScenario->Enable(); - if ( pState->ISA(SfxStringItem) ) + if ( dynamic_cast<const SfxStringItem*>( pState) != nullptr ) { OUString aNewEntry( static_cast<const SfxStringItem*>(pState)->GetValue() ); @@ -261,7 +261,7 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) else aLbScenario->SetNoSelection(); } - else if ( pState->ISA(SfxStringListItem) ) + else if ( dynamic_cast<const SfxStringListItem*>( pState) != nullptr ) { aLbScenario->UpdateEntries( static_cast<const SfxStringListItem*>(pState)->GetList() ); } diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index e2bea02f386c..5322adf821b5 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -124,7 +124,7 @@ bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ ) // Repaint (wenn alles ueber Items laufen wuerde, wie es sich gehoert, // waere das nicht noetig...) - ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); if (pDocSh) pDocSh->PostPaintGridAll(); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 3b8de0f93041..2c96167fb022 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -109,7 +109,7 @@ void ScTpUserLists::dispose() void ScTpUserLists::Init() { SfxViewShell* pSh = SfxViewShell::Current(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, pSh); + ScTabViewShell* pViewSh = dynamic_cast<ScTabViewShell*>( pSh ); mpLbLists->SetSelectHdl ( LINK( this, ScTpUserLists, LbSelectHdl ) ); mpBtnNew->SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) ); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 4511ce716664..c2db50993c06 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -308,7 +308,7 @@ void ScTpContentOptions::InitGridOpt() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); // there might be another DocShell here - pDocSh = PTR_CAST(ScDocShell, pDocSh); + pDocSh = dynamic_cast<ScDocShell*>( pDocSh ); XColorListRef pColorList; if ( pDocSh ) @@ -459,7 +459,7 @@ VclPtr<SfxTabPage> ScTpLayoutOptions::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { VclPtrInstance<ScTpLayoutOptions> pNew( pParent, *rCoreSet ); - ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); + ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() ); if(pDocSh!=NULL) pNew->SetDocument(&pDocSh->GetDocument()); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 9db2934591f8..334a8d4b9882 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -119,8 +119,8 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Win get(pBtnOk,"ok"); get(pBtnCancel,"cancel"); - ScTabViewShell* pScViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); - ScDocShell* pScDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); + ScTabViewShell* pScViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); + ScDocShell* pScDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() ); OSL_ENSURE( pScDocSh, "Current DocumentShell not found :-(" ); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 2f1cb0daafe6..2fb3a486d794 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -391,7 +391,7 @@ void ScHFEditPage::SetSelectDefinedList() if(pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); - if(pField && pField->ISA(SvxTableField)) + if(pField && dynamic_cast<const SvxTableField*>( pField) != nullptr) { eSelectEntry = eSheetEntry; bFound = true; @@ -530,7 +530,7 @@ bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj) if(pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); - if(pField && pField->ISA(SvxPageField)) + if(pField && dynamic_cast<const SvxPageField*>( pField) != nullptr) bReturn = true; } } @@ -552,7 +552,7 @@ bool ScHFEditPage::IsDateEntry(EditTextObject* pTextObj) if(pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); - if(pField && pField->ISA(SvxDateField)) + if(pField && dynamic_cast<const SvxDateField*>( pField) != nullptr) bReturn = true; } } @@ -570,7 +570,7 @@ bool ScHFEditPage::IsExtFileNameEntry(EditTextObject* pTextObj) if(pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); - if(pField && pField->ISA(SvxExtFileField)) + if(pField && dynamic_cast<const SvxExtFileField*>( pField) != nullptr) bReturn = true; } } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index b8bb332aeee4..716e5238debd 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -54,7 +54,7 @@ ScHFPage::ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSe SetExchangeSupport(); SfxViewShell* pSh = SfxViewShell::Current(); - ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,pSh); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( pSh ); m_pBtnEdit->Show(); aDataSet.Put( rSet ); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index a152453b8fbc..b1c833cb028a 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -60,9 +60,9 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData ) SfxViewShell* pShell = SfxViewShell::Current(); if (pShell) { - if (pShell->ISA(ScTabViewShell)) + if (dynamic_cast<const ScTabViewShell*>( pShell) != nullptr) static_cast<ScTabViewShell*>(pShell)->FillFieldData(rData); - else if (pShell->ISA(ScPreviewShell)) + else if (dynamic_cast<const ScPreviewShell*>( pShell) != nullptr) static_cast<ScPreviewShell*>(pShell)->FillFieldData(rData); } } @@ -191,7 +191,7 @@ void ScEditWindow::SetCharAttributes() SfxViewShell* pViewSh = SfxViewShell::Current(); - ScTabViewShell* pTabViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); + ScTabViewShell* pTabViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); OSL_ENSURE( pDocSh, "Current DocShell not found" ); OSL_ENSURE( pViewSh, "Current ViewShell not found" ); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 9ef96251d0e9..bbe7da3eb5cd 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -276,7 +276,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( case SID_H_ALIGNCELL: { SvxCellHorJustify meHorAlignState = SVX_HOR_JUSTIFY_STANDARD; - if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SvxHorJustifyItem) ) + if(eState >= SfxItemState::DEFAULT && pState && dynamic_cast<const SvxHorJustifyItem*>( pState) != nullptr ) { const SvxHorJustifyItem* pItem = static_cast<const SvxHorJustifyItem*>(pState); meHorAlignState = (SvxCellHorJustify)pItem->GetValue(); @@ -298,7 +298,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } break; case SID_ATTR_ALIGN_INDENT: - if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SfxUInt16Item) ) + if(eState >= SfxItemState::DEFAULT && pState && dynamic_cast<const SfxUInt16Item*>( pState) != nullptr ) { const SfxUInt16Item* pItem = static_cast<const SfxUInt16Item*>(pState); sal_uInt16 nVal = pItem->GetValue(); @@ -311,7 +311,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } break; case FID_MERGE_TOGGLE: - if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SfxBoolItem) ) + if(eState >= SfxItemState::DEFAULT && pState && dynamic_cast<const SfxBoolItem*>( pState) != nullptr ) { mpCBXMergeCell->Enable(); const SfxBoolItem* pItem = static_cast<const SfxBoolItem*>(pState); @@ -334,7 +334,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate( else { mpCBXWrapText->Enable(); - if(eState >= SfxItemState::DEFAULT && pState && pState->ISA(SfxBoolItem) ) + if(eState >= SfxItemState::DEFAULT && pState && dynamic_cast<const SfxBoolItem*>( pState) != nullptr ) { mpCBXWrapText->EnableTriState(false); const SfxBoolItem* pItem = static_cast<const SfxBoolItem*>(pState); diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 1fba078c212b..8c2bd5d9b0d1 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -107,7 +107,7 @@ bool ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const for (sal_uInt16 i=0; i<nLinkCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) { if ( nPos >= size() || !(*this)[nPos].IsEqual( *static_cast<ScAreaLink*>(pBase) ) ) return false; @@ -128,7 +128,7 @@ static ScAreaLink* lcl_FindLink( const ::sfx2::SvBaseLinks& rLinks, const ScArea for (sal_uInt16 i=0; i<nLinkCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if ( pBase->ISA(ScAreaLink) && + if ( dynamic_cast<const ScAreaLink*>( pBase) != nullptr && rSaver.IsEqualSource( *static_cast<ScAreaLink*>(pBase) ) ) { return static_cast<ScAreaLink*>(pBase); // found @@ -173,7 +173,7 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum for (sal_uInt16 i=0; i<nLinkCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) { if (!pColl) pColl = new ScAreaLinkSaveCollection; diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index cecea867609f..522f64b2beb5 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -75,7 +75,7 @@ bool ScSimpleUndo::Merge( SfxUndoAction *pNextAction ) // AddUndoAction is only called with bTryMerg=sal_True // for automatic update. - if ( !pDetectiveUndo && pNextAction->ISA(ScUndoDraw) ) + if ( !pDetectiveUndo && dynamic_cast<const ScUndoDraw*>( pNextAction) != nullptr ) { // Take SdrUndoAction from ScUndoDraw Action, // ScUndoDraw is later deleted by the UndoManager diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 3c88e4798d16..023f52971bd4 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -130,11 +130,11 @@ bool ScUndoInsertCells::Merge( SfxUndoAction* pNextAction ) if ( pPasteUndo ) return pPasteUndo->Merge( pNextAction ); - if ( bPartOfPaste && pNextAction->ISA( ScUndoWrapper ) ) + if ( bPartOfPaste && dynamic_cast<const ScUndoWrapper*>( pNextAction) != nullptr ) { ScUndoWrapper* pWrapper = static_cast<ScUndoWrapper*>(pNextAction); SfxUndoAction* pWrappedAction = pWrapper->GetWrappedUndo(); - if ( pWrappedAction && pWrappedAction->ISA( ScUndoPaste ) ) + if ( pWrappedAction && dynamic_cast<const ScUndoPaste*>( pWrappedAction) != nullptr ) { // Store paste action if this is part of paste with inserting cells. // A list action isn't used because Repeat wouldn't work (insert wrong cells). @@ -311,7 +311,7 @@ void ScUndoInsertCells::Redo() void ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { if ( pPasteUndo ) { @@ -327,7 +327,7 @@ void ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget) bool ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell, @@ -555,13 +555,13 @@ void ScUndoDeleteCells::Redo() void ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->DeleteCells( eCmd ); } bool ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } // delete cells in multiselection @@ -734,13 +734,13 @@ void ScUndoDeleteMulti::Redo() void ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget) { // if single selection - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->DeleteCells( DEL_DELROWS ); } bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell, @@ -835,13 +835,13 @@ void ScUndoCut::Redo() void ScUndoCut::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->CutToClip( NULL, true ); } bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, const ScRangeList& rRanges, @@ -1095,7 +1095,7 @@ void ScUndoPaste::Redo() void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell* pViewSh = static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pViewSh->GetActiveWin() ); @@ -1113,7 +1113,7 @@ void ScUndoPaste::Repeat(SfxRepeatTarget& rTarget) bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell, @@ -1498,13 +1498,13 @@ void ScUndoListNames::Redo() void ScUndoListNames::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->InsertNameList(); } bool ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoConditionalFormat::ScUndoConditionalFormat(ScDocShell* pNewDocShell, @@ -1660,7 +1660,7 @@ void ScUndoUseScenario::Redo() void ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { OUString aTemp = aName; static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->UseScenario(aTemp); @@ -1669,7 +1669,7 @@ void ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget) bool ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScViewData& rViewData = static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->GetViewData(); return !rViewData.GetDocument()->IsScenario( rViewData.GetTabNo() ); @@ -1760,7 +1760,7 @@ void ScUndoSelectionStyle::Redo() void ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScDocument& rDoc = pDocShell->GetDocument(); ScStyleSheetPool* pStlPool = rDoc.GetStyleSheetPool(); @@ -1779,7 +1779,7 @@ void ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) bool ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } sal_uInt16 ScUndoSelectionStyle::GetId() const @@ -1859,7 +1859,7 @@ void ScUndoEnterMatrix::Redo() void ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { OUString aTemp = aFormula; ScDocument& rDoc = pDocShell->GetDocument(); @@ -1869,7 +1869,7 @@ void ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget) bool ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } static ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark ) @@ -1929,13 +1929,13 @@ void ScUndoIndent::Redo() void ScUndoIndent::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->ChangeIndent( bIsIncrement ); } bool ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -1985,13 +1985,13 @@ void ScUndoTransliterate::Redo() void ScUndoTransliterate::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->TransliterateText( nTransliterationType ); } bool ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -2046,7 +2046,7 @@ void ScUndoClearItems::Redo() void ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScViewData& rViewData = static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->GetViewData(); rViewData.GetDocFunc().ClearItems( rViewData.GetMarkData(), pWhich, false ); @@ -2055,7 +2055,7 @@ void ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget) bool ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } // remove all line breaks of a table @@ -2110,7 +2110,7 @@ void ScUndoRemoveBreaks::Redo() void ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); rViewShell.RemoveManualBreaks(); @@ -2119,7 +2119,7 @@ void ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget) bool ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell, @@ -2221,13 +2221,13 @@ void ScUndoRemoveMerge::Redo() void ScUndoRemoveMerge::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->RemoveMerge(); } bool ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } void ScUndoRemoveMerge::SetCurTab() diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx index dfd6242346a9..bf35142c4f6f 100644 --- a/sc/source/ui/undo/undoblk2.cxx +++ b/sc/source/ui/undo/undoblk2.cxx @@ -163,13 +163,13 @@ void ScUndoWidthOrHeight::Redo() void ScUndoWidthOrHeight::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, true ); } bool ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 95b0077b7544..5ebdd63da6bd 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -214,13 +214,13 @@ void ScUndoDeleteContents::Redo() void ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->DeleteContents( nFlags ); } bool ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell, @@ -347,13 +347,13 @@ void ScUndoFillTable::Redo() void ScUndoFillTable::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->FillTab( nFlags, nFunction, bSkipEmpty, bAsLink ); } bool ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell, @@ -481,7 +481,7 @@ void ScUndoSelectionAttr::Redo() void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); if (pLineOuter) @@ -493,7 +493,7 @@ void ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget) bool ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell, @@ -628,7 +628,7 @@ void ScUndoAutoFill::Redo() void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); if (eFillCmd==FILL_SIMPLE) @@ -641,7 +641,7 @@ void ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget) bool ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, @@ -756,7 +756,7 @@ void ScUndoMerge::Redo() void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); bool bCont = false; @@ -766,7 +766,7 @@ void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget) bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell, @@ -909,13 +909,13 @@ void ScUndoAutoFormat::Redo() void ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->AutoFormat( nFormatNo ); } bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark, @@ -1088,13 +1088,13 @@ void ScUndoReplace::Redo() void ScUndoReplace::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->SearchAndReplace( pSearchItem, true, false ); } bool ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } // multi-operation (only simple blocks) @@ -1270,13 +1270,13 @@ void ScUndoConversion::Redo() void ScUndoConversion::Repeat( SfxRepeatTarget& rTarget ) { - if( rTarget.ISA( ScTabViewTarget ) ) + if( dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr ) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->DoSheetConversion( maConvParam ); } bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA( ScTabViewTarget ); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell, @@ -1356,13 +1356,13 @@ void ScUndoRefConversion::Redo() void ScUndoRefConversion::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->DoRefConversion(); } bool ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell, @@ -1482,7 +1482,7 @@ static ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const OUSt for (sal_uInt16 i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = *rLinks[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) if ( static_cast<ScAreaLink*>(pBase)->IsEqual( rDoc, rFlt, rOpt, rSrc, rDest ) ) return static_cast<ScAreaLink*>(pBase); } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index e90875be756c..d95a94422d9e 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -175,13 +175,13 @@ void ScUndoCursorAttr::Redo() void ScUndoCursorAttr::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->ApplySelectionPattern( *pApplyPattern ); } bool ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoEnterData::Value::Value() : mnTab(-1), mbHasFormat(false), mnFormat(0) {} @@ -313,7 +313,7 @@ void ScUndoEnterData::Redo() void ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { OUString aTemp = maNewString; static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->EnterDataAtCursor( aTemp ); @@ -322,7 +322,7 @@ void ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget) bool ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoEnterValue::ScUndoEnterValue( @@ -559,7 +559,7 @@ void ScUndoPageBreak::Redo() void ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); @@ -572,7 +572,7 @@ void ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget) bool ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell, @@ -632,7 +632,7 @@ void ScUndoPrintZoom::Redo() void ScUndoPrintZoom::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); ScViewData& rViewData = rViewShell.GetViewData(); @@ -642,7 +642,7 @@ void ScUndoPrintZoom::Repeat(SfxRepeatTarget& rTarget) bool ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoThesaurus::ScUndoThesaurus( @@ -717,13 +717,13 @@ void ScUndoThesaurus::Redo() void ScUndoThesaurus::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->DoThesaurus(); } bool ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoReplaceNote::ScUndoReplaceNote( ScDocShell& rDocShell, const ScAddress& rPos, diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 849e9f764ab3..1e1775cf7e0a 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -221,7 +221,7 @@ void ScUndoMakeOutline::Redo() void ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); @@ -234,7 +234,7 @@ void ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget) bool ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell, @@ -314,13 +314,13 @@ void ScUndoOutlineLevel::Redo() void ScUndoOutlineLevel::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, true ); } bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } /** show/hide outline over block marks */ @@ -410,7 +410,7 @@ void ScUndoOutlineBlock::Redo() void ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); @@ -423,7 +423,7 @@ void ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget) bool ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell, @@ -502,13 +502,13 @@ void ScUndoRemoveAllOutlines::Redo() void ScUndoRemoveAllOutlines::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->RemoveAllOutlines(); } bool ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoAutoOutline::ScUndoAutoOutline( ScDocShell* pNewDocShell, @@ -605,13 +605,13 @@ void ScUndoAutoOutline::Redo() void ScUndoAutoOutline::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->AutoOutline(); } bool ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoSubTotals::ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab, @@ -1239,7 +1239,7 @@ void ScUndoImportData::Redo() void ScUndoImportData::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); @@ -1257,7 +1257,7 @@ bool ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const // Repeat only for import using a database range, then pUndoDBData is set if (pUndoDBData) - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; else return false; // Address book } @@ -1416,13 +1416,13 @@ void ScUndoRepeatDB::Redo() void ScUndoRepeatDB::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->RepeatDB(); } bool ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell, @@ -1877,7 +1877,7 @@ void ScUndoDataForm::Repeat(SfxRepeatTarget& /*rTarget*/) bool ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const { - return (rTarget.ISA(ScTabViewTarget)); + return (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr); } void ScUndoDataForm::DoChange( const bool bUndo ) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 2b20217f53dc..044035d1a2cc 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -159,14 +159,14 @@ void ScUndoInsertTab::Redo() void ScUndoInsertTab::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->GetViewData().GetDispatcher(). Execute(FID_INS_TABLE, SfxCallMode::SLOT | SfxCallMode::RECORD); } bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell, @@ -254,14 +254,14 @@ void ScUndoInsertTables::Redo() void ScUndoInsertTables::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->GetViewData().GetDispatcher(). Execute(FID_INS_TABLE, SfxCallMode::SLOT | SfxCallMode::RECORD); } bool ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell, const vector<SCTAB> &aTab, @@ -412,7 +412,7 @@ void ScUndoDeleteTab::Redo() void ScUndoDeleteTab::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { ScTabViewShell* pViewShell = static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); pViewShell->DeleteTable( pViewShell->GetViewData().GetTabNo() ); @@ -421,7 +421,7 @@ void ScUndoDeleteTab::Repeat(SfxRepeatTarget& rTarget) bool ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell, @@ -866,7 +866,7 @@ void ScUndoMakeScenario::Redo() void ScUndoMakeScenario::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) { static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->MakeScenario( aName, aComment, aColor, nFlags ); } @@ -874,7 +874,7 @@ void ScUndoMakeScenario::Repeat(SfxRepeatTarget& rTarget) bool ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell, @@ -1023,14 +1023,14 @@ void ScUndoImportTab::Redo() void ScUndoImportTab::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->GetViewData().GetDispatcher(). Execute(FID_INS_TABLE, SfxCallMode::SLOT | SfxCallMode::RECORD); } bool ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const OUString& rDocName ) : @@ -1156,7 +1156,7 @@ void ScUndoShowHideTab::Redo() void ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->GetViewData().GetDispatcher(). Execute( bShow ? FID_TABLE_SHOW : FID_TABLE_HIDE, SfxCallMode::SLOT | SfxCallMode::RECORD); @@ -1164,7 +1164,7 @@ void ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget) bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } OUString ScUndoShowHideTab::GetComment() const @@ -1563,14 +1563,14 @@ void ScUndoLayoutRTL::Redo() void ScUndoLayoutRTL::Repeat(SfxRepeatTarget& rTarget) { - if (rTarget.ISA(ScTabViewTarget)) + if (dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr) static_cast<ScTabViewTarget&>(rTarget).GetViewShell()->GetViewData().GetDispatcher(). Execute( FID_TAB_RTL, SfxCallMode::SLOT | SfxCallMode::RECORD); } bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const { - return rTarget.ISA(ScTabViewTarget); + return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr; } OUString ScUndoLayoutRTL::GetComment() const diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 855d65983af6..f11d9edccc60 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4778,7 +4778,7 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument* pDoc, const ScRange& rR ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) return new ScCellRangeObj( static_cast<ScDocShell*>(pObjSh), rR ); return NULL; } @@ -7683,7 +7683,7 @@ void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aShee for ( sal_uInt16 i=0; i<nCount; i++ ) { ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i]; - if (pBase->ISA(ScTableLink)) + if (dynamic_cast<const ScTableLink*>( pBase) != nullptr) { ScTableLink* pTabLink = static_cast<ScTableLink*>(pBase); if ( aFileString.equals(pTabLink->GetFileName()) ) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index f9c7fdec8bbe..0c7954ea1496 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -719,16 +719,16 @@ OString ScModelObj::getTextSelection(const char* pMimeType, OString& rUsedMimeTy ScViewData* pViewData = ScDocShell::GetViewData(); uno::Reference<datatransfer::XTransferable> xTransferable; - if (( pShell = PTR_CAST( ScEditShell, pViewData->GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ))) + if (( pShell = dynamic_cast<ScEditShell*>( pViewData->GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) )) ) xTransferable = pShell->GetEditView()->GetTransferable(); - else if ((PTR_CAST( ScDrawTextObjectBar, pViewData->GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ))) + else if ( 0 != dynamic_cast<ScDrawTextObjectBar*>( pViewData->GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) )) { ScDrawView* pView = pViewData->GetScDrawView(); OutlinerView* pOutView = pView->GetTextEditOutlinerView(); if (pOutView) xTransferable = pOutView->GetEditView().GetTransferable(); } - else if (( pDrawShell = PTR_CAST( ScDrawShell, pViewData->GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ))) + else if (( pDrawShell = dynamic_cast<ScDrawShell*>( pViewData->GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) )) ) xTransferable = pDrawShell->GetDrawView()->CopyToTransferable(); else { @@ -1571,7 +1571,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec long nDisplayStart = pPrintFuncCache->GetDisplayStart( nTab ); long nTabStart = pPrintFuncCache->GetTabStart( nTab ); - vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); + vcl::PDFExtOutDevData* pPDFData = dynamic_cast< vcl::PDFExtOutDevData* >(pDev->GetExtOutDevData() ); if ( nRenderer == nTabStart ) { // first page of a sheet: add outline item for the sheet name diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index eb2b8b9fb8f5..ed02a3f1f890 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -116,7 +116,7 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const for (size_t i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i]; - if (pBase->ISA(ScTableLink)) + if (dynamic_cast<const ScTableLink*>( pBase) != nullptr) { ScTableLink* pTabLink = static_cast<ScTableLink*>(pBase); if ( pTabLink->GetFileName().equals(aFileName) ) @@ -587,7 +587,7 @@ static ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, size_t nPos ) for (size_t i=0; i<nTotalCount; i++) { ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) { if ( nAreaCount == nPos ) return static_cast<ScAreaLink*>(pBase); @@ -1011,7 +1011,7 @@ sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException, std:: for (size_t i=0; i<nTotalCount; i++) { ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i]; - if (pBase->ISA(ScAreaLink)) + if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) ++nAreaCount; } } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index ed20b5b793a3..03716f8cfcac 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -344,7 +344,7 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const if ( pDoc ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh); @@ -479,7 +479,7 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const if ( pDoc ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh); uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY ); @@ -577,7 +577,7 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const if ( pDoc ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh); uno::Reference<drawing::XShape> xShape( mxShapeAgg, uno::UNO_QUERY ); @@ -676,7 +676,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) if ( lcl_GetPageNum( pPage, *pModel, nTab ) ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh); uno::Reference< uno::XInterface > xAnchor; @@ -1033,7 +1033,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() if ( pDoc ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh); @@ -1293,7 +1293,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::R if ( pDoc ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); - if ( pObjSh && pObjSh->ISA(ScDocShell) ) + if ( pObjSh && dynamic_cast<const ScDocShell*>( pObjSh) != nullptr ) { ScDocShell* pDocSh = static_cast<ScDocShell*>(pObjSh); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index a810a5ff6cc2..556be91cba78 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2229,11 +2229,11 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa std::exception) { SolarMutexGuard aGuard; - ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); + ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pShell) return pShell->GetEditView()->GetTransferable(); - ScDrawTextObjectBar* pTextShell = PTR_CAST( ScDrawTextObjectBar, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); + ScDrawTextObjectBar* pTextShell = dynamic_cast<ScDrawTextObjectBar*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pTextShell) { ScViewData& rViewData = GetViewShell()->GetViewData(); @@ -2243,7 +2243,7 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa return pOutView->GetEditView().GetTransferable(); } - ScDrawShell* pDrawShell = PTR_CAST( ScDrawShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); + ScDrawShell* pDrawShell = dynamic_cast<ScDrawShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pDrawShell) return pDrawShell->GetDrawView()->CopyToTransferable(); @@ -2258,12 +2258,12 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref std::exception) { SolarMutexGuard aGuard; - ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); + ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pShell) pShell->GetEditView()->InsertText( xTrans, OUString(), false ); else { - ScDrawTextObjectBar* pTextShell = PTR_CAST( ScDrawTextObjectBar, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); + ScDrawTextObjectBar* pTextShell = dynamic_cast<ScDrawTextObjectBar*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); if (pTextShell) { ScViewData& rViewData = GetViewShell()->GetViewData(); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 5f6b24e73d29..0b6541ca8cb7 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -521,7 +521,7 @@ void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ ) thr dispatchExecute( pViewShell, SID_VIEWSHELL1 ); SfxViewShell* pShell = SfxViewShell::Get( pViewFrame->GetFrame().GetFrameInterface()->getController() ); - if ( pShell->ISA( ScPreviewShell ) ) + if ( dynamic_cast<const ScPreviewShell*>( pShell) != nullptr ) { ScPreviewShell* pPrvShell = static_cast< ScPreviewShell* >( pShell ); ScPreview* pPrvView = pPrvShell->GetPreview(); diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 4194841c025e..57a95438498f 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -95,7 +95,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( SID_RANGE_COL, true, &pXItem ) == SfxItemState::SET && pReqArgs->GetItemState( SID_RANGE_ROW, true, &pYItem ) == SfxItemState::SET ) { - OSL_ENSURE( pXItem->ISA(SfxInt16Item) && pYItem->ISA(SfxInt32Item), + OSL_ENSURE( dynamic_cast<const SfxInt16Item*>( pXItem) != nullptr && dynamic_cast<const SfxInt32Item*>( pYItem) != nullptr, "wrong items" ); SCsCOL nCol = static_cast<SCsCOL>(static_cast<const SfxInt16Item*>(pXItem)->GetValue()); SCsROW nRow = static_cast<SCsROW>(static_cast<const SfxInt32Item*>(pYItem)->GetValue()); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 106bc5c2b307..954da76c3e49 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1286,7 +1286,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET && - pItem->ISA(SfxUInt32Item) ) + dynamic_cast<const SfxUInt32Item*>( pItem) != nullptr ) { nFormat = static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pItem)->GetValue()); } @@ -1541,7 +1541,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const SfxPoolItem* pItem=nullptr; if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET && - pItem->ISA(SfxUInt32Item) ) + dynamic_cast<const SfxUInt32Item*>( pItem) != nullptr ) { SotClipboardFormatId nFormat = static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pItem)->GetValue()); bool bRet=true; @@ -2309,12 +2309,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem); if ( pItem ) { - const SfxStringItem* pStringItem = PTR_CAST( SfxStringItem, pItem ); + const SfxStringItem* pStringItem = dynamic_cast<const SfxStringItem*>( pItem ); if ( pStringItem ) aChars = pStringItem->GetValue(); const SfxPoolItem* pFtItem = nullptr; pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem); - const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); + const SfxStringItem* pFontItem = dynamic_cast<const SfxStringItem*>( pFtItem ); if ( pFontItem ) aFontName = pFontItem->GetValue(); } diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index b5667e6ac3d9..6b2dd8de432f 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -747,7 +747,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET ) { - OSL_ENSURE(pItem && pItem->ISA(SfxBoolItem), "wrong item"); + OSL_ENSURE(pItem && dynamic_cast<const SfxBoolItem*>( pItem) != nullptr, "wrong item"); bMoveContents = static_cast<const SfxBoolItem*>(pItem)->GetValue(); } diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 7e79ef9b3889..43bf80d1206f 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -197,7 +197,7 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) { if ( pViewData && pViewData->GetViewShell()->GetViewFrame()->HasChildWindow( ScIMapChildWindowId() ) && - pObj && ( pObj->ISA(SdrGrafObj) || pObj->ISA(SdrOle2Obj) ) ) + pObj && ( dynamic_cast<const SdrGrafObj*>( pObj) != nullptr || dynamic_cast<const SdrOle2Obj*>( pObj) != nullptr ) ) { Graphic aGraphic; TargetList aTargetList; @@ -210,7 +210,7 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) pViewData->GetViewShell()->GetViewFrame()->GetTargetList( aTargetList ); // handle graphics from object - if ( pObj->ISA( SdrGrafObj ) ) + if ( dynamic_cast<const SdrGrafObj*>( pObj) != nullptr ) aGraphic = static_cast<SdrGrafObj*>(pObj)->GetGraphic(); else { diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 73794d28b852..acbe5defcc40 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -70,7 +70,7 @@ void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rO rOneOle = (nCount == 1); break; } - else if ( pObj->ISA(SdrObjGroup) ) + else if ( dynamic_cast<const SdrObjGroup*>( pObj) != nullptr ) { SdrObjListIter aIter( *pObj, IM_DEEPNOGROUPS ); SdrObject* pSubObj = aIter.Next(); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index f49c66ab53b1..8d2f4d8e0e48 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -218,7 +218,7 @@ void ScDrawView::SetMarkedToLayer( sal_uInt8 nLayerNo ) for (size_t i=0; i<nCount; ++i) { SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj(); - if ( !pObj->ISA(SdrUnoObj) && (pObj->GetLayer() != SC_LAYER_INTERN) ) + if ( dynamic_cast<const SdrUnoObj*>( pObj) == nullptr && (pObj->GetLayer() != SC_LAYER_INTERN) ) { AddUndo( new SdrUndoObjectLayerChange( *pObj, pObj->GetLayer(), (SdrLayerID)nLayerNo) ); pObj->SetLayer( nLayerNo ); @@ -241,7 +241,7 @@ bool ScDrawView::HasMarkedControl() const { SdrObjListIter aIter( GetMarkedObjectList() ); for( SdrObject* pObj = aIter.Next(); pObj; pObj = aIter.Next() ) - if( pObj->ISA( SdrUnoObj ) ) + if( dynamic_cast<const SdrUnoObj*>( pObj) != nullptr ) return true; return false; } @@ -428,7 +428,7 @@ void ScDrawView::MarkListHasChanged() for (size_t i=0; i<nMarkCount; ++i) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); - if ( pObj->ISA( SdrObjGroup ) ) + if ( dynamic_cast<const SdrObjGroup*>( pObj) != nullptr ) { const SdrObjList *pLst = static_cast<SdrObjGroup*>(pObj)->GetSubList(); const size_t nListCount = pLst->GetObjCount(); @@ -443,7 +443,7 @@ void ScDrawView::MarkListHasChanged() { SdrObject *pSubObj = pLst->GetObj( j ); - if (!pSubObj->ISA(SdrUnoObj)) + if (dynamic_cast<const SdrUnoObj*>( pSubObj) == nullptr) bOnlyControls = false; if (pSubObj->GetObjIdentifier() != OBJ_GRAF) bOnlyGraf = false; @@ -453,7 +453,7 @@ void ScDrawView::MarkListHasChanged() } else { - if (!pObj->ISA(SdrUnoObj)) + if (dynamic_cast<const SdrUnoObj*>( pObj) == nullptr) bOnlyControls = false; if (pObj->GetObjIdentifier() != OBJ_GRAF) bOnlyGraf = false; @@ -897,7 +897,7 @@ void ScDrawView::MarkDropObj( SdrObject* pObj ) void ScDrawView::SyncForGrid( SdrObject* pObj ) { // process members of a group shape separately - if ( pObj->ISA( SdrObjGroup ) ) + if ( dynamic_cast<const SdrObjGroup*>( pObj) != nullptr ) { SdrObjList *pLst = static_cast<SdrObjGroup*>(pObj)->GetSubList(); for ( size_t i = 0, nCount = pLst->GetObjCount(); i < nCount; ++i ) diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 31463d1b89c1..70c5469163da 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -253,7 +253,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET && - pItem->ISA(SfxUInt32Item) ) + dynamic_cast<const SfxUInt32Item*>( pItem) != nullptr ) { nFormat = static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pItem)->GetValue()); } @@ -395,7 +395,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) aString = static_cast<const SfxStringItem*>(pItem)->GetValue(); const SfxPoolItem* pFtItem = NULL; pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem); - const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem ); + const SfxStringItem* pFontItem = dynamic_cast<const SfxStringItem*>( pFtItem ); if ( pFontItem ) { OUString aFontName(pFontItem->GetValue()); @@ -791,7 +791,7 @@ const SvxURLField* ScEditShell::GetURLField() if (pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); - if ( pField && pField->ISA(SvxURLField) ) + if ( pField && dynamic_cast<const SvxURLField*>( pField) != nullptr ) return static_cast<const SvxURLField*>(pField); } } diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index ccd622d709da..aab5d7c962eb 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -456,7 +456,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( SfxItemState::SET == pArgs->GetItemState( nSlotId, true, &pItem ) ) { - const SfxStringItem* pStrItem = PTR_CAST(SfxStringItem,pItem); + const SfxStringItem* pStrItem = dynamic_cast< const SfxStringItem *>( pItem ); if ( pStrItem ) { aStyleName = pStrItem->GetValue(); @@ -1419,12 +1419,12 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) { const SfxPoolItem& rUnderline = pSet->Get( ATTR_FONT_UNDERLINE ); - if( rUnderline.ISA(SvxUnderlineItem) ) + if( dynamic_cast<const SvxUnderlineItem*>( &rUnderline) != nullptr ) { pTabViewShell->ApplyAttr( rUnderline ); pNewSet->Put( rUnderline,rUnderline.Which() ); } - else if ( rUnderline.ISA(SvxTextLineItem) ) + else if ( dynamic_cast<const SvxTextLineItem*>( &rUnderline) != nullptr ) { // #i106580# also allow SvxTextLineItem (base class of SvxUnderlineItem) const SvxTextLineItem& rTextLineItem = static_cast<const SvxTextLineItem&>(rUnderline); diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 6bcc0bbd357f..ece03625ac4d 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -818,8 +818,7 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt ) // execute popup menu - ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, - SfxViewShell::Current() ); + ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( SfxViewShell::Current() ); if ( pViewSh ) { if ( rCEvt.IsMouseEvent() ) diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 5c2952202ecb..468953af8272 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2401,7 +2401,7 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext& rRenderContext) void ScOutputData::AddPDFNotes() { - vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, mpDev->GetExtOutDevData() ); + vcl::PDFExtOutDevData* pPDFData = dynamic_cast< vcl::PDFExtOutDevData* >( mpDev->GetExtOutDevData() ); if ( !pPDFData || !pPDFData->GetIsExportNotes() ) return; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index e07b7f7a3bb3..8a727f5b7f6c 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -821,7 +821,7 @@ double ScOutputData::GetStretch() static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScRefCellValue& rCell ) { - vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); + vcl::PDFExtOutDevData* pPDFData = dynamic_cast< vcl::PDFExtOutDevData* >( pDev->GetExtOutDevData() ); OUString aCellText; OUString aURL; @@ -1433,7 +1433,7 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA mpDev->GetMapMode().GetMapUnit() == mpRefDevice->GetMapMode().GetMapUnit(), "LayoutStrings: different MapUnits ?!?!" ); - vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, mpDev->GetExtOutDevData() ); + vcl::PDFExtOutDevData* pPDFData = dynamic_cast< vcl::PDFExtOutDevData* >(mpDev->GetExtOutDevData() ); sc::IdleSwitch aIdleSwitch(*mpDoc, false); ScDrawStringsVars aVars( this, bPixelToLogic ); @@ -2711,7 +2711,7 @@ void ScOutputData::DrawEditParam::adjustForRTL() void ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, OutputDevice* pDev) { // PDF: whole-cell hyperlink from formula? - vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); + vcl::PDFExtOutDevData* pPDFData = dynamic_cast<vcl::PDFExtOutDevData* >( pDev->GetExtOutDevData() ); bool bHasURL = pPDFData && isHyperlinkCell(); if (!bHasURL) return; diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index f9a0c9b3f80c..2b9f1234e65c 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -158,7 +158,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, { Construct( &pViewFrame->GetWindow() ); - if ( pOldSh && pOldSh->ISA( ScTabViewShell ) ) + if ( pOldSh && dynamic_cast<const ScTabViewShell*>( pOldSh) != nullptr ) { // store view settings, show table from TabView //! store live ScViewData instead, and update on ScTablesHint? diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index b08af0ae9931..4c986dd94f2f 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -88,7 +88,7 @@ namespace /************************************************************************************/\ ScTabViewShell* pViewShell = lcl_GetTabViewShell( p ); \ if (!pViewShell) \ - pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); \ + pViewShell = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); \ OSL_ENSURE( pViewShell, "missing view shell :-(" ); \ SetWindow( pViewShell ? \ pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : nullptr ); \ @@ -146,7 +146,7 @@ ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( vcl::Window* pParentP, { SfxViewFrame* pViewFrm = pDisp->GetFrame(); if ( pViewFrm ) - pViewShell = PTR_CAST( ScTabViewShell, pViewFrm->GetViewShell() ); + pViewShell = dynamic_cast<ScTabViewShell*>( pViewFrm->GetViewShell() ); } OSL_ENSURE( pViewShell, "missing view shell :-(" ); @@ -236,7 +236,7 @@ ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( vcl::Window* pParentP, SfxChildWindow( pParentP, nId ) { ScTabViewShell* pViewShell = - PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); OSL_ENSURE( pViewShell, "missing view shell :-(" ); if (pViewShell) { @@ -252,7 +252,7 @@ ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( vcl::Window* pParentP, void ScAcceptChgDlgWrapper::ReInitDlg() { ScTabViewShell* pViewShell = - PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); OSL_ENSURE( pViewShell, "missing view shell :-(" ); if(GetWindow() && pViewShell) @@ -297,7 +297,7 @@ ScValidityRefChildWin::ScValidityRefChildWin( vcl::Window* pParent else pViewShell = lcl_GetTabViewShell( p ); if (!pViewShell) - pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); + pViewShell = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); OSL_ENSURE( pViewShell, "missing view shell :-(" ); if (pViewShell && !GetWindow()) pViewShell->GetViewFrame()->SetChildWindow( nId, false ); diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 714ab370a494..033bcd207394 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -118,7 +118,7 @@ void ScSpellDialogChildWindow::LoseFocus() void ScSpellDialogChildWindow::Reset() { - if( mpViewShell && (mpViewShell == PTR_CAST( ScTabViewShell, SfxViewShell::Current() )) ) + if( mpViewShell && (mpViewShell == dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() )) ) { if( mxEngine.get() && mxEngine->IsAnyModified() ) { @@ -163,7 +163,7 @@ void ScSpellDialogChildWindow::Init() { if( mpViewShell ) return; - if( (mpViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() )) == 0 ) + if( (mpViewShell = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() )) == 0 ) return; mpViewData = &mpViewShell->GetViewData(); @@ -262,7 +262,7 @@ void ScSpellDialogChildWindow::Init() bool ScSpellDialogChildWindow::IsSelectionChanged() { - if( !mxOldRangeList.get() || !mpViewShell || (mpViewShell != PTR_CAST( ScTabViewShell, SfxViewShell::Current() )) ) + if( !mxOldRangeList.get() || !mpViewShell || (mpViewShell != dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() )) ) return true; if( EditView* pEditView = mpViewData->GetSpellingView() ) diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index dc838e234db5..9b9f4c2572e1 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -188,7 +188,7 @@ bool ScConversionEngineBase::FindNextConversionCell() // language changed? const SfxPoolItem* pItem = mrDoc.GetAttr( nNewCol, nNewRow, mnStartTab, ATTR_FONT_LANGUAGE ); - if( const SvxLanguageItem* pLangItem = PTR_CAST( SvxLanguageItem, pItem ) ) + if( const SvxLanguageItem* pLangItem = dynamic_cast<const SvxLanguageItem*>( pItem ) ) { LanguageType eLang = static_cast< LanguageType >( pLangItem->GetValue() ); if( eLang == LANGUAGE_SYSTEM ) diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 6e229523d346..60e811e2f5c4 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -102,7 +102,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) { const SfxPoolItem* pItem; if ( pArgs->GetItemState( SID_INSERT_DRAW, true, &pItem ) == SfxItemState::SET && - pItem->ISA( SvxDrawToolItem ) ) + dynamic_cast<const SvxDrawToolItem*>( pItem) != nullptr ) { SvxDrawToolEnum eSel = (SvxDrawToolEnum)static_cast<const SvxDrawToolItem*>(pItem)->GetValue(); switch (eSel) @@ -139,7 +139,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) { const SfxPoolItem* pItem; if ( pArgs->GetItemState( SID_FM_CONTROL_IDENTIFIER, true, &pItem ) == SfxItemState::SET && - pItem->ISA( SfxUInt16Item ) ) + dynamic_cast<const SfxUInt16Item*>( pItem) != nullptr ) nNewFormId = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); } @@ -147,7 +147,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( pArgs ) { const SfxPoolItem* pItem; - if ( pArgs->GetItemState( nNewId, true, &pItem ) == SfxItemState::SET && pItem->ISA( SfxStringItem ) ) + if ( pArgs->GetItemState( nNewId, true, &pItem ) == SfxItemState::SET && dynamic_cast<const SfxStringItem*>( pItem) != nullptr ) sStringItemValue = static_cast<const SfxStringItem*>(pItem)->GetValue(); } bool bSwitchCustom = ( !sStringItemValue.isEmpty() && !sDrawCustom.isEmpty() && sStringItemValue != sDrawCustom ); diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 569f578cbdb9..70ab1592ece2 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -945,7 +945,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET && - pItem->ISA( SfxStringItem ) ) + dynamic_cast<const SfxStringItem*>( pItem) != nullptr ) { OUString aComment = static_cast<const SfxStringItem*>(pItem)->GetValue(); pDocSh->SetChangeComment( pAction, aComment ); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 151a57bc9594..13eef44e8d97 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -136,9 +136,7 @@ void ScTabViewShell::Activate(bool bMDI) ScInputHandler* pOldHdl=pWin->GetInputHandler(); - TypeId aScType = TYPE(ScTabViewShell); - - SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType ); + SfxViewShell* pSh = SfxViewShell::GetFirst( true, checkSfxViewShell<ScTabViewShell> ); while ( pSh!=NULL && pOldHdl!=NULL) { if (static_cast<ScTabViewShell*>(pSh)->GetInputHandler() == pOldHdl) @@ -146,7 +144,7 @@ void ScTabViewShell::Activate(bool bMDI) pOldHdl->ResetDelayTimer(); break; } - pSh = SfxViewShell::GetNext( *pSh, &aScType ); + pSh = SfxViewShell::GetNext( *pSh, true, checkSfxViewShell<ScTabViewShell> ); } pWin->SetInputHandler( pInputHandler ); @@ -1037,7 +1035,7 @@ void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr ) ScTabViewShell* ScTabViewShell::GetActiveViewShell() { - return PTR_CAST(ScTabViewShell,Current()); + return dynamic_cast< ScTabViewShell *>( Current() ); } SfxPrinter* ScTabViewShell::GetPrinter( bool bCreate ) @@ -1694,7 +1692,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, // old DesignMode state from form layer must be restored, too TriState nForceDesignMode = TRISTATE_INDET; - if ( pOldSh && pOldSh->ISA( ScPreviewShell ) ) + if ( pOldSh && dynamic_cast<const ScPreviewShell*>( pOldSh) != nullptr ) { ScPreviewShell* pPreviewShell = static_cast<ScPreviewShell*>(pOldSh); nForceDesignMode = pPreviewShell->GetSourceDesignMode(); diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index cd36fea739e4..c8875511140b 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -401,17 +401,17 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) pNewDBField->SetLogicRect(aNewObjectRectangle); // controls must be on control layer, groups on front layer - if ( pNewDBField->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrUnoObj*>( pNewDBField) != nullptr ) pNewDBField->NbcSetLayer(SC_LAYER_CONTROLS); else pNewDBField->NbcSetLayer(SC_LAYER_FRONT); - if (pNewDBField->ISA(SdrObjGroup)) + if (dynamic_cast<const SdrObjGroup*>( pNewDBField) != nullptr) { SdrObjListIter aIter( *pNewDBField, IM_DEEPWITHGROUPS ); SdrObject* pSubObj = aIter.Next(); while (pSubObj) { - if ( pSubObj->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrUnoObj*>( pSubObj) != nullptr ) pSubObj->NbcSetLayer(SC_LAYER_CONTROLS); else pSubObj->NbcSetLayer(SC_LAYER_FRONT); diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index e3d03d12741f..f8b8d5cd6d98 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -227,7 +227,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) if ( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, false, &pItem) ) { - OSL_ENSURE( pItem->ISA(SvxSearchItem), "wrong Item" ); + OSL_ENSURE( dynamic_cast<const SvxSearchItem*>( pItem) != nullptr, "wrong Item" ); const SvxSearchItem* pSearchItem = static_cast<const SvxSearchItem*>(pItem); ScGlobal::SetSearchItem( *pSearchItem ); @@ -261,7 +261,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) pReqArgs->GetItemState(SID_SEARCH_ITEM, false, &pItem)) { // remember search item - OSL_ENSURE( pItem->ISA(SvxSearchItem), "wrong Item" ); + OSL_ENSURE( dynamic_cast<const SvxSearchItem*>( pItem) != nullptr, "wrong Item" ); ScGlobal::SetSearchItem( *static_cast<const SvxSearchItem*>(pItem )); } else diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index c3959c606434..132789c6d05f 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -460,7 +460,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) while ( pSh ) { - pScSh = PTR_CAST( ScDocShell, pSh ); + pScSh = dynamic_cast<ScDocShell*>( pSh ); if( pScSh ) { diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 7711cfe0ec17..b9e5ed326bc1 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -60,7 +60,7 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR SdrObject* pObj = SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON, pDrView->GetSdrPageView()->GetPage(), pModel); - SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj); + SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj ); OSL_ENSURE( pUnoCtrl, "no SdrUnoObj"); if( !pUnoCtrl ) return; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 0c57a933e254..eeddce788b50 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2533,13 +2533,13 @@ void ScViewFunc::MoveTable( SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON, &aItem, &aTarget, 0L ); if ( pRetItem ) { - if ( pRetItem->ISA( SfxObjectItem ) ) - pDestShell = PTR_CAST( ScDocShell, static_cast<const SfxObjectItem*>(pRetItem)->GetShell() ); - else if ( pRetItem->ISA( SfxViewFrameItem ) ) + if ( dynamic_cast<const SfxObjectItem*>( pRetItem) != nullptr ) + pDestShell = dynamic_cast<ScDocShell*>( static_cast<const SfxObjectItem*>(pRetItem)->GetShell() ); + else if ( dynamic_cast<const SfxViewFrameItem*>( pRetItem) != nullptr ) { SfxViewFrame* pFrm = static_cast<const SfxViewFrameItem*>(pRetItem)->GetFrame(); if (pFrm) - pDestShell = PTR_CAST( ScDocShell, pFrm->GetObjectShell() ); + pDestShell = dynamic_cast<ScDocShell*>( pFrm->GetObjectShell() ); } if (pDestShell) pDestViewSh = pDestShell->GetBestViewShell(); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 4b1c0c07bd5e..dd8bb7e7c9e3 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -433,17 +433,17 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, aRect.SetPos(aInsPos); pObj->SetLogicRect(aRect); - if ( pObj->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrUnoObj*>( pObj) != nullptr ) pObj->NbcSetLayer(SC_LAYER_CONTROLS); else pObj->NbcSetLayer(SC_LAYER_FRONT); - if (pObj->ISA(SdrObjGroup)) + if (dynamic_cast<const SdrObjGroup*>( pObj) != nullptr) { SdrObjListIter aIter( *pObj, IM_DEEPWITHGROUPS ); SdrObject* pSubObj = aIter.Next(); while (pSubObj) { - if ( pSubObj->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrUnoObj*>( pSubObj) != nullptr ) pSubObj->NbcSetLayer(SC_LAYER_CONTROLS); else pSubObj->NbcSetLayer(SC_LAYER_FRONT); @@ -510,7 +510,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->ISA(SdrUnoObj) ) + if ( dynamic_cast<const SdrUnoObj*>( pObject) != nullptr ) pObject->NbcSetLayer(SC_LAYER_CONTROLS); else pObject->NbcSetLayer(SC_LAYER_FRONT); diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 3bed5d9e9faa..79da9e04d826 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -163,7 +163,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, pNeuObj->SetPage(pDestPage); // copy graphics within the same model - always needs new name - if ( pNeuObj->ISA(SdrGrafObj) && !bPasteIsMove ) + if ( dynamic_cast<const SdrGrafObj*>( pNeuObj) != nullptr && !bPasteIsMove ) pNeuObj->SetName(static_cast<ScDrawLayer*>(pDrawModel)->GetNewGraphicName()); if (nDiffX!=0 || nDiffY!=0) @@ -236,7 +236,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->ISA(SdrUnoObj) && pObject->GetLayer() != SC_LAYER_CONTROLS ) + if ( dynamic_cast<const SdrUnoObj*>( pObject) != nullptr && pObject->GetLayer() != SC_LAYER_CONTROLS ) pObject->NbcSetLayer(SC_LAYER_CONTROLS); if (ScDrawLayer::IsCellAnchored(*pObject)) diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 5747d0592e13..9bbaa7c6e13b 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -77,7 +77,7 @@ sal_uInt16 ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos ) sal_uInt16 nWhich = ( nScript == SvtScriptType::ASIAN ) ? ATTR_CJK_FONT_LANGUAGE : ( ( nScript == SvtScriptType::COMPLEX ) ? ATTR_CTL_FONT_LANGUAGE : ATTR_FONT_LANGUAGE ); const SfxPoolItem* pItem = pDoc->GetAttr( rPos.Col(), rPos.Row(), rPos.Tab(), nWhich); - const SvxLanguageItem* pLangIt = PTR_CAST( SvxLanguageItem, pItem ); + const SvxLanguageItem* pLangIt = dynamic_cast<const SvxLanguageItem*>( pItem ); LanguageType eLnge; if (pLangIt) { |