unocore: dont use 'shortcut' that is longer than the original

Change-Id: I0bc66003528b6603ce46325176973d72dcbac2ac

4 files changed, 9 insertions, 9 deletions

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index cc83db110ed4..375e8c6eee1c 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -283,7 +283,7 @@ uno::Reference< uno::XInterface >   SwFmDrawPage::GetInterface( SdrObject* pObj
     if( pObj )
     {
         SwFrmFmt* pFmt = ::FindFrmFmt( pObj );
-        SwXShape* pxShape = SwIterator<SwXShape,SwFmt>::FirstElement( *pFmt );
+        SwXShape* pxShape = SwIterator<SwXShape,SwFmt>( *pFmt ).First();
         if(pxShape)
         {
             xShape =  *(cppu::OWeakObject*)pxShape;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index b604a7859aec..39e74f2847a8 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2203,7 +2203,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
             // format document completely in order to get correct value
             pFmt->GetDoc()->GetEditShell()->CalcLayout();
 
-            SwFrm* pTmpFrm = SwIterator<SwFrm,SwFmt>::FirstElement( *pFmt );
+            SwFrm* pTmpFrm = SwIterator<SwFrm,SwFmt>( *pFmt ).First();
             if ( pTmpFrm )
             {
                 OSL_ENSURE( pTmpFrm->IsValid(), "frame not valid" );
@@ -3616,7 +3616,7 @@ uno::Reference< lang::XComponent >  SwXTextEmbeddedObject::getEmbeddedObject(voi
             uno::Reference< frame::XModel > xModel( xRet, uno::UNO_QUERY);
             if( xBrdcst.is() && xModel.is() )
             {
-                SwXOLEListener* pListener = SwIterator<SwXOLEListener,SwFmt>::FirstElement( *pFmt );
+                SwXOLEListener* pListener = SwIterator<SwXOLEListener,SwFmt>( *pFmt ).First();
                 //create a new one if the OLE object doesn't have one already
                 if( !pListener )
                 {
@@ -3656,7 +3656,7 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte
             uno::Reference< frame::XModel > xModel( xComp, uno::UNO_QUERY);
             if( xBrdcst.is() && xModel.is() )
             {
-                SwXOLEListener* pListener = SwIterator<SwXOLEListener,SwFmt>::FirstElement( *pFmt );
+                SwXOLEListener* pListener = SwIterator<SwXOLEListener,SwFmt>( *pFmt ).First();
                 //create a new one if the OLE object doesn't have one already
                 if( !pListener )
                 {
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 1066edf0c491..4980ed0df7b3 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1742,7 +1742,7 @@ lcl_CreateNextObject(SwUnoCrsr& i_rUnoCrsr,
     // the format should be valid here, otherwise the client
     // would have been removed in ::Modify
     // check for a shape first
-    SwDrawContact* const pContact = SwIterator<SwDrawContact,SwFmt>::FirstElement( *pFormat );
+    SwDrawContact* const pContact = SwIterator<SwDrawContact,SwFmt>( *pFormat ).First();
     if (pContact)
     {
         SdrObject * const pSdr = pContact->GetMaster();
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 75f2b0c773ad..ee4d66fec2a5 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2259,7 +2259,7 @@ uno::Reference< table::XTableRows >  SwXTextTable::getRows(void) throw( uno::Run
     uno::Reference< table::XTableRows >  xRet;
     if (SwFrmFmt* pFmt = GetFrmFmt())
     {
-        SwXTableRows* pRows = SwIterator<SwXTableRows,SwFmt>::FirstElement(*pFmt);
+        SwXTableRows* pRows = SwIterator<SwXTableRows,SwFmt>(*pFmt).First();
         if (!pRows)
             pRows = new SwXTableRows(*pFmt);
         xRet = pRows;
@@ -2275,7 +2275,7 @@ uno::Reference< table::XTableColumns >  SwXTextTable::getColumns(void) throw( un
     uno::Reference< table::XTableColumns >  xRet;
     if (SwFrmFmt* pFmt = GetFrmFmt())
     {
-        SwXTableColumns* pCols = SwIterator<SwXTableColumns,SwFmt>::FirstElement(*pFmt);
+        SwXTableColumns* pCols = SwIterator<SwXTableColumns,SwFmt>(*pFmt).First();
         if (!pCols)
             pCols = new SwXTableColumns(*pFmt);
         xRet = pCols;
@@ -3184,7 +3184,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
                         break; // something else
                     }
                     SwDoc* pDoc = pFmt->GetDoc();
-                    SwFrm* pFrm = SwIterator<SwFrm,SwFmt>::FirstElement( *pFmt );
+                    SwFrm* pFrm = SwIterator<SwFrm,SwFmt>( *pFmt ).First();
                     // tables without layout (invisible header/footer?)
                     if (!pFrm)
                     {
@@ -3378,7 +3378,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
                 case FN_UNO_TABLE_BORDER2:
                 {
                     SwDoc* pDoc = pFmt->GetDoc();
-                    SwFrm* pFrm = SwIterator<SwFrm,SwFmt>::FirstElement( *pFmt );
+                    SwFrm* pFrm = SwIterator<SwFrm,SwFmt>( *pFmt ).First();
                     // tables without layout (invisible header/footer?)
                     if (!pFrm)
                     {