Consistently use size_t and SAL_MAX_SIZE

Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec

14 files changed, 48 insertions, 48 deletions

diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index 5881dd938a26..5de97850654b 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -38,7 +38,7 @@ public:
     // #i3694#
     // This GetOffset() method is not needed anymore, it even leads to errors.
     // virtual Point GetOffset() const;
-    virtual SdrObject* ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum ) SAL_OVERRIDE;
+    virtual SdrObject* ReplaceObject( SdrObject* pNewObj, size_t nObjNum ) SAL_OVERRIDE;
 
     virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV,
                                     const Rectangle *pRect) const SAL_OVERRIDE;
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index e12af858a32a..0665f492d080 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -318,14 +318,14 @@ void SwUiWriterTest::testShapeTextboxDelete()
     SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
     SdrObject* pObject = pPage->GetObj(0);
     pWrtShell->SelectObj(Point(), 0, pObject);
-    sal_Int32 nActual = pPage->GetObjCount();
+    size_t nActual = pPage->GetObjCount();
     // Two objects on the draw page: the shape and its textbox.
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(2), nActual);
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), nActual);
 
     pWrtShell->DelSelectedObj();
     nActual = pPage->GetObjCount();
     // Both (not only the shape) should be removed by now (the textbox wasn't removed, so this was 1).
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nActual);
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), nActual);
 }
 
 void SwUiWriterTest::testCp1000071()
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 767fec89f256..178e31d28e1a 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -333,7 +333,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
                         GetIDocumentUndoRedo().AppendUndo(pUndo);
                     }
 
-                    for ( sal_uInt16 i2 = 0; i2 < pLst->GetObjCount(); ++i2 )
+                    for ( size_t i2 = 0; i2 < pLst->GetObjCount(); ++i2 )
                     {
                         SdrObject* pSubObj = pLst->GetObj( i2 );
                         SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm,
@@ -345,7 +345,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
                         pFmtsAndObjs[i].push_back( std::pair< SwDrawFrmFmt*, SdrObject* >( pFmt, pSubObj ) );
 
                         if( bUndo )
-                            pUndo->AddObj( i2, pFmt );
+                            pUndo->AddObj( static_cast<sal_uInt16>(i2), pFmt );
                     }
                 }
             }
diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx
index cd57a487a10a..f3041cfb5cb7 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -140,8 +140,8 @@ void lcl_dumpSdrModel(WriterHelper& writer, const SdrModel* pModel)
         writer.writeFormatAttribute("ptr", "%p", pPage);
         if (pPage)
         {
-            sal_Int32 nObjCount = pPage->GetObjCount();
-            for (sal_Int32 i = 0; i < nObjCount; ++i)
+            const size_t nObjCount = pPage->GetObjCount();
+            for (size_t i = 0; i < nObjCount; ++i)
             {
                 const SdrObject* pObject = pPage->GetObj(i);
                 writer.startElement("sdrObject");
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index cfb59bcbd217..2533d89d6aa0 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -311,7 +311,7 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
                 static_cast<SdrObjGroup*>(_pDrawObj)->GetSubList();
         if ( pLst )
         {
-            for ( sal_uInt16 i = 0; i < pLst->GetObjCount(); ++i )
+            for ( size_t i = 0; i < pLst->GetObjCount(); ++i )
             {
                 _MoveObjToLayer( _bToVisible, pLst->GetObj( i ) );
             }
@@ -564,7 +564,7 @@ bool CheckControlLayer( const SdrObject *pObj )
     if ( pObj->ISA( SdrObjGroup ) )
     {
         const SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
-        for ( sal_uInt16 i = 0; i < pLst->GetObjCount(); ++i )
+        for ( size_t i = 0; i < pLst->GetObjCount(); ++i )
         {
             if ( ::CheckControlLayer( pLst->GetObj( i ) ) )
             {
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 6653cbe4542a..1033a3189a8c 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -61,7 +61,7 @@ SwDPage::~SwDPage()
     delete pGridLst;
 }
 
-SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum )
+SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, size_t nObjNum )
 {
     SdrObject *pOld = GetObj( nObjNum );
     OSL_ENSURE( pOld, "Oups, Object not replaced" );
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index b8f834b89f7d..5890121d420c 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -257,7 +257,7 @@ SdrObject* SwDrawView::GetMaxToTopObj( SdrObject* pObj ) const
                 const SwPageFrm *pPage = pFly->FindPageFrm();
                 if ( pPage->GetSortedObjs() )
                 {
-                    sal_uInt32 nOrdNum = 0;
+                    size_t nOrdNum = 0;
                     for ( sal_uInt16 i = 0; i < pPage->GetSortedObjs()->Count(); ++i )
                     {
                         const SdrObject *pO =
@@ -317,8 +317,8 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
     OSL_ENSURE( pDrawPage,
             "<SwDrawView::_GetMaxChildOrdNum(..) - missing drawing page at parent object - crash!" );
 
-    sal_uInt32 nObjCount = pDrawPage->GetObjCount();
-    for ( sal_uInt32 i = nObjCount-1; i > _rParentObj.GetDrawObj()->GetOrdNum() ; --i )
+    const size_t nObjCount = pDrawPage->GetObjCount();
+    for ( size_t i = nObjCount-1; i > _rParentObj.GetDrawObj()->GetOrdNum() ; --i )
     {
         const SdrObject* pObj = pDrawPage->GetObj( i );
 
@@ -358,7 +358,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
         SdrPage* pDrawPage = GetModel()->GetPage( 0 );
 
         // move 'repeated' ones to the same order number as the already moved one.
-        sal_uInt32 nNewPos = _rMovedAnchoredObj.GetDrawObj()->GetOrdNum();
+        const size_t nNewPos = _rMovedAnchoredObj.GetDrawObj()->GetOrdNum();
         while ( !aAnchoredObjs.empty() )
         {
             SwAnchoredObject* pAnchoredObj = aAnchoredObjs.back();
@@ -395,7 +395,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
                 pContact->GetAnchoredObjs( aAnchoredObjs );
             }
             // move 'repeated' ones to the same order number as the already moved one.
-            const sal_uInt32 nTmpNewPos = pChildObj->GetOrdNum();
+            const size_t nTmpNewPos = pChildObj->GetOrdNum();
             while ( !aAnchoredObjs.empty() )
             {
                 SwAnchoredObject* pAnchoredObj = aAnchoredObjs.back();
@@ -437,7 +437,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
     SdrPage* pDrawPage = GetModel()->GetPage( 0 );
     if ( pDrawPage->IsObjOrdNumsDirty() )
         pDrawPage->RecalcObjOrdNums();
-    const sal_uInt32 nObjCount = pDrawPage->GetObjCount();
+    const size_t nObjCount = pDrawPage->GetObjCount();
 
     SwAnchoredObject* pMovedAnchoredObj =
                                 ::GetUserCall( pObj )->GetAnchoredObj( pObj );
@@ -451,7 +451,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
     {
         if ( bMovedForward )
         {
-            sal_uInt32 nMaxChildOrdNumWithoutMoved =
+            const size_t nMaxChildOrdNumWithoutMoved =
                     _GetMaxChildOrdNum( *pParentAnchoredObj, pMovedAnchoredObj->GetDrawObj() );
             if ( nNewPos > nMaxChildOrdNumWithoutMoved+1 )
             {
@@ -462,7 +462,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
         }
         else
         {
-            const sal_uInt32 nParentOrdNum = pParentAnchoredObj->GetDrawObj()->GetOrdNum();
+            const size_t nParentOrdNum = pParentAnchoredObj->GetDrawObj()->GetOrdNum();
             if ( nNewPos < nParentOrdNum )
             {
                 // set position to the bottom of the 'child' object group
@@ -482,7 +482,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
                 pDrawPage->GetObj( bMovedForward ? nNewPos - 1 : nNewPos + 1 );
         if ( pTmpObj )
         {
-            sal_uInt32 nTmpNewPos( nNewPos );
+            size_t nTmpNewPos( nNewPos );
             if ( bMovedForward )
             {
                 // move before the top 'repeated' object
@@ -519,7 +519,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
         {
             // determine position before the object before its top 'child' object
             const SdrObject* pTmpObj = pDrawPage->GetObj( nMaxChildOrdNum );
-            sal_uInt32 nTmpNewPos = ::GetUserCall( pTmpObj )->GetMaxOrdNum() + 1;
+            size_t nTmpNewPos = ::GetUserCall( pTmpObj )->GetMaxOrdNum() + 1;
             if ( nTmpNewPos >= nObjCount )
             {
                 --nTmpNewPos;
@@ -538,7 +538,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
     if ( ( bMovedForward && nNewPos < nObjCount - 1 ) ||
          ( !bMovedForward && nNewPos > 0 ) )
     {
-        sal_uInt32 nTmpNewPos( nNewPos );
+        size_t nTmpNewPos( nNewPos );
         const SwFrmFmt* pParentFrmFmt =
                 pParentAnchoredObj ? &(pParentAnchoredObj->GetFrmFmt()) : 0L;
         const SdrObject* pTmpObj = pDrawPage->GetObj( nNewPos + 1 );
@@ -590,7 +590,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
         rImp.AddAccessibleFrm( pFlyFrm );
 
         const sal_uInt32 nChildNewPos = bMovedForward ? nNewPos : nNewPos+1;
-        sal_uInt32 i = bMovedForward ? nOldPos : nObjCount-1;
+        size_t i = bMovedForward ? nOldPos : nObjCount-1;
         do
         {
             SdrObject* pTmpObj = pDrawPage->GetObj( i );
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 09473b94c11d..49dd779dd40e 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1149,7 +1149,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
             if ( bRet )
             {
                 const SdrPage* pPage = pIDDMA->GetDrawModel()->GetPage(0);
-                for(sal_uInt32 a(pObj->GetOrdNum() + 1); bRet && a < pPage->GetObjCount(); a++)
+                for(size_t a = pObj->GetOrdNum()+1; bRet && a < pPage->GetObjCount(); ++a)
                 {
                     SdrObject *pCandidate = pPage->GetObj(a);
 
@@ -1181,7 +1181,7 @@ static bool lcl_IsControlGroup( const SdrObject *pObj )
     {
         bRet = true;
         const SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
-        for ( sal_uInt16 i = 0; i < pLst->GetObjCount(); ++i )
+        for ( size_t i = 0; i < pLst->GetObjCount(); ++i )
             if( !::lcl_IsControlGroup( pLst->GetObj( i ) ) )
                 return false;
     }
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index b744ec834a22..987594488998 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -374,7 +374,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact )
     SdrPage* pPg( 0L );
     if ( 0 != ( pPg = pContact->GetMaster()->GetPage() ) )
     {
-        const sal_uInt32 nOrdNum = pContact->GetMaster()->GetOrdNum();
+        const size_t nOrdNum = pContact->GetMaster()->GetOrdNum();
         pPg->ReplaceObject( pDrawObj, nOrdNum );
     }
     // #i27030# - insert new <SwVirtFlyDrawObj> instance
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index efb1fc9078f9..6ca48a712c46 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -609,7 +609,7 @@ SwRootFrm::~SwRootFrm()
 void SwRootFrm::RemoveMasterObjs( SdrPage *pPg )
 {
     // Remove all master objects from the Page. But don't delete!
-    for( sal_uLong i = pPg ? pPg->GetObjCount() : 0; i; )
+    for( size_t i = pPg ? pPg->GetObjCount() : 0; i; )
     {
         SdrObject* pObj = pPg->GetObj( --i );
         if( pObj->ISA(SwFlyDrawObj ) )
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index e8a8bdb89726..872537f00d16 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -207,8 +207,8 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
 
     OSL_ENSURE( pSh->getIDocumentDrawModelAccess()->GetDrawModel(), "NotifySizeChg without DrawModel" );
     SdrPage* pPage = pSh->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 );
-    const sal_uLong nObjs = pPage->GetObjCount();
-    for( sal_uLong nObj = 0; nObj < nObjs; ++nObj )
+    const size_t nObjs = pPage->GetObjCount();
+    for( size_t nObj = 0; nObj < nObjs; ++nObj )
     {
         SdrObject *pObj = pPage->GetObj( nObj );
         if( !pObj->ISA(SwVirtFlyDrawObj) )
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 9a470507b28c..4a0141450a96 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2748,7 +2748,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
         // Objekt ist Bestandteil einer Gruppe?
         SdrObject* pGroupObject = pSdrTextObj->GetUpGroup();
 
-        sal_uInt32 nOrdNum = pSdrTextObj->GetOrdNum();
+        const size_t nOrdNum = pSdrTextObj->GetOrdNum();
         bool bEraseThisObject;
         InsertTxbxText( pSdrTextObj, &aObjSize, pRecord->aTextId.nTxBxS,
             pRecord->aTextId.nSequence, nGrafAnchorCp, pRetFrmFmt,
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index f5eb9aa1895d..81a1c1bc910c 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -688,9 +688,9 @@ bool SwView::HasDrwObj(SdrObject *pSdrObj) const
     if (pSdrObj->IsGroupObject())
     {
         SdrObjList* pList = pSdrObj->GetSubList();
-        sal_uInt32 nCnt = pList->GetObjCount();
+        const size_t nCnt = pList->GetObjCount();
 
-        for (sal_uInt32 i = 0; i < nCnt; i++)
+        for (size_t i = 0; i < nCnt; ++i)
             if ((bRet = HasDrwObj(pList->GetObj(i))))
                 break;
     }
@@ -707,9 +707,9 @@ bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
     if (pSdrObj->IsGroupObject())
     {
         SdrObjList* pList = pSdrObj->GetSubList();
-        sal_uInt32 nCnt = pList->GetObjCount();
+        const size_t nCnt = pList->GetObjCount();
 
-        for (sal_uInt32 i = 0; i < nCnt; i++)
+        for (size_t i = 0; i < nCnt; ++i)
             if ((bRet = HasOnlyObj(pList->GetObj(i), eObjInventor)) == false)
                 break;
     }
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 70e6e2246b43..eb2889cc7a8c 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -419,8 +419,8 @@ void SwContentType::Init(bool* pbInvalidateWindow)
             if(pModel)
             {
                 SdrPage* pPage = pModel->GetPage(0);
-                sal_uInt32 nCount = pPage->GetObjCount();
-                for( sal_uInt32 i=0; i< nCount; i++ )
+                const size_t nCount = pPage->GetObjCount();
+                for( size_t i=0; i<nCount; ++i )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
                     // #i51726# - all drawing objects can be named now
@@ -747,8 +747,8 @@ void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
             if(pModel)
             {
                 SdrPage* pPage = pModel->GetPage(0);
-                sal_uInt32 nCount = pPage->GetObjCount();
-                for( sal_uInt32 i=0; i< nCount; i++ )
+                const size_t nCount = pPage->GetObjCount();
+                for( size_t i=0; i<nCount; ++i )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
                     // #i51726# - all drawing objects can be named now
@@ -873,8 +873,8 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
                 {
                     SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                     SdrPage* pPage = pDrawModel->GetPage(0);
-                    const sal_uInt32 nCount = pPage->GetObjCount();
-                    for( sal_uInt32 i=0; i< nCount; i++ )
+                    const size_t nCount = pPage->GetObjCount();
+                    for( size_t i=0; i<nCount; ++i )
                     {
                         pTemp = pPage->GetObj(i);
                         sal_uInt16 nCmpId;
@@ -965,8 +965,8 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
                 {
                     SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                     SdrPage* pPage = pDrawModel->GetPage(0);
-                    sal_uInt32 nCount = pPage->GetObjCount();
-                    for( sal_uInt32 i=0; i< nCount; i++ )
+                    const size_t nCount = pPage->GetObjCount();
+                    for( size_t i=0; i<nCount; ++i )
                     {
                         pTemp = pPage->GetObj(i);
                         sal_uInt16 nCmpId;
@@ -1407,9 +1407,9 @@ SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
             {
                 SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                 SdrPage* pPage = pDrawModel->GetPage(0);
-                sal_uInt32 nCount = pPage->GetObjCount();
+                const size_t nCount = pPage->GetObjCount();
 
-                for( sal_uInt32 i=0; i< nCount; i++ )
+                for( size_t i=0; i<nCount; ++i )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
                     if( pTemp->GetName() == pCnt->GetName())
@@ -2669,7 +2669,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
 
                             SwDrawModel* pDrawModel = pActiveShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
                             SdrPage* pPage = pDrawModel->GetPage(0);
-                            sal_uInt32 nCount = pPage->GetObjCount();
+                            const size_t nCount = pPage->GetObjCount();
                             bool hasObjectMarked = false;
 
                             SdrObject* pObject = NULL;
@@ -2684,7 +2684,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
 
                                 }
                             }
-                            for( sal_uInt32 i=0; i< nCount; i++ )
+                            for( size_t i=0; i<nCount; ++i )
                             {
                                 SdrObject* pTemp = pPage->GetObj(i);
                                 bool bMark = pDrawView->IsObjMarked(pTemp);
@@ -3343,8 +3343,8 @@ void SwContentTree::GotoContent(SwContent* pCnt)
                 pDrawView->UnmarkAll();
                 SwDrawModel* _pModel = pActiveShell->getIDocumentDrawModelAccess()->GetDrawModel();
                 SdrPage* pPage = _pModel->GetPage(0);
-                sal_uInt32 nCount = pPage->GetObjCount();
-                for( sal_uInt32 i=0; i< nCount; i++ )
+                const size_t nCount = pPage->GetObjCount();
+                for( size_t i=0; i<nCount; ++i )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
                     // #i51726# - all drawing objects can be named now