From 47e2fd0dc8d88af120508e463decf5b15563a629 Mon Sep 17 00:00:00 2001
From: Matteo Casalin <matteo.casalin@yahoo.com>
Date: Sat, 16 Aug 2014 12:59:11 +0200
Subject: Consistently use size_t and SAL_MAX_SIZE

Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec
---
 basctl/source/accessibility/accessibledialogwindow.cxx | 6 +++---
 basctl/source/dlged/dlged.cxx                          | 4 ++--
 basctl/source/dlged/dlgedobj.cxx                       | 6 +++---
 basctl/source/dlged/dlgedpage.cxx                      | 2 +-
 basctl/source/inc/dlgedpage.hxx                        | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 280b8ed11d0c..7a21338da7ca 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -114,9 +114,9 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin
     if ( m_pDialogWindow )
     {
         SdrPage& rPage = m_pDialogWindow->GetPage();
-        sal_uLong nCount = rPage.GetObjCount();
+        const size_t nCount = rPage.GetObjCount();
 
-        for ( sal_uLong i = 0; i < nCount; ++i )
+        for ( size_t i = 0; i < nCount; ++i )
         {
             if (DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(rPage.GetObj(i)))
             {
@@ -328,7 +328,7 @@ void AccessibleDialogWindow::UpdateChildren()
     if ( m_pDialogWindow )
     {
         SdrPage& rPage = m_pDialogWindow->GetPage();
-        for ( sal_uLong i = 0, nCount = rPage.GetObjCount(); i < nCount; ++i )
+        for ( size_t i = 0, nCount = rPage.GetObjCount(); i < nCount; ++i )
             if (DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(rPage.GetObj(i)))
                 UpdateChild( ChildDescriptor( pDlgEdObj ) );
     }
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index c34a3b7e2602..41230f6439e8 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -540,9 +540,9 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
                 pDlgEdForm->StartListening();
 
                 // set position and size of controls
-                if (sal_uLong nObjCount = pDlgEdPage->GetObjCount())
+                if (const size_t nObjCount = pDlgEdPage->GetObjCount())
                 {
-                    for ( sal_uLong i = 0 ; i < nObjCount ; i++ )
+                    for ( size_t i = 0 ; i < nObjCount ; ++i )
                         if (DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pDlgEdPage->GetObj(i)))
                             if (!dynamic_cast<DlgEdForm*>(pDlgEdObj))
                                 pDlgEdObj->SetRectFromProps();
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index fab4e7ff06c9..c91c80029c11 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1400,12 +1400,12 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
 
 void DlgEdForm::UpdateStep()
 {
-    sal_uLong nObjCount;
     SdrPage* pSdrPage = GetPage();
 
-    if ( pSdrPage && ( ( nObjCount = pSdrPage->GetObjCount() ) > 0 ) )
+    if ( pSdrPage )
     {
-        for ( sal_uLong i = 0 ; i < nObjCount ; i++ )
+        const size_t nObjCount = pSdrPage->GetObjCount();
+        for ( size_t i = 0 ; i < nObjCount ; i++ )
         {
             DlgEdObj* pDlgEdObj = dynamic_cast<DlgEdObj*>(pSdrPage->GetObj(i));
             if (pDlgEdObj && !dynamic_cast<DlgEdForm*>(pDlgEdObj))
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index c170032928dd..86a792f7ee69 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -45,7 +45,7 @@ SdrPage* DlgEdPage::Clone() const
 }
 
 
-SdrObject* DlgEdPage::SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum)
+SdrObject* DlgEdPage::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum)
 {
     SdrObject* pObj = SdrPage::SetObjectOrdNum( nOldObjNum, nNewObjNum );
 
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index 13d3001c055d..b92760f68d7d 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -49,7 +49,7 @@ public:
     void            SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
     DlgEdForm*      GetDlgEdForm() const { return pDlgEdForm; }
 
-    virtual SdrObject* SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum) SAL_OVERRIDE;
+    virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) SAL_OVERRIDE;
 };
 
 } // namespace basctl
-- 
cgit