diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-07-15 14:35:50 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-07-17 21:47:38 +0200 |
| commit | 9af8964dd2cb048e328732ee6eb809b0da46a3ae (patch) | |
| tree | 1f863b2e15beb4808cfb9c2aa6aeb0e651854cfb /svtools/source/svrtf | |
| parent | 2cbd4121685b5c2f2cfddea6775171aaee72a4c1 (diff) | |
RTL_UNICODETOTEXT_INFO_{DEST|SCR}BUFFERTOSMALL should use TOO, not TO
I have kept the old mispelled constant for backwards compatibility
Change-Id: I128a2eec76d00cc5ef058cd6a0c35a7474d2411e
Reviewed-on: https://gerrit.libreoffice.org/39995
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'svtools/source/svrtf')
| -rw-r--r-- | svtools/source/svrtf/svparser.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 947ef75a98f3..9c14b421382e 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -304,14 +304,14 @@ sal_uInt32 SvParser<T>::GetNextChar() RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR| RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR, &nInfo, &nCvtBytes); - if( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) != 0 ) + if( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0 ) { // The conversion wasn't successful because we haven't // read enough characters. if( pImplData->hContext != reinterpret_cast<rtl_TextToUnicodeContext>(1) ) { sal_Unicode sCh[2]; - while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) != 0 ) + while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0 ) { rInput.ReadChar( c1 ); bErr = rInput.IsEof() || rInput.GetError(); @@ -338,9 +338,9 @@ sal_uInt32 SvParser<T>::GetNextChar() } else if( 0 != nChars || 0 != nInfo ) { - DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, + DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) == 0, "source buffer is to small" ); - DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL)) == 0, + DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL)) == 0, "there is a conversion error" ); DBG_ASSERT( 0 == nChars, "there is a converted character, but an error" ); @@ -356,7 +356,7 @@ sal_uInt32 SvParser<T>::GetNextChar() sal_Char sBuffer[10]; sBuffer[0] = c1; sal_uInt16 nLen = 1; - while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) != 0 && + while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0 && nLen < 10 ) { rInput.ReadChar( c1 ); @@ -382,9 +382,9 @@ sal_uInt32 SvParser<T>::GetNextChar() } else { - DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, + DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) == 0, "source buffer is to small" ); - DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL)) == 0, + DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL)) == 0, "there is a conversion error" ); DBG_ASSERT( 0 == nChars, "there is a converted character, but an error" ); |