diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 23:43:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-23 09:02:24 +0100 |
| commit | fee307d452753efbcb3d450e6a5dcd945ba41463 (patch) | |
| tree | 0ab62d23800a21951280546b5971d49b2d75f458 /sc | |
| parent | 17b8373171e52e6ce4c5ecf5074082f76cb36118 (diff) | |
deugly HTMLOutFuncs::ConvertStringToHTML
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 1aa0ce363681..84c734e7fd13 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1136,9 +1136,8 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) xub_StrLen nFonts = rFontItem.GetFamilyName().GetTokenCount( ';' ); if ( nFonts == 1 ) { - ByteString aTmpStr; - HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(), - aTmpStr, eDestEnc, &aNonConvertibleChars ); + rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + rFontItem.GetFamilyName(), eDestEnc, &aNonConvertibleChars); aStr.append(aTmpStr); } else @@ -1146,10 +1145,9 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) const String& rList = rFontItem.GetFamilyName(); for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ ) { - ByteString aTmpStr; - HTMLOutFuncs::ConvertStringToHTML( - rList.GetToken( 0, ';', nPos ), aTmpStr, eDestEnc, - &aNonConvertibleChars ); + rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML( + rList.GetToken( 0, ';', nPos ), eDestEnc, + &aNonConvertibleChars); aStr.append(aTmpStr); if ( j < nFonts-1 ) aStr.append(','); |