diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-12-31 00:41:54 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-01-03 15:25:20 +0100 |
| commit | 63cb016bc31a2d51d445b335454b9de99c77e413 (patch) | |
| tree | 9ec87c46d71589473642d832588dc6079e84490a | |
| parent | 351dee6b5343a910ee6fb6372bd0b2d9435517bd (diff) | |
sal_uInt16 to more proper types
Change-Id: I0e226787206e0429149fccc99677529d52d7825a
| -rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/parcss1.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 8e73371dc1ff..f6890bf16471 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/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] ]; diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index b901b5fb2ccd..637362dfc17a 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/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() ) { |