3 files changed, 6 insertions, 6 deletions
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 );