dynamic_cast followed by static_cast and elide some casts when possible

Change-Id: Ib7d303bc18aebaa562bb380a8f3ab7d9fddcbca9

1 files changed, 10 insertions, 11 deletions

diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index fbfbeb6bd8f4..88bb2ac5194c 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -672,9 +672,9 @@ namespace svxform
             if (rText == aEntryText)
                 return pEntryData;
 
-            if( bRecurs && dynamic_cast<const FmFormData*>( pEntryData) !=  nullptr )
+            if (FmFormData* pFormData = bRecurs ? dynamic_cast<FmFormData*>(pEntryData) : nullptr)
             {
-                pChildData = FindData( rText, static_cast<FmFormData*>(pEntryData) );
+                pChildData = FindData(rText, pFormData);
                 if( pChildData )
                     return pChildData;
             }
@@ -683,11 +683,10 @@ namespace svxform
         return nullptr;
     }
 
-
     void NavigatorTreeModel::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     {
         const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
-        if( pSdrHint )
+        if (pSdrHint)
         {
             switch( pSdrHint->GetKind() )
             {
@@ -702,18 +701,18 @@ namespace svxform
             }
         }
         // is shell gone?
-        else if ( dynamic_cast<const SfxSimpleHint*>(&rHint) && static_cast<const SfxSimpleHint*>(&rHint)->GetId() == SFX_HINT_DYING)
-            UpdateContent(nullptr);
-
+        else if (const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint))
+        {
+            if (pSimpleHint->GetId() == SFX_HINT_DYING)
+                UpdateContent(nullptr);
+        }
         // changed mark of controls?
-        else if (dynamic_cast<const FmNavViewMarksChanged*>(&rHint))
+        else if (const FmNavViewMarksChanged* pvmcHint = dynamic_cast<const FmNavViewMarksChanged*>(&rHint))
         {
-            const FmNavViewMarksChanged* pvmcHint = static_cast<const FmNavViewMarksChanged*>(&rHint);
-            BroadcastMarkedObjects( pvmcHint->GetAffectedView()->GetMarkedObjectList() );
+            BroadcastMarkedObjects(pvmcHint->GetAffectedView()->GetMarkedObjectList());
         }
     }
 
-
     void NavigatorTreeModel::InsertSdrObj( const SdrObject* pObj )
     {
         const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );