diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-11 20:34:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-12 00:31:34 +0000 |
| commit | cbfcdc4d120c160457b6353461387258daa35453 (patch) | |
| tree | 8889c1159ce44286b026cee4ea4e30c4e003e3c7 /sw | |
| parent | b216cc1b8096eb60c27f67e8c27b7cd756c75e38 (diff) | |
dynamic cast followed by static cast
Change-Id: I22a2123265da9d6808d9fd1bcb44666810a9311e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/laycache.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 9cdba42517db..43cabb8e7188 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -278,9 +278,8 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) for ( size_t i = 0; i < rObjs.size(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; - if ( dynamic_cast< const SwFlyFrm *>( pAnchoredObj ) != nullptr ) + if (SwFlyFrm *pFly = dynamic_cast<SwFlyFrm*>(pAnchoredObj)) { - SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj); if( pFly->Frm().Left() != FAR_AWAY && !pFly->GetAnchorFrm()->FindFooterOrHeader() ) { @@ -943,9 +942,8 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) for ( size_t i = 0; i < rObjs.size(); ++i ) { SwAnchoredObject* pAnchoredObj = rObjs[i]; - if ( dynamic_cast< const SwFlyFrm *>( pAnchoredObj ) != nullptr ) // a text frame? + if (SwFlyFrm *pFly = dynamic_cast<SwFlyFrm*>(pAnchoredObj)) // a text frame? { - SwFlyFrm *pFly = static_cast<SwFlyFrm*>(pAnchoredObj); if( pFly->GetAnchorFrm() && !pFly->GetAnchorFrm()->FindFooterOrHeader() ) { |