core/layout: dont use 'shortcut' that is longer than the original

Change-Id: I2f5104e992cc5c33a27f2d2770ba4e6b25b40f70

4 files changed, 12 insertions, 12 deletions

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 565cd47c6bab..d93118f3a162 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -147,7 +147,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
                     if ( pNode->IsCntntNode() &&
                          static_cast<SwCntntNode*>(pNode)->GetDepends() )
                     {
-                        SwCrsrShell *pShell = SwIterator<SwCrsrShell,SwCntntNode>::FirstElement( *static_cast<SwCntntNode*>(pNode) );
+                        SwCrsrShell *pShell = SwIterator<SwCrsrShell,SwCntntNode>( *static_cast<SwCntntNode*>(pNode) ).First();
                         if( pShell )
                         {
                             pShell->ParkCrsr( aIdx );
@@ -2704,7 +2704,7 @@ SwRect SwFrmFmt::FindLayoutRect( const bool bPrtArea, const Point* pPoint,
 
 SwContact* SwFrmFmt::FindContactObj()
 {
-    return SwIterator<SwContact,SwFmt>::FirstElement( *this );
+    return SwIterator<SwContact,SwFmt>( *this ).First();
 }
 
 SdrObject* SwFrmFmt::FindSdrObject()
@@ -2731,10 +2731,10 @@ bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
 {
     //Also linking from inside to outside or from outside to inside is not
     //allowed.
-    SwFlyFrm *pSFly = SwIterator<SwFlyFrm,SwFmt>::FirstElement(*this);
+    SwFlyFrm *pSFly = SwIterator<SwFlyFrm,SwFmt>(*this).First();
     if( pSFly )
     {
-        SwFlyFrm *pAskFly = SwIterator<SwFlyFrm,SwFmt>::FirstElement(rFmt);
+        SwFlyFrm *pAskFly = SwIterator<SwFlyFrm,SwFmt>(rFmt).First();
         if( pAskFly )
             return pSFly->IsLowerOf( pAskFly );
     }
@@ -2903,7 +2903,7 @@ void SwFlyFrmFmt::MakeFrms()
             }
             if ( pCNd )
             {
-                if( SwIterator<SwFrm,SwCntntNode>::FirstElement( *pCNd ) )
+                if( SwIterator<SwFrm,SwCntntNode>( *pCNd ).First() )
                 {
                     pModify = pCNd;
                 }
@@ -3062,7 +3062,7 @@ bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
     {
     case RES_CONTENT_VISIBLE:
         {
-            static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFmt>::FirstElement( *this );
+            static_cast<SwPtrMsgPoolItem&>(rInfo).pObject = SwIterator<SwFrm,SwFmt>( *this ).First();
         }
         bRet = false;
         break;
@@ -3373,7 +3373,7 @@ IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint,
 
     if( !pFly )
     {
-        pFly = SwIterator<SwFlyFrm,SwFmt>::FirstElement( *this );
+        pFly = SwIterator<SwFlyFrm,SwFmt>( *this ).First();
         if( !pFly )
             return 0;
     }
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 8e788e0f5fd0..f76ca7eb096b 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -400,7 +400,7 @@ void SwFlyFrm::InitDrawObj( bool bNotify )
     // need to create a new Ref, else we create the Contact now.
 
     IDocumentDrawModelAccess* pIDDMA = GetFmt()->getIDocumentDrawModelAccess();
-    SwFlyDrawContact *pContact = SwIterator<SwFlyDrawContact,SwFmt>::FirstElement( *GetFmt() );
+    SwFlyDrawContact *pContact = SwIterator<SwFlyDrawContact,SwFmt>( *GetFmt() ).First();
     if ( !pContact )
     {
         // #i52858# - method name changed
@@ -461,7 +461,7 @@ void SwFlyFrm::FinitDrawObj()
 
         if ( bContinue )
             // no Frm left, find Contact object to destroy
-            pMyContact = SwIterator<SwFlyDrawContact,SwFmt>::FirstElement( *GetFmt() );
+            pMyContact = SwIterator<SwFlyDrawContact,SwFmt>( *GetFmt() ).First();
     }
 
     // OD, OS 2004-03-31 #116203# - clear user call of Writer fly frame 'master'
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index 2857b14a276d..135e5c32f10a 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -51,7 +51,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt,
         if( RES_FLYFRMFMT == pFmt->Which() )
         {
             // Let's see if we have an SdrObject for this
-            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>::FirstElement(*pFmt);
+            SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>(*pFmt).First();
             if( pFly )
             {
                 nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
@@ -61,7 +61,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt,
         else if( RES_DRAWFRMFMT == pFmt->Which() )
         {
             // Let's see if we have an SdrObject for this
-            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>::FirstElement(*pFmt);
+            SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>(*pFmt).First();
             if( pContact )
             {
                 nOrdNum = pContact->GetMaster()->GetOrdNum();
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 0fafeb2f8023..431176f92efd 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1118,7 +1118,7 @@ static bool lcl_ObjConnected( const SwFrmFmt *pFmt, const SwFrm* pSib )
     }
     else
     {
-        SwDrawContact *pContact = SwIterator<SwDrawContact,SwFmt>::FirstElement(*pFmt);
+        SwDrawContact *pContact = SwIterator<SwDrawContact,SwFmt>(*pFmt).First();
         if ( pContact )
             return pContact->GetAnchorFrm() != 0;
     }