diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:38:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:38:42 +0000 |
| commit | 49364914c27822f977078fd333d809e6bcf8b5e3 (patch) | |
| tree | c84b4fc82e47b2acd60bc3f960a89a6f89049593 /sal | |
| parent | 340a374ca4aad68d616d65d8dc35e72d3f105b80 (diff) | |
INTEGRATION: CWS warnings01 (1.3.428); FILE MERGED
2005/11/07 12:11:31 sb 1.3.428.3: #i53898# Made code warning-free (additional -W switches for GCC).
2005/09/23 01:56:06 sb 1.3.428.2: RESYNC: (1.3-1.4); FILE MERGED
2005/08/29 13:56:09 sb 1.3.428.1: #i53898# Made code warning-free.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/textenc/tenchelp.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sal/textenc/tenchelp.c b/sal/textenc/tenchelp.c index 69bd349f105d..998ee4fe4381 100644 --- a/sal/textenc/tenchelp.c +++ b/sal/textenc/tenchelp.c @@ -4,9 +4,9 @@ * * $RCSfile: tenchelp.c,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:45:28 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:38:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -108,12 +108,13 @@ sal_Bool ImplGetInvalidAsciiMultiByte(sal_uInt32 nFlags, int ImplIsUnicodeIgnoreChar( sal_Unicode c, sal_uInt32 nFlags ) { - return (nFlags & RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE) != 0 - && ImplIsZeroWidth(c) - || (nFlags & RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE) != 0 - && ImplIsControlOrFormat(c) - || (nFlags & RTL_UNICODETOTEXT_FLAGS_PRIVATE_IGNORE) != 0 - && ImplIsPrivateUse(c); + return + ((nFlags & RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE) != 0 + && ImplIsZeroWidth(c)) + || ((nFlags & RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE) != 0 + && ImplIsControlOrFormat(c)) + || ((nFlags & RTL_UNICODETOTEXT_FLAGS_PRIVATE_IGNORE) != 0 + && ImplIsPrivateUse(c)); } /* ======================================================================= */ @@ -139,6 +140,8 @@ ImplHandleUndefinedUnicodeToTextChar(ImplTextConverterData const * pData, { sal_Unicode c = **ppSrcBuf; + (void) pData; /* unused */ + /* Should the private character map to one byte */ if ( (c >= RTL_TEXTCVT_BYTE_PRIVATE_START) && (c <= RTL_TEXTCVT_BYTE_PRIVATE_END) ) { |