Use more proper integer types

Change-Id: I8200af6fcb111edd8a00cb77824e84e2231bee1b

sw/source/filter/basflt/fltini.cxx

@@ -164,7 +164,7 @@ Reader* GetReader( ReaderWriterEnum eReader )
 
 void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& xRet )
 {
-    for( sal_uInt16 n = 0; n < MAXFILTER; ++n )
+    for( int n = 0; n < MAXFILTER; ++n )
         if ( aFilterDetect[n].IsFilter( rFltName ) )
         {
             aReaderWriter[n].GetWriter( rFltName, rBaseURL, xRet );
@@ -175,7 +175,7 @@ void GetWriter( const OUString& rFltName, const OUString& rBaseURL, WriterRef& x
 SwRead GetReader( const OUString& rFltName )
 {
     SwRead pRead = 0;
-    for( sal_uInt16 n = 0; n < MAXFILTER; ++n )
+    for( int n = 0; n < MAXFILTER; ++n )
     {
         if ( aFilterDetect[n].IsFilter( rFltName ) )
         {
@@ -573,7 +573,7 @@ OUString NameFromCharSet(rtl_TextEncoding nChrSet)
 void SwAsciiOptions::ReadUserData( const OUString& rStr )
 {
     sal_Int32 nToken = 0;
-    sal_uInt16 nCnt = 0;
+    int nCnt = 0;
     do {
         const OUString sToken = rStr.getToken( 0, ',', nToken );
         if (!sToken.isEmpty())

sw/source/filter/basflt/shellio.cxx

@@ -220,7 +220,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
                                    rNd.FindFooterStartNode();
 
             // search all new Fly's, and store them as individual Undo Objects
-            for( sal_uInt16 n = 0; n < pDoc->GetSpzFrmFmts()->size(); ++n )
+            for( SwFrmFmts::size_type n = 0; n < pDoc->GetSpzFrmFmts()->size(); ++n )
             {
                 SwFrmFmt* pFrmFmt = (*pDoc->GetSpzFrmFmts())[ n ];
                 const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
@@ -628,7 +628,7 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
     sal_uInt16 const s_ids[3] = {
         RES_POOLFRM_FRAME, RES_POOLFRM_GRAPHIC, RES_POOLFRM_OLE
     };
-    for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(s_ids); ++i)
+    for (size_t i = 0; i < SAL_N_ELEMENTS(s_ids); ++i)
     {
         SwFrmFmt *const pFrmFmt = rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( s_ids[i] );