[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/layout/hffrm.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 26637a22f4cb6112b6ae19e36c3ada6711a18579
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Oct 11 19:53:06 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 11 22:39:13 2020 +0200

    dynamic_cast followed by static_cast
    
    Change-Id: I3ed7c8954d929fe3ba53379df3428433a1d7f287
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104192
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 87d63ebb76a3..50fc4e1b729f 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -664,9 +664,8 @@ static void DelFlys( SwLayoutFrame const *pFrame, SwPageFrame *pPage )
             i < pPage->GetSortedObjs()->size() )
     {
         SwAnchoredObject* pObj = (*pPage->GetSortedObjs())[i];
-        if ( dynamic_cast< const SwFlyFrame *>( pObj ) !=  nullptr )
+        if (SwFlyFrame* pFlyFrame = dynamic_cast<SwFlyFrame*>(pObj))
         {
-            SwFlyFrame* pFlyFrame = static_cast<SwFlyFrame*>(pObj);
             if ( pFrame->IsAnLower( pFlyFrame ) )
             {
                 SwFrame::DestroyFrame(pFlyFrame);