diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2018-09-08 19:15:25 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2018-09-09 21:07:57 +0200 |
| commit | 67e2acb013ebe0f716ee096f12ec63debcd1d814 (patch) | |
| tree | caf9f0b6f1aa9aa7cd7939559d724a99012c9d54 /sc | |
| parent | daf832451e49592096c1cc7926584d887000aca3 (diff) | |
Avoid getTokenCount()
Change-Id: I2fa4e9d36fa2707ba7fb6faa59fc8f4be906c04c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 2e5be7e5528b..08c7d1caa616 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -18,7 +18,6 @@ */ #include <scitems.hxx> -#include <comphelper/string.hxx> #include <editeng/eeitem.hxx> #include <rtl/tencinfo.h> @@ -350,24 +349,17 @@ void ScHTMLExport::WriteHeader() .WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tablerow ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tableheader ).WriteCharPtr( "," ) .WriteCharPtr( OOO_STRING_SVTOOLS_HTML_tabledata ).WriteCharPtr( "," ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_parabreak ) .WriteCharPtr( " { " ).WriteCharPtr( "font-family:" ); - sal_Int32 nFonts = comphelper::string::getTokenCount(aHTMLStyle.aFontFamilyName, ';'); - if ( nFonts == 1 ) + if (!aHTMLStyle.aFontFamilyName.isEmpty()) { - rStrm.WriteChar( '\"' ); - OUT_STR( aHTMLStyle.aFontFamilyName ); - rStrm.WriteChar( '\"' ); - } - else - { // Fontlist, VCL: Semicolon as separator - // CSS1: Comma as separator and every single font name quoted const OUString& rList = aHTMLStyle.aFontFamilyName; - for ( sal_Int32 j = 0, nPos = 0; j < nFonts; j++ ) + for(sal_Int32 nPos {0};;) { rStrm.WriteChar( '\"' ); OUT_STR( rList.getToken( 0, ';', nPos ) ); rStrm.WriteChar( '\"' ); - if ( j < nFonts-1 ) - rStrm.WriteCharPtr( ", " ); + if (nPos<0) + break; + rStrm.WriteCharPtr( ", " ); } } rStrm.WriteCharPtr( "; " ).WriteCharPtr( "font-size:" ) @@ -1104,26 +1096,22 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) { aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_face). append("=\""); - sal_Int32 nFonts = comphelper::string::getTokenCount(rFontItem.GetFamilyName(), ';'); - if ( nFonts == 1 ) + + if (!rFontItem.GetFamilyName().isEmpty()) { - OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( - rFontItem.GetFamilyName(), eDestEnc, &aNonConvertibleChars); - aStr.append(aTmpStr); - } - else - { // Font list, VCL: Semicolon as separator, HTML: Comma const OUString& rList = rFontItem.GetFamilyName(); - for ( sal_Int32 j = 0, nPos = 0; j < nFonts; j++ ) + for (sal_Int32 nPos {0};;) { OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( rList.getToken( 0, ';', nPos ), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); - if ( j < nFonts-1 ) - aStr.append(','); + if (nPos<0) + break; + aStr.append(','); } } + aStr.append('\"'); } if ( nSetFontSizeNumber ) |