3 files changed, 10 insertions, 8 deletions
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 82153a3a0275..bcf20610d1ad 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -215,7 +215,7 @@ void SvxXConnectionPreview::Paint( const Rectangle& )
         // New stuff: Use a ObjectContactOfObjListPainter.
         sdr::contact::SdrObjectVector aObjectVector;
 
-        for(sal_uInt32 a(0L); a < pObjList->GetObjCount(); a++)
+        for(size_t a = 0; a < pObjList->GetObjCount(); ++a)
         {
             SdrObject* pObject = pObjList->GetObj(a);
             DBG_ASSERT(pObject,
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 0c1df56fca24..d1765f6ee936 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -101,7 +101,7 @@ const PolyPolygon& ContourWindow::GetPolyPolygon()
 
         if ( pPage && pPage->GetObjCount() )
         {
-            SdrPathObj* pPathObj = (SdrPathObj*)pPage->GetObj(0L);
+            SdrPathObj* pPathObj = (SdrPathObj*)pPage->GetObj(0);
             // Not sure if subdivision is needed for ContourWindow, but maybe it cannot handle
             // curves at all. Keeping subdivision here for security
             const basegfx::B2DPolyPolygon aB2DPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(pPathObj->GetPathPoly()));
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 6156dee9a7e8..36af678166ff 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -151,12 +151,15 @@ const ImageMap& IMapWindow::GetImageMap()
 
         if ( pPage )
         {
-            const long nCount = pPage->GetObjCount();
+            const size_t nCount = pPage->GetObjCount();
 
             aIMap.ClearImageMap();
 
-            for ( long i = nCount - 1; i > -1; i-- )
+            for ( size_t i = nCount; i; )
+            {
+                --i;
                 aIMap.InsertIMapObject( *( ( (IMapUserData*) pPage->GetObj( i )->GetUserData( 0 ) )->GetObject() ) );
+            }
         }
 
         pModel->SetChanged( false );
@@ -426,12 +429,11 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const
     if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) )
     {
         SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
-        sal_uIntPtr  nCount;
-
-        if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) )
+        if ( pPage )
         {
-            for ( long i = nCount - 1; i >= 0; i-- )
+            for ( size_t i = pPage->GetObjCount(); i > 0; )
             {
+                --i;
                 SdrObject*  pTestObj = pPage->GetObj( i );
                 IMapObject* pIMapObj = GetIMapObj( pTestObj );