diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:14:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:14:53 +0000 |
| commit | b59fc026751a30633cc82469b488d2480d6b2b1e (patch) | |
| tree | 25ca789e1ce870a2aacbec4dd2b890114a27f18b /sal/inc/rtl/ustring.h | |
| parent | e8fde8437be0784ae1ef94cae8824934c287b4e0 (diff) | |
INTEGRATION: CWS warnings01 (1.15.50); FILE MERGED
2005/11/07 12:11:26 sb 1.15.50.3: #i53898# Made code warning-free (additional -W switches for GCC).
2005/09/23 00:45:44 sb 1.15.50.2: RESYNC: (1.15-1.16); FILE MERGED
2005/09/20 12:57:16 sb 1.15.50.1: #i53898# Globally disable problematic warnings.
Diffstat (limited to 'sal/inc/rtl/ustring.h')
| -rw-r--r-- | sal/inc/rtl/ustring.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h index c5128f293048..7daa499714ca 100644 --- a/sal/inc/rtl/ustring.h +++ b/sal/inc/rtl/ustring.h @@ -4,9 +4,9 @@ * * $RCSfile: ustring.h,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2005-09-08 14:45:07 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:14:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1184,7 +1184,7 @@ sal_Int32 SAL_CALL rtl_uString_getLength( const rtl_uString * str ) SAL_THROW_EX @return a pointer to the null-terminated character array. */ -sal_Unicode * SAL_CALL rtl_uString_getStr( rtl_uString * const str ) SAL_THROW_EXTERN_C(); +sal_Unicode * SAL_CALL rtl_uString_getStr( rtl_uString * str ) SAL_THROW_EXTERN_C(); /** Create a new string that is the concatenation of two other strings. @@ -1234,7 +1234,7 @@ void SAL_CALL rtl_uString_newConcat( rtl_uString ** newStr, rtl_uString * left, @param subStr either null or a valid string to be inserted. */ -void SAL_CALL rtl_uString_newReplaceStrAt( rtl_uString ** newStr, rtl_uString * str, sal_Int32 index, sal_Int32 count, rtl_uString * subStr ) SAL_THROW_EXTERN_C(); +void SAL_CALL rtl_uString_newReplaceStrAt( rtl_uString ** newStr, rtl_uString * str, sal_Int32 idx, sal_Int32 count, rtl_uString * subStr ) SAL_THROW_EXTERN_C(); /** Create a new string by replacing all occurrences of a single character within another string. @@ -1369,7 +1369,7 @@ void SAL_CALL rtl_uString_newTrim( rtl_uString ** newStr, rtl_uString * str ) SA @return the index of the next token, or -1 if no more tokens follow. */ -sal_Int32 SAL_CALL rtl_uString_getToken( rtl_uString ** newStr , rtl_uString * str, sal_Int32 token, sal_Unicode cTok, sal_Int32 index ) SAL_THROW_EXTERN_C(); +sal_Int32 SAL_CALL rtl_uString_getToken( rtl_uString ** newStr , rtl_uString * str, sal_Int32 token, sal_Unicode cTok, sal_Int32 idx ) SAL_THROW_EXTERN_C(); /* ======================================================================= */ |