diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-16 12:40:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-22 22:00:39 +0000 |
| commit | d803483f6a5938b0d0708b8db74b30c511dd8e31 (patch) | |
| tree | 6f75da8815e03744e6ff94f3502a93c896e07bf0 /svtools/source/svrtf/rtfout.cxx | |
| parent | dd34ecba1048549d122a759cd5c7f743f5899d73 (diff) | |
convert more SvStream::operator<< calls
.. to more explicit SvStream::Write* calls
This was done using another run of the clang rewriter, and then
a lot of hand tweaking to fix all the places where the rewriter
did not play nice with various macros.
Change-Id: I7bcab93851c8dfb59cde6bc76290c6484d88fb18
Reviewed-on: https://gerrit.libreoffice.org/7494
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svtools/source/svrtf/rtfout.cxx')
| -rw-r--r-- | svtools/source/svrtf/rtfout.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 682e99c72d1e..12839ed064cf 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -36,13 +36,13 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, // written break; case 0xA0: - rStream << "\\~"; + rStream.WriteCharPtr( "\\~" ); break; case 0xAD: - rStream << "\\-"; + rStream.WriteCharPtr( "\\-" ); break; case 0x2011: - rStream << "\\_"; + rStream.WriteCharPtr( "\\_" ); break; case '\n': pStr = OOO_STRING_SVTOOLS_RTF_LINE; @@ -87,11 +87,11 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, case '\\': case '}': case '{': - rStream << '\\' << (sal_Char)c; + rStream.WriteChar( '\\' ).WriteChar( (sal_Char)c ); break; default: if (c >= ' ' && c <= '~') - rStream << (sal_Char)c; + rStream.WriteChar( (sal_Char)c ); else { //If we can't convert to the dest encoding, or if @@ -121,18 +121,18 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, { // #i47831# add an additional whitespace, so that // "document whitespaces" are not ignored.; - rStream << "\\uc" - << OString::number(nLen).getStr() << " "; + rStream.WriteCharPtr( "\\uc" ) + .WriteCharPtr( OString::number(nLen).getStr() ).WriteCharPtr( " " ); *pUCMode = nLen; } - rStream << "\\u" - << OString::number( - static_cast<sal_Int32>(c)).getStr(); + rStream.WriteCharPtr( "\\u" ) + .WriteCharPtr( OString::number( + static_cast<sal_Int32>(c)).getStr() ); } for (sal_Int32 nI = 0; nI < nLen; ++nI) { - rStream << "\\'"; + rStream.WriteCharPtr( "\\'" ); Out_Hex(rStream, sConverted[nI], 2); } } @@ -142,7 +142,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, } if (pStr) - rStream << pStr << ' '; + rStream.WriteCharPtr( pStr ).WriteChar( ' ' ); return rStream; } @@ -154,7 +154,7 @@ SvStream& RTFOutFuncs::Out_String( SvStream& rStream, const OUString& rStr, for (sal_Int32 n = 0; n < rStr.getLength(); ++n) Out_Char(rStream, rStr[n], &nUCMode, eDestEnc, bWriteHelpFile); if (nUCMode != 1) - rStream << "\\uc1"<< " "; // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.; + rStream.WriteCharPtr( "\\uc1" ).WriteCharPtr( " " ); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.; return rStream; } @@ -175,7 +175,7 @@ SvStream& RTFOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLe *pStr += 39; nHex >>= 4; } - return rStream << pStr; + return rStream.WriteCharPtr( pStr ); } |