diff --git a/include/svl/brdcst.hxx b/include/svl/brdcst.hxx
index 646b270b0d42..8fd62b9cc27f 100644
--- a/include/svl/brdcst.hxx
+++ b/include/svl/brdcst.hxx
@@ -57,7 +57,7 @@ public:
     {
         return m_Listeners.size();
     }
-    SfxListener*            GetListener( sal_uInt16 nNo ) const
+    SfxListener*            GetListener( size_t nNo ) const
     {
         return m_Listeners[nNo];
     }
diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx
index a5cf00479284..4dfb92741602 100644
--- a/include/svx/svdviter.hxx
+++ b/include/svx/svdviter.hxx
@@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SdrViewIter
     const SdrObject*                                    mpObject;
     SdrView*                                            mpAktView;
 
-    sal_uInt32                                          mnListenerNum;
+    size_t                                              mnListenerNum;
     sal_uInt32                                          mnPageViewNum;
     sal_uInt32                                          mnOutDevNum;
 
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 84e970a96f8e..b7e39d18a8da 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1443,10 +1443,10 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
 {
     SdStyleSheetVector aResult;
 
-    sal_uInt16 nListenerCount = pSheet->GetListenerCount();
+    const size_t nListenerCount = pSheet->GetListenerCount();
     if (nListenerCount > 0)
     {
-        for (sal_uInt16 n = 0; n < nListenerCount; n++)
+        for (size_t n = 0; n < nListenerCount; ++n)
         {
             SdStyleSheet* pChild = dynamic_cast< SdStyleSheet* >( pSheet->GetListener(n) );
             if(pChild && pChild->GetParent() == pSheet->GetName())
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index f01d3aea25d8..a978de4870c4 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -329,10 +329,10 @@ bool SdStyleSheet::IsUsed() const
 {
     bool bResult = false;
 
-    sal_uInt16 nListenerCount = GetListenerCount();
+    const size_t nListenerCount = GetListenerCount();
     if (nListenerCount > 0)
     {
-        for (sal_uInt16 n = 0; n < nListenerCount; n++)
+        for (size_t n = 0; n < nListenerCount; ++n)
         {
             SfxListener* pListener = GetListener(n);
             if( pListener == this )
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 1d588b0b4f59..698ee8d60759 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -877,9 +877,9 @@ namespace sdr
 
                         if(pBC)
                         {
-                            sal_uInt16 nLstAnz(pBC->GetListenerCount());
+                            const size_t nLstAnz(pBC->GetListenerCount());
 
-                            for(sal_uInt16 nl(0); nl < nLstAnz; nl++)
+                            for(size_t nl=0; nl < nLstAnz; ++nl)
                             {
                                 SfxListener* pLst = pBC->GetListener(nl);
                                 SdrEdgeObj* pEdge = PTR_CAST(SdrEdgeObj, pLst);
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index 52c44a1b3383..2401504de7f7 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -141,11 +141,11 @@ SdrView* SdrViewIter::ImpFindView()
 {
     if(mpModel)
     {
-        sal_uInt32 nLsAnz(mpModel->GetListenerCount());
+        const size_t nLsAnz(mpModel->GetListenerCount());
 
         while(mnListenerNum < nLsAnz)
         {
-            SfxListener* pLs = mpModel->GetListener((sal_uInt16)mnListenerNum);
+            SfxListener* pLs = mpModel->GetListener(mnListenerNum);
             mpAktView = PTR_CAST(SdrView, pLs);
 
             if(mpAktView)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 5359ada1c32c..1316b2c5e894 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1034,9 +1034,9 @@ void SwXStyleFamily::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
 SwXStyle*   SwXStyleFamily::_FindStyle(const OUString& rStyleName)const
 {
-    sal_uInt16  nLCount = pBasePool->GetListenerCount();
+    const size_t nLCount = pBasePool->GetListenerCount();
     SfxListener* pListener = 0;
-    for( sal_uInt16 i = 0; i < nLCount; i++)
+    for( size_t i = 0; i < nLCount; ++i)
     {
         pListener = pBasePool->GetListener( i );
         SwXStyle* pTempStyle = dynamic_cast<SwXStyle*>( pListener );