diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-06-08 23:58:08 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-06-20 12:20:35 +0200 |
| commit | f26097c08677e64768ea2fbed679eef94768b15c (patch) | |
| tree | 0eb50900fb8d0a2fffe0a01e19a0ab49a365fab6 /sw | |
| parent | 0c5e51bb8c4406d5deb15f22eb7a5271c8f7846d (diff) | |
Use auto/more proper integer types
Change-Id: I230075d3ba955b6480d057953269d15c16c7235c
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index ad50a1440578..12ef0309b80c 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -262,7 +262,8 @@ sal_uLong SwHTMLWriter::WriteStream() // die HTML-Vorlage holen bool bOldHTMLMode = false; - sal_uInt16 nOldTextFormatCollCnt = 0, nOldCharFormatCnt = 0; + SwTextFormatColls::size_type nOldTextFormatCollCnt = 0; + SwCharFormats::size_type nOldCharFormatCnt = 0; OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" ); pTemplate = static_cast<HTMLReader*>(ReadHTML)->GetTemplateDoc(); @@ -437,7 +438,6 @@ sal_uLong SwHTMLWriter::WriteStream() } // loesche die Tabelle mit den freifliegenden Rahmen - sal_uInt16 i; OSL_ENSURE( !pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" ); if( pHTMLPosFlyFrms ) { @@ -484,7 +484,7 @@ sal_uLong SwHTMLWriter::WriteStream() ClearNextNumInfo(); - for( i=0; i<MAXLEVEL; i++ ) + for( int i=0; i<MAXLEVEL; ++i ) aBulletGrfs[i].clear(); aNonConvertableCharacters.clear(); @@ -496,13 +496,13 @@ sal_uLong SwHTMLWriter::WriteStream() { // Waehrend des Exports angelegte Zeichen- und Abastzvorlagen // loeschen - sal_uInt16 nTextFormatCollCnt = pTemplate->GetTextFormatColls()->size(); + auto nTextFormatCollCnt = pTemplate->GetTextFormatColls()->size(); while( nTextFormatCollCnt > nOldTextFormatCollCnt ) pTemplate->DelTextFormatColl( --nTextFormatCollCnt ); OSL_ENSURE( pTemplate->GetTextFormatColls()->size() == nOldTextFormatCollCnt, "falsche Anzahl TextFormatColls geloescht" ); - sal_uInt16 nCharFormatCnt = pTemplate->GetCharFormats()->size(); + auto nCharFormatCnt = pTemplate->GetCharFormats()->size(); while( nCharFormatCnt > nOldCharFormatCnt ) pTemplate->DelCharFormat( --nCharFormatCnt ); OSL_ENSURE( pTemplate->GetCharFormats()->size() == nOldCharFormatCnt, |