[Libreoffice-commits] core.git: include/rtl io/source sal/osl sal/qa sal/rtl sal/textenc sax/source svtools/source tools/source
Chris Sherlock
chris.sherlock79 at gmail.com
Mon Jul 17 19:48:23 UTC 2017
include/rtl/textcvt.h | 4 ++++
io/source/TextInputStream/TextInputStream.cxx | 4 ++--
sal/osl/unx/file_url.cxx | 2 +-
sal/qa/rtl/textenc/rtl_textcvt.cxx | 14 +++++++-------
sal/rtl/uri.cxx | 6 +++---
sal/rtl/ustring.cxx | 10 +++++-----
sal/textenc/convertbig5hkscs.cxx | 8 ++++----
sal/textenc/converteuctw.cxx | 8 ++++----
sal/textenc/convertgb18030.cxx | 8 ++++----
sal/textenc/convertisciidevangari.cxx | 4 ++--
sal/textenc/convertiso2022cn.cxx | 8 ++++----
sal/textenc/convertiso2022jp.cxx | 8 ++++----
sal/textenc/convertiso2022kr.cxx | 8 ++++----
sal/textenc/convertsimple.cxx | 2 +-
sal/textenc/convertsinglebytetobmpunicode.cxx | 2 +-
sal/textenc/tcvtbyte.cxx | 4 ++--
sal/textenc/tcvtmb.cxx | 12 ++++++------
sal/textenc/tcvtutf7.cxx | 14 +++++++-------
sal/textenc/tcvtutf8.cxx | 8 ++++----
sal/textenc/textcvt.cxx | 2 +-
sax/source/expatwrap/xml2utf.cxx | 4 ++--
svtools/source/svrtf/svparser.cxx | 14 +++++++-------
tools/source/inet/inetmime.cxx | 2 +-
23 files changed, 80 insertions(+), 76 deletions(-)
New commits:
commit 9af8964dd2cb048e328732ee6eb809b0da46a3ae
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jul 15 14:35:50 2017 +1000
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 at gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/include/rtl/textcvt.h b/include/rtl/textcvt.h
index 72a69a4d8311..77663068ef73 100644
--- a/include/rtl/textcvt.h
+++ b/include/rtl/textcvt.h
@@ -81,8 +81,12 @@ SAL_DLLPUBLIC void SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConv
#define RTL_TEXTTOUNICODE_FLAGS_INVALID_MASK ((sal_uInt32)0x0F00)
#define RTL_TEXTTOUNICODE_INFO_ERROR ((sal_uInt32)0x0001)
+// Misspelled constant, kept for backwards compatibility:
#define RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL ((sal_uInt32)0x0002)
+#define RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL ((sal_uInt32)0x0002)
+// Misspelled constant, kept for backwards compatibility:
#define RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL ((sal_uInt32)0x0004)
+#define RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL ((sal_uInt32)0x0004)
#define RTL_TEXTTOUNICODE_INFO_UNDEFINED ((sal_uInt32)0x0008)
#define RTL_TEXTTOUNICODE_INFO_MBUNDEFINED ((sal_uInt32)0x0010)
#define RTL_TEXTTOUNICODE_INFO_INVALID ((sal_uInt32)0x0020)
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 2beb825ed972..cb267c540791 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -288,13 +288,13 @@ sal_Int32 OTextInputStream::implReadNext()
nSourceCount += nSrcCvtBytes;
bool bCont = false;
- if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL )
+ if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL )
{
mvBuffer.resize(mvBuffer.size() * 2);
bCont = true;
}
- if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL )
+ if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL )
{
// read next byte
static Sequence< sal_Int8 > aOneByteSeq( 1 );
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 865021bce770..4e8c7f445da6 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -818,7 +818,7 @@ int TextToUnicode(
text, text_buffer_size, unic_text, unic_text_buffer_size,
OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_FLUSH, &nInfo, &nSrcChars);
- if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
+ if (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL)
{
errno = EOVERFLOW;
return 0;
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);
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index e23d5ac60db7..b886e2153795 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -175,7 +175,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
return nDstSize == 1
? aDst[0] : rtl::combineSurrogates(aDst[0], aDst[1]);
}
- if (nInfo == RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL
+ if (nInfo == RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL
&& pEnd - p >= 3 && p[0] == cEscapePrefix
&& (nWeight1 = getHexWeight(p[1])) >= 0
&& (nWeight2 = getHexWeight(p[2])) >= 0)
@@ -183,7 +183,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
p += 3;
aBuf.append(static_cast< char >(nWeight1 << 4 | nWeight2));
}
- else if (nInfo == RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL
+ else if (nInfo == RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL
&& p != pEnd && *p <= 0x7F)
{
aBuf.append(static_cast< char >(*p++));
@@ -191,7 +191,7 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
else
{
assert(
- (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
+ (nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL)
== 0);
break;
}
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 80832e71e089..a5b67a8760fc 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -728,7 +728,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis,
if (*ppThis == nullptr) {
if (pInfo != nullptr) {
*pInfo = RTL_TEXTTOUNICODE_INFO_ERROR |
- RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
}
return;
}
@@ -783,7 +783,7 @@ retry:
{
if (pInfo != nullptr) {
*pInfo = RTL_TEXTTOUNICODE_INFO_ERROR |
- RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
}
return;
}
@@ -814,7 +814,7 @@ retry:
if (pTemp == nullptr) {
if (pInfo != nullptr) {
*pInfo = RTL_TEXTTOUNICODE_INFO_ERROR |
- RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
}
return;
}
@@ -828,7 +828,7 @@ retry:
/* Shouldn't be the case, but if we get textencoding which
could results in more unicode characters we have this
code here. Could be the case for apple encodings */
- while ( nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL )
+ while ( nInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL )
{
rtl_freeMemory( pTemp );
nNewLen += 8;
@@ -836,7 +836,7 @@ retry:
if (pTemp == nullptr) {
if (pInfo != nullptr) {
*pInfo = RTL_TEXTTOUNICODE_INFO_ERROR |
- RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
}
return;
}
diff --git a/sal/textenc/convertbig5hkscs.cxx b/sal/textenc/convertbig5hkscs.cxx
index 08b8db6e4252..b6852b7a0270 100644
--- a/sal/textenc/convertbig5hkscs.cxx
+++ b/sal/textenc/convertbig5hkscs.cxx
@@ -239,17 +239,17 @@ sal_Size ImplConvertBig5HkscsToUnicode(void const * pData,
no_output:
--pSrcBuf;
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (nRow != 0
&& (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR
- | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL))
+ | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL))
== 0)
{
if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0)
- nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd,
@@ -261,7 +261,7 @@ sal_Size ImplConvertBig5HkscsToUnicode(void const * pData,
break;
case sal::detail::textenc::BAD_INPUT_NO_OUTPUT:
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/converteuctw.cxx b/sal/textenc/converteuctw.cxx
index 9fdd97e05a21..e8c8a442c859 100644
--- a/sal/textenc/converteuctw.cxx
+++ b/sal/textenc/converteuctw.cxx
@@ -248,17 +248,17 @@ sal_Size ImplConvertEucTwToUnicode(void const * pData,
no_output:
--pSrcBuf;
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (eState != IMPL_EUC_TW_TO_UNICODE_STATE_0
&& (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR
- | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL))
+ | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL))
== 0)
{
if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0)
- nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd,
@@ -270,7 +270,7 @@ sal_Size ImplConvertEucTwToUnicode(void const * pData,
break;
case sal::detail::textenc::BAD_INPUT_NO_OUTPUT:
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/convertgb18030.cxx b/sal/textenc/convertgb18030.cxx
index dec9d4880a49..59f580d4bd9f 100644
--- a/sal/textenc/convertgb18030.cxx
+++ b/sal/textenc/convertgb18030.cxx
@@ -240,17 +240,17 @@ sal_Size ImplConvertGb18030ToUnicode(void const * pData,
no_output:
--pSrcBuf;
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (eState != IMPL_GB_18030_TO_UNICODE_STATE_0
&& (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR
- | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL))
+ | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL))
== 0)
{
if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0)
- nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd,
@@ -262,7 +262,7 @@ sal_Size ImplConvertGb18030ToUnicode(void const * pData,
break;
case sal::detail::textenc::BAD_INPUT_NO_OUTPUT:
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx
index ed87c5819586..852b8c65a3ce 100644
--- a/sal/textenc/convertisciidevangari.cxx
+++ b/sal/textenc/convertisciidevangari.cxx
@@ -101,7 +101,7 @@ sal_Size IsciiDevanagariToUnicode::convert(
{
if (pDestBufPtr == pDestBufEnd)
{
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
@@ -196,7 +196,7 @@ sal_Size IsciiDevanagariToUnicode::convert(
break;
if (eAction == BAD_INPUT_NO_OUTPUT)
{
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/convertiso2022cn.cxx b/sal/textenc/convertiso2022cn.cxx
index 7adece94fff0..a134a4d65d89 100644
--- a/sal/textenc/convertiso2022cn.cxx
+++ b/sal/textenc/convertiso2022cn.cxx
@@ -373,17 +373,17 @@ sal_Size ImplConvertIso2022CnToUnicode(void const * pData,
no_output:
--pSrcBuf;
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (eState > IMPL_ISO_2022_CN_TO_UNICODE_STATE_SO
&& (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR
- | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL))
+ | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL))
== 0)
{
if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0)
- nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd,
@@ -396,7 +396,7 @@ sal_Size ImplConvertIso2022CnToUnicode(void const * pData,
break;
case sal::detail::textenc::BAD_INPUT_NO_OUTPUT:
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/convertiso2022jp.cxx b/sal/textenc/convertiso2022jp.cxx
index bb89509e2e69..7a7e6b675add 100644
--- a/sal/textenc/convertiso2022jp.cxx
+++ b/sal/textenc/convertiso2022jp.cxx
@@ -261,17 +261,17 @@ sal_Size ImplConvertIso2022JpToUnicode(void const * pData,
no_output:
--pSrcBuf;
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (eState > IMPL_ISO_2022_JP_TO_UNICODE_STATE_0208
&& (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR
- | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL))
+ | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL))
== 0)
{
if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0)
- nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd,
@@ -283,7 +283,7 @@ sal_Size ImplConvertIso2022JpToUnicode(void const * pData,
break;
case sal::detail::textenc::BAD_INPUT_NO_OUTPUT:
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/convertiso2022kr.cxx b/sal/textenc/convertiso2022kr.cxx
index 687e8dfc3db1..41487c5ec994 100644
--- a/sal/textenc/convertiso2022kr.cxx
+++ b/sal/textenc/convertiso2022kr.cxx
@@ -224,17 +224,17 @@ sal_Size ImplConvertIso2022KrToUnicode(void const * pData,
no_output:
--pSrcBuf;
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (eState > IMPL_ISO_2022_KR_TO_UNICODE_STATE_1001
&& (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR
- | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL))
+ | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL))
== 0)
{
if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0)
- nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd,
@@ -246,7 +246,7 @@ sal_Size ImplConvertIso2022KrToUnicode(void const * pData,
break;
case sal::detail::textenc::BAD_INPUT_NO_OUTPUT:
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx
index 507e20907346..09124d148b6a 100644
--- a/sal/textenc/convertsimple.cxx
+++ b/sal/textenc/convertsimple.cxx
@@ -554,7 +554,7 @@ sal_Size sal::detail::textenc::convertCharToUnicode(
if ( pDestBuf == pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx
index 5890a9dc8220..e8653531ed41 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.cxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.cxx
@@ -69,7 +69,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
break;
no_output:
--srcBuf;
- infoFlags |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ infoFlags |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (info != nullptr) {
diff --git a/sal/textenc/tcvtbyte.cxx b/sal/textenc/tcvtbyte.cxx
index 834e91a44959..1b976217cf01 100644
--- a/sal/textenc/tcvtbyte.cxx
+++ b/sal/textenc/tcvtbyte.cxx
@@ -42,7 +42,7 @@ sal_Size ImplSymbolToUnicode( SAL_UNUSED_PARAMETER const void*,
{
if ( pDestBuf == pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
@@ -136,7 +136,7 @@ sal_Size ImplUpperCharToUnicode( const void* pData,
pEndSrcBuf = pSrcBuf+nSrcBytes;
if ( pDestBuf == pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
*pSrcCvtBytes = 0;
return 0;
}
diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx
index a41611a84669..902269d72ece 100644
--- a/sal/textenc/tcvtmb.cxx
+++ b/sal/textenc/tcvtmb.cxx
@@ -87,7 +87,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*,
{
if ( (nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0 )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
break;
}
cConv = 0;
@@ -194,7 +194,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*,
if ( pDestBuf == pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
@@ -403,7 +403,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData,
/* Source buffer to small */
if ( pSrcBuf + 1 == pEndSrcBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
break;
}
@@ -427,7 +427,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData,
/* Source buffer to small */
if (pEndSrcBuf - pSrcBuf < 3)
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
break;
}
@@ -444,7 +444,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData,
/* Source buffer to small */
if ( pSrcBuf + 1 == pEndSrcBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
break;
}
@@ -512,7 +512,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData,
if ( pDestBuf == pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
diff --git a/sal/textenc/tcvtutf7.cxx b/sal/textenc/tcvtutf7.cxx
index ab798d8b1ecb..c7279875fb54 100644
--- a/sal/textenc/tcvtutf7.cxx
+++ b/sal/textenc/tcvtutf7.cxx
@@ -224,7 +224,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
{
if ( pDestBuf >= pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
*pDestBuf = IMPL_SHIFT_IN_CHAR;
@@ -248,7 +248,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
/* When no more bytes in the source buffer, then */
/* this buffer may be to small */
if ( bEnd )
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
{
*pInfo |= RTL_TEXTTOUNICODE_INFO_INVALID;
@@ -284,7 +284,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
if ( nBufferBits >= 16 )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
@@ -297,7 +297,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
/* When no more bytes in the source buffer, then */
/* this buffer may be to small */
if ( bEnd )
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
{
*pInfo |= RTL_TEXTTOUNICODE_INFO_INVALID;
@@ -310,7 +310,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
{
if ( pDestBuf >= pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
*pDestBuf++
@@ -351,7 +351,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
{
if ( pDestBuf >= pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
*pDestBuf++
@@ -362,7 +362,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext,
/* Write char to unicode buffer */
if ( pDestBuf >= pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
*pDestBuf = c;
diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx
index f9c9879c54a3..c1a6949c01c5 100644
--- a/sal/textenc/tcvtutf8.cxx
+++ b/sal/textenc/tcvtutf8.cxx
@@ -207,17 +207,17 @@ sal_Size ImplConvertUtf8ToUnicode(
no_output:
--pSrcBufPtr;
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
if (nShift >= 0
&& (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR
- | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL))
+ | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL))
== 0)
{
if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0)
- nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL;
else
switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion(
false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd,
@@ -230,7 +230,7 @@ sal_Size ImplConvertUtf8ToUnicode(
break;
case sal::detail::textenc::BAD_INPUT_NO_OUTPUT:
- nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
}
diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx
index d654ca5ecb04..b1024976eecd 100644
--- a/sal/textenc/textcvt.cxx
+++ b/sal/textenc/textcvt.cxx
@@ -50,7 +50,7 @@ static sal_Size ImplDummyToUnicode( const char* pSrcBuf, sal_Size nSrcBytes,
{
if ( pDestBuf == pEndDestBuf )
{
- *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL;
+ *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
break;
}
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 64d21ca88c70..18540c0ce1af 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -420,14 +420,14 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> &
&nSrcCvtBytes );
nSourceCount += nSrcCvtBytes;
- if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL ) {
+ if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL ) {
// save necessary bytes for next conversion
seqUnicode.realloc( seqUnicode.getLength() * 2 );
continue;
}
break;
}
- if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL ) {
+ if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL ) {
m_seqSource.realloc( nSourceSize - nSourceCount );
memcpy( m_seqSource.getArray() , &(pbSource[nSourceCount]) , nSourceSize-nSourceCount );
}
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" );
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index e3d405bfbce3..a398aa79e3ca 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -117,7 +117,7 @@ sal_Unicode * convertToUnicode(const sal_Char * pBegin,
| RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
| RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR,
&nInfo, &nSrcCvtBytes);
- if (nInfo != RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)
+ if (nInfo != RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL)
break;
delete[] pBuffer;
rtl_resetTextToUnicodeContext(hConverter, hContext);
More information about the Libreoffice-commits
mailing list