sal_uInt16 to more proper types

Change-Id: I0e226787206e0429149fccc99677529d52d7825a

sw/source/filter/html/htmlplug.cxx

@@ -1183,7 +1183,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
         rHTMLWrt.IncIndentLevel(); // Inhalt von Applet einruecken
 
-        sal_uInt16 ii = aParams.size();
+        size_t ii = aParams.size();
         while( ii > 0  )
         {
             const SvCommand& rCommand = aCommands[ aParams[--ii] ];

sw/source/filter/html/parcss1.cxx

@@ -177,7 +177,7 @@ CSS1Token CSS1Parser::GetNextToken()
                     if( CSS1_NULL==nRet )
                     {
                         aToken.clear();
-                        sal_uInt16 nBlockLvl = 0;
+                        int nBlockLvl = 0;
                         sal_Unicode cQuoteCh = 0;
                         bool bDone = false, bEscape = false;
                         while( !bDone && !IsEOF() )
@@ -620,7 +620,7 @@ CSS1Token CSS1Parser::GetNextToken()
                       (('r'==aToken[0] || 'R'==aToken[0]) &&
                        aToken.equalsIgnoreAsciiCase( "rgb" )) ) )
                 {
-                    sal_uInt16 nNestCnt = 0;
+                    int nNestCnt = 0;
                     OUStringBuffer sTmpBuffer2( 64L );
                     do {
                         sTmpBuffer2.append( cNextCh );
@@ -1279,7 +1279,7 @@ bool CSS1Expression::GetColor( Color &rColor ) const
             OUString aColorStr(aValue.copy(4, aValue.getLength() - 5));
 
             sal_Int32 nPos = 0;
-            sal_uInt16 nCol = 0;
+            int nCol = 0;
 
             while( nCol < 3 && nPos < aColorStr.getLength() )
             {