diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-07 13:55:06 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-09 07:31:24 +0100 |
commit | 5ba447bdcd13ba3d7c27c8609f207910227e4ab6 (patch) | |
tree | 9a59e7058ef40be90867518590e35abb6c0615f5 /sc/source | |
parent | ea4a47d7d442d5d897cfa3a6e9f09ce3f1f233c5 (diff) |
new loplugin simplifydynamiccast
simplify dynamic_cast followed by static_cast
Change-Id: I965afcf05d1675094cfde53d3590a0fd00f26279
Reviewed-on: https://gerrit.libreoffice.org/44460
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/dbgui/validate.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/navipi/content.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/navipi/scenwnd.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 8 |
5 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 6f4c08ebcaa5..d98e11e3eb6d 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -518,8 +518,8 @@ ScValidationDlg * ScTPValidationValue::GetValidationDlg() { if( vcl::Window *pParent = GetParent() ) do{ - if ( dynamic_cast<ScValidationDlg*>( pParent ) ) - return static_cast< ScValidationDlg * >( pParent ); + if ( auto pValidationDlg = dynamic_cast<ScValidationDlg*>( pParent ) ) + return pValidationDlg; }while ( nullptr != ( pParent = pParent->GetParent() ) ); return nullptr; } diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 15904ee521e6..08466129371d 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -530,14 +530,14 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV if( pReqArgs->HasItem( FN_PARAM_4, &pItem ) ) { - if ( dynamic_cast<const SfxUInt16Item*>( pItem) != nullptr ) - nToTable = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); - else if ( dynamic_cast<const SfxBoolItem*>( pItem) != nullptr ) + if ( auto pUInt16Item = dynamic_cast<const SfxUInt16Item*>( pItem) ) + nToTable = pUInt16Item->GetValue(); + else if ( auto pBoolItem = dynamic_cast<const SfxBoolItem*>( pItem) ) { // In IDL for Basic FN_PARAM_4 means SfxBoolItem // -> if set new table, else current table - if ( static_cast<const SfxBoolItem*>(pItem)->GetValue() ) + if ( pBoolItem->GetValue() ) nToTable = static_cast<sal_uInt16>(rScDoc.GetTableCount()); else nToTable = static_cast<sal_uInt16>(rData.GetTabNo()); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 7549bb6a51e4..4b14ddf3add9 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -1068,10 +1068,10 @@ const ScAreaLink* ScContentTree::GetLink( sal_uLong nIndex ) for (sal_uInt16 i=0; i<nCount; i++) { ::sfx2::SvBaseLink* pBase = rLinks[i].get(); - if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) + if (auto pAreaLink = dynamic_cast<const ScAreaLink*>( pBase)) { if (nFound == nIndex) - return static_cast<const ScAreaLink*>(pBase); + return pAreaLink; ++nFound; } } diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 6b65715124bc..9038acb74664 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -247,18 +247,18 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) { aLbScenario->Enable(); - if ( dynamic_cast<const SfxStringItem*>( pState) != nullptr ) + if ( auto pStringItem = dynamic_cast<const SfxStringItem*>( pState) ) { - OUString aNewEntry( static_cast<const SfxStringItem*>(pState)->GetValue() ); + OUString aNewEntry( pStringItem->GetValue() ); if ( !aNewEntry.isEmpty() ) aLbScenario->SelectEntry( aNewEntry ); else aLbScenario->SetNoSelection(); } - else if ( dynamic_cast<const SfxStringListItem*>( pState) != nullptr ) + else if ( auto pStringListItem = dynamic_cast<const SfxStringListItem*>( pState) ) { - aLbScenario->UpdateEntries( static_cast<const SfxStringListItem*>(pState)->GetList() ); + aLbScenario->UpdateEntries( pStringListItem->GetList() ); } } else diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 1a8e08520db4..fb4c178e10f1 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2616,11 +2616,11 @@ void ScViewFunc::MoveTable( { &aItem, &aTarget }); if ( pRetItem ) { - 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 ) + if ( auto pObjectItem = dynamic_cast<const SfxObjectItem*>(pRetItem) ) + pDestShell = dynamic_cast<ScDocShell*>( pObjectItem->GetShell() ); + else if ( auto pViewFrameItem = dynamic_cast<const SfxViewFrameItem*>( pRetItem) ) { - SfxViewFrame* pFrm = static_cast<const SfxViewFrameItem*>(pRetItem)->GetFrame(); + SfxViewFrame* pFrm = pViewFrameItem->GetFrame(); if (pFrm) pDestShell = dynamic_cast<ScDocShell*>( pFrm->GetObjectShell() ); } |