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 /sal/qa | |
| parent | cppu: remove unnecessary LOG_LIFECYCLE_* macros (diff) | |
| download | core-9af8964dd2cb048e328732ee6eb809b0da46a3ae.tar.gz core-9af8964dd2cb048e328732ee6eb809b0da46a3ae.zip | |
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 'sal/qa')
| -rw-r--r-- | sal/qa/rtl/textenc/rtl_textcvt.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 34e5208ae890..d698bc22cd74 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -265,7 +265,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { nOutput += nSize; nInput += nConverted; CPPUNIT_ASSERT_EQUAL((sal_uInt32) 0, - (nInfo & ~RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL)); + (nInfo & ~RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL)); } CPPUNIT_ASSERT_EQUAL(rTest.m_nUnicodeSize, nOutput); CPPUNIT_ASSERT_EQUAL(rTest.m_nTextSize, nInput); @@ -306,11 +306,11 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { | (rTest.m_bGlobalSignature ? RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE : 0)), &nInfo, &nCvtBytes); - if ((nInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) != 0) { + if ((nInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0) { 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) { if (i == rTest.m_nTextSize) { @@ -336,7 +336,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { aUnicode[nSize++] = aUC[1]; } else { OSL_ASSERT( - (nInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0 + (nInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) == 0 && nChars == 0 && nInfo != 0); aUnicode[nSize++] = sBuffer[0]; i -= nLen - 1; @@ -426,9 +426,9 @@ void doComplexCharSetCutTest(ComplexCharSetTest const & rTest) { &nInfo, &nConverted); CPPUNIT_ASSERT_EQUAL(rTest.m_nUnicodeSize, nSize); - if (nInfo != RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) + if (nInfo != RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) { - CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL, + CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL, nInfo); } CPPUNIT_ASSERT_MESSAGE("nConverted should be less than rTest.m_nTextSize", nConverted < rTest.m_nTextSize); @@ -2683,7 +2683,7 @@ void Test::testSRCBUFFERTOSMALL() { RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR), &info, &cvt)); - CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL, info); + CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL, info); CPPUNIT_ASSERT(cvt <= 1); rtl_destroyTextToUnicodeContext(cv, cx); rtl_destroyTextToUnicodeConverter(cv); |