diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-06 18:11:43 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-07 03:46:21 +0100 |
| commit | cc59e69c6f2c95a4434623dfea9ab666de6ebe76 (patch) | |
| tree | af2d28a7c336db5583c4d6a54e120c6608939305 /sc/source/filter/html | |
| parent | 128947050b4506bf1fd57d93fe249c476a184f61 (diff) | |
String->OUString in ScDocument and follow up
Diffstat (limited to 'sc/source/filter/html')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 84c734e7fd13..8510edf1fd32 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1174,7 +1174,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) TAG_ON(aStr.makeStringAndClear().getStr()); } - String aStrOut; + rtl::OUString aStrOut; sal_Bool bFieldText = false; if ( pCell ) { // cell content @@ -1195,13 +1195,14 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) } if ( !bFieldText ) { - if ( !aStrOut.Len() ) + if ( aStrOut.isEmpty() ) { TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // keine komplett leere Zelle } else { - xub_StrLen nPos = aStrOut.Search( _LF ); + String aStr = aStrOut; + xub_StrLen nPos = aStr.Search( _LF ); if ( nPos == STRING_NOTFOUND ) { OUT_STR( aStrOut ); @@ -1211,13 +1212,13 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) xub_StrLen nStartPos = 0; do { - String aSingleLine( aStrOut, nStartPos, nPos - nStartPos ); + String aSingleLine( aStr, nStartPos, nPos - nStartPos ); OUT_STR( aSingleLine ); TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); nStartPos = nPos + 1; } - while( ( nPos = aStrOut.Search( _LF, nStartPos ) ) != STRING_NOTFOUND ); - String aSingleLine( aStrOut, nStartPos, aStrOut.Len() - nStartPos ); + while( ( nPos = aStr.Search( _LF, nStartPos ) ) != STRING_NOTFOUND ); + String aSingleLine( aStr, nStartPos, aStr.Len() - nStartPos ); OUT_STR( aSingleLine ); } } |