diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-05 10:41:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 15:31:40 +0000 |
| commit | 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 (patch) | |
| tree | db4badc477cea1ecd51f5fab82ce0f24ae20f155 /svtools/source/svrtf | |
| parent | 7accbd8c0d7f1d0b87748f0de599c4d8b469a61e (diff) | |
convert SvStream::operator>> methods to ReadXXX methods
First, I updated the clang rewriter to do the conversion.
Then I lightly hand-tweaked the output for the few places where
the rewriter messed up, mostly when dealing with calls on "this".
Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9
Reviewed-on: https://gerrit.libreoffice.org/7879
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svtools/source/svrtf')
| -rw-r--r-- | svtools/source/svrtf/parrtf.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/svrtf/svparser.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 4f8a94cb014d..62ddfeba6c68 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -542,7 +542,7 @@ SvParserState SvRTFParser::CallParser() { sal_Char cFirstCh; nNextChPos = rInput.Tell(); - rInput >> cFirstCh; nNextCh = cFirstCh; + rInput.ReadChar( cFirstCh ); nNextCh = cFirstCh; eState = SVPAR_WORKING; nOpenBrakets = 0; SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 5365a564f6d0..1286851169eb 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -148,13 +148,13 @@ sal_Unicode SvParser::GetNextChar() unsigned char c1, c2; sal_Bool bSeekBack = sal_True; - rInput >> c1; + rInput.ReadUChar( c1 ); bErr = rInput.IsEof() || rInput.GetError(); if( !bErr ) { if( 0xff == c1 || 0xfe == c1 ) { - rInput >> c2; + rInput.ReadUChar( c2 ); bErr = rInput.IsEof() || rInput.GetError(); if( !bErr ) { @@ -186,12 +186,12 @@ sal_Unicode SvParser::GetNextChar() sal_Unicode cUC = USHRT_MAX; unsigned char c1, c2; - rInput >> c1 >> c2; + rInput.ReadUChar( c1 ).ReadUChar( c2 ); if( 2 == rInput.Tell() && !(rInput.IsEof() || rInput.GetError()) && ( (bUCS2BSrcEnc && 0xfe == c1 && 0xff == c2) || (!bUCS2BSrcEnc && 0xff == c1 && 0xfe == c2) ) ) - rInput >> c1 >> c2; + rInput.ReadUChar( c1 ).ReadUChar( c2 ); bErr = rInput.IsEof() || rInput.GetError(); if( !bErr ) @@ -213,7 +213,7 @@ sal_Unicode SvParser::GetNextChar() do { sal_Char c1; // signed, that's the text converter expects - rInput >> c1; + rInput.ReadChar( c1 ); bErr = rInput.IsEof() || rInput.GetError(); if( !bErr ) { @@ -249,7 +249,7 @@ sal_Unicode SvParser::GetNextChar() { while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) != 0 ) { - rInput >> c1; + rInput.ReadChar( c1 ); bErr = rInput.IsEof() || rInput.GetError(); if( bErr ) break; @@ -291,7 +291,7 @@ sal_Unicode SvParser::GetNextChar() while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) != 0 && nLen < 10 ) { - rInput >> c1; + rInput.ReadChar( c1 ); bErr = rInput.IsEof() || rInput.GetError(); if( bErr ) break; |