INTEGRATION: CWS sb69 (1.6.92); FILE MERGED

2007/01/24 13:23:59 sb 1.6.92.1: #i73423# When converting from UTF16 to UTF7, INFO_DESTBUFFERTOSMALL does not imply INFO_ERROR.
This commit is contained in:
Oliver Bolte 2007-03-14 07:30:45 +00:00
parent c322c32f59
commit 4b91f25249

View file

@ -4,9 +4,9 @@
*
* $RCSfile: tcvtutf7.c,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: hr $ $Date: 2006-06-20 04:38:15 $
* last change: $Author: obo $ $Date: 2007-03-14 08:30:45 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -503,7 +503,7 @@ sal_Size ImplUnicodeToUTF7( const ImplTextConverterData* pData, void* pContext,
{
if ( pDestBuf >= pEndDestBuf )
{
*pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
*pInfo |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
break;
}
*pDestBuf = IMPL_SHIFT_IN_CHAR;
@ -513,7 +513,7 @@ sal_Size ImplUnicodeToUTF7( const ImplTextConverterData* pData, void* pContext,
{
if ( pDestBuf >= pEndDestBuf )
{
*pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
*pInfo |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
break;
}
*pDestBuf = IMPL_SHIFT_OUT_CHAR;
@ -553,7 +553,7 @@ sal_Size ImplUnicodeToUTF7( const ImplTextConverterData* pData, void* pContext,
if ( nBufferBits >= 6 )
{
*pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
*pInfo |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
break;
}
@ -562,7 +562,7 @@ sal_Size ImplUnicodeToUTF7( const ImplTextConverterData* pData, void* pContext,
{
if ( pDestBuf >= pEndDestBuf )
{
*pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
*pInfo |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
break;
}
*pDestBuf = IMPL_SHIFT_OUT_CHAR;
@ -578,7 +578,7 @@ sal_Size ImplUnicodeToUTF7( const ImplTextConverterData* pData, void* pContext,
{
if ( pDestBuf >= pEndDestBuf )
{
*pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
*pInfo |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL;
break;
}
*pDestBuf = (sal_Char)(sal_uChar)c;