no types and casts ifdef _SOLAR_RSC_INVOKED

1 files changed, 106 insertions, 95 deletions

diff --git a/sal/inc/rtl/textenc.h b/sal/inc/rtl/textenc.h
index d2306243e4b5..a2d1b751927b 100644
--- a/sal/inc/rtl/textenc.h
+++ b/sal/inc/rtl/textenc.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textenc.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: th $ $Date: 2000-12-13 22:14:03 $
+ *  last change: $Author: er $ $Date: 2000-12-18 15:30:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,104 +62,115 @@
 #ifndef _RTL_TEXTENC_H
 #define _RTL_TEXTENC_H
 
+#ifdef _SOLAR_RSC_INVOKED
+/* Enable resources to use these values, rsc can't handle casts */
+#define RTL_TEXTENC_CAST( val ) (val)
+
+#else /* !_SOLAR_RSC_INVOKED */
+
 #ifndef _SAL_TYPES_H
 #include <sal/types.h>
 #endif
 
 typedef sal_uInt16 rtl_TextEncoding;
-#define RTL_TEXTENCODING_DONTKNOW               ((rtl_TextEncoding)0)
-#define RTL_TEXTENCODING_MS_1252                ((rtl_TextEncoding)1)
-#define RTL_TEXTENCODING_APPLE_ROMAN            ((rtl_TextEncoding)2)
-#define RTL_TEXTENCODING_IBM_437                ((rtl_TextEncoding)3)
-#define RTL_TEXTENCODING_IBM_850                ((rtl_TextEncoding)4)
-#define RTL_TEXTENCODING_IBM_860                ((rtl_TextEncoding)5)
-#define RTL_TEXTENCODING_IBM_861                ((rtl_TextEncoding)6)
-#define RTL_TEXTENCODING_IBM_863                ((rtl_TextEncoding)7)
-#define RTL_TEXTENCODING_IBM_865                ((rtl_TextEncoding)8)
-/* Reserved: RTL_TEXTENCODING_SYSTEM            ((rtl_TextEncoding)9) */
-#define RTL_TEXTENCODING_SYMBOL                 ((rtl_TextEncoding)10)
-#define RTL_TEXTENCODING_ASCII_US               ((rtl_TextEncoding)11)
-#define RTL_TEXTENCODING_ISO_8859_1             ((rtl_TextEncoding)12)
-#define RTL_TEXTENCODING_ISO_8859_2             ((rtl_TextEncoding)13)
-#define RTL_TEXTENCODING_ISO_8859_3             ((rtl_TextEncoding)14)
-#define RTL_TEXTENCODING_ISO_8859_4             ((rtl_TextEncoding)15)
-#define RTL_TEXTENCODING_ISO_8859_5             ((rtl_TextEncoding)16)
-#define RTL_TEXTENCODING_ISO_8859_6             ((rtl_TextEncoding)17)
-#define RTL_TEXTENCODING_ISO_8859_7             ((rtl_TextEncoding)18)
-#define RTL_TEXTENCODING_ISO_8859_8             ((rtl_TextEncoding)19)
-#define RTL_TEXTENCODING_ISO_8859_9             ((rtl_TextEncoding)20)
-#define RTL_TEXTENCODING_ISO_8859_14            ((rtl_TextEncoding)21)
-#define RTL_TEXTENCODING_ISO_8859_15            ((rtl_TextEncoding)22)
-#define RTL_TEXTENCODING_IBM_737                ((rtl_TextEncoding)23)
-#define RTL_TEXTENCODING_IBM_775                ((rtl_TextEncoding)24)
-#define RTL_TEXTENCODING_IBM_852                ((rtl_TextEncoding)25)
-#define RTL_TEXTENCODING_IBM_855                ((rtl_TextEncoding)26)
-#define RTL_TEXTENCODING_IBM_857                ((rtl_TextEncoding)27)
-#define RTL_TEXTENCODING_IBM_862                ((rtl_TextEncoding)28)
-#define RTL_TEXTENCODING_IBM_864                ((rtl_TextEncoding)29)
-#define RTL_TEXTENCODING_IBM_866                ((rtl_TextEncoding)30)
-#define RTL_TEXTENCODING_IBM_869                ((rtl_TextEncoding)31)
-#define RTL_TEXTENCODING_MS_874                 ((rtl_TextEncoding)32)
-#define RTL_TEXTENCODING_MS_1250                ((rtl_TextEncoding)33)
-#define RTL_TEXTENCODING_MS_1251                ((rtl_TextEncoding)34)
-#define RTL_TEXTENCODING_MS_1253                ((rtl_TextEncoding)35)
-#define RTL_TEXTENCODING_MS_1254                ((rtl_TextEncoding)36)
-#define RTL_TEXTENCODING_MS_1255                ((rtl_TextEncoding)37)
-#define RTL_TEXTENCODING_MS_1256                ((rtl_TextEncoding)38)
-#define RTL_TEXTENCODING_MS_1257                ((rtl_TextEncoding)39)
-#define RTL_TEXTENCODING_MS_1258                ((rtl_TextEncoding)40)
-#define RTL_TEXTENCODING_APPLE_ARABIC           ((rtl_TextEncoding)41)
-#define RTL_TEXTENCODING_APPLE_CENTEURO         ((rtl_TextEncoding)42)
-#define RTL_TEXTENCODING_APPLE_CROATIAN         ((rtl_TextEncoding)43)
-#define RTL_TEXTENCODING_APPLE_CYRILLIC         ((rtl_TextEncoding)44)
-#define RTL_TEXTENCODING_APPLE_DEVANAGARI       ((rtl_TextEncoding)45)
-#define RTL_TEXTENCODING_APPLE_FARSI            ((rtl_TextEncoding)46)
-#define RTL_TEXTENCODING_APPLE_GREEK            ((rtl_TextEncoding)47)
-#define RTL_TEXTENCODING_APPLE_GUJARATI         ((rtl_TextEncoding)48)
-#define RTL_TEXTENCODING_APPLE_GURMUKHI         ((rtl_TextEncoding)49)
-#define RTL_TEXTENCODING_APPLE_HEBREW           ((rtl_TextEncoding)50)
-#define RTL_TEXTENCODING_APPLE_ICELAND          ((rtl_TextEncoding)51)
-#define RTL_TEXTENCODING_APPLE_ROMANIAN         ((rtl_TextEncoding)52)
-#define RTL_TEXTENCODING_APPLE_THAI             ((rtl_TextEncoding)53)
-#define RTL_TEXTENCODING_APPLE_TURKISH          ((rtl_TextEncoding)54)
-#define RTL_TEXTENCODING_APPLE_UKRAINIAN        ((rtl_TextEncoding)55)
-#define RTL_TEXTENCODING_APPLE_CHINSIMP         ((rtl_TextEncoding)56)
-#define RTL_TEXTENCODING_APPLE_CHINTRAD         ((rtl_TextEncoding)57)
-#define RTL_TEXTENCODING_APPLE_JAPANESE         ((rtl_TextEncoding)58)
-#define RTL_TEXTENCODING_APPLE_KOREAN           ((rtl_TextEncoding)59)
-#define RTL_TEXTENCODING_MS_932                 ((rtl_TextEncoding)60)
-#define RTL_TEXTENCODING_MS_936                 ((rtl_TextEncoding)61)
-#define RTL_TEXTENCODING_MS_949                 ((rtl_TextEncoding)62)
-#define RTL_TEXTENCODING_MS_950                 ((rtl_TextEncoding)63)
-#define RTL_TEXTENCODING_SHIFT_JIS              ((rtl_TextEncoding)64)
-#define RTL_TEXTENCODING_GB_2312                ((rtl_TextEncoding)65)
-#define RTL_TEXTENCODING_GBT_12345              ((rtl_TextEncoding)66)
-#define RTL_TEXTENCODING_GBK                    ((rtl_TextEncoding)67)
-#define RTL_TEXTENCODING_BIG5                   ((rtl_TextEncoding)68)
-#define RTL_TEXTENCODING_EUC_JP                 ((rtl_TextEncoding)69)
-#define RTL_TEXTENCODING_EUC_CN                 ((rtl_TextEncoding)70)
-#define RTL_TEXTENCODING_EUC_TW                 ((rtl_TextEncoding)71)
-#define RTL_TEXTENCODING_ISO_2022_JP            ((rtl_TextEncoding)72)
-#define RTL_TEXTENCODING_ISO_2022_CN            ((rtl_TextEncoding)73)
-#define RTL_TEXTENCODING_KOI8_R                 ((rtl_TextEncoding)74)
-#define RTL_TEXTENCODING_UTF7                   ((rtl_TextEncoding)75)
-#define RTL_TEXTENCODING_UTF8                   ((rtl_TextEncoding)76)
-#define RTL_TEXTENCODING_ISO_8859_10            ((rtl_TextEncoding)77)
-#define RTL_TEXTENCODING_ISO_8859_13            ((rtl_TextEncoding)78)
-#define RTL_TEXTENCODING_EUC_KR                 ((rtl_TextEncoding)79)
-#define RTL_TEXTENCODING_ISO_2022_KR            ((rtl_TextEncoding)80)
-#define RTL_TEXTENCODING_JIS_X_0201             ((rtl_TextEncoding)81)
-#define RTL_TEXTENCODING_JIS_X_0208             ((rtl_TextEncoding)82)
-#define RTL_TEXTENCODING_JIS_X_0212             ((rtl_TextEncoding)83)
-#define RTL_TEXTENCODING_MS_1361                ((rtl_TextEncoding)84)
-
-#define RTL_TEXTENCODING_STD_COUNT              ((rtl_TextEncoding)85)
-
-#define RTL_TEXTENCODING_USER_START             ((rtl_TextEncoding)0x8000)
-#define RTL_TEXTENCODING_USER_END               ((rtl_TextEncoding)0xEFFF)
-
-#define RTL_TEXTENCODING_UCS4                   ((rtl_TextEncoding)0xFFFE)
-#define RTL_TEXTENCODING_UCS2                   ((rtl_TextEncoding)0xFFFF)
+#define RTL_TEXTENC_CAST( val ) ((rtl_TextEncoding) val)
+
+#endif /* _SOLAR_RSC_INVOKED */
+
+
+#define RTL_TEXTENCODING_DONTKNOW               (RTL_TEXTENC_CAST( 0 ))
+#define RTL_TEXTENCODING_MS_1252                (RTL_TEXTENC_CAST( 1 ))
+#define RTL_TEXTENCODING_APPLE_ROMAN            (RTL_TEXTENC_CAST( 2 ))
+#define RTL_TEXTENCODING_IBM_437                (RTL_TEXTENC_CAST( 3 ))
+#define RTL_TEXTENCODING_IBM_850                (RTL_TEXTENC_CAST( 4 ))
+#define RTL_TEXTENCODING_IBM_860                (RTL_TEXTENC_CAST( 5 ))
+#define RTL_TEXTENCODING_IBM_861                (RTL_TEXTENC_CAST( 6 ))
+#define RTL_TEXTENCODING_IBM_863                (RTL_TEXTENC_CAST( 7 ))
+#define RTL_TEXTENCODING_IBM_865                (RTL_TEXTENC_CAST( 8 ))
+/* Reserved: RTL_TEXTENCODING_SYSTEM            (RTL_TEXTENC_CAST( 9 )) */
+#define RTL_TEXTENCODING_SYMBOL                 (RTL_TEXTENC_CAST( 10 ))
+#define RTL_TEXTENCODING_ASCII_US               (RTL_TEXTENC_CAST( 11 ))
+#define RTL_TEXTENCODING_ISO_8859_1             (RTL_TEXTENC_CAST( 12 ))
+#define RTL_TEXTENCODING_ISO_8859_2             (RTL_TEXTENC_CAST( 13 ))
+#define RTL_TEXTENCODING_ISO_8859_3             (RTL_TEXTENC_CAST( 14 ))
+#define RTL_TEXTENCODING_ISO_8859_4             (RTL_TEXTENC_CAST( 15 ))
+#define RTL_TEXTENCODING_ISO_8859_5             (RTL_TEXTENC_CAST( 16 ))
+#define RTL_TEXTENCODING_ISO_8859_6             (RTL_TEXTENC_CAST( 17 ))
+#define RTL_TEXTENCODING_ISO_8859_7             (RTL_TEXTENC_CAST( 18 ))
+#define RTL_TEXTENCODING_ISO_8859_8             (RTL_TEXTENC_CAST( 19 ))
+#define RTL_TEXTENCODING_ISO_8859_9             (RTL_TEXTENC_CAST( 20 ))
+#define RTL_TEXTENCODING_ISO_8859_14            (RTL_TEXTENC_CAST( 21 ))
+#define RTL_TEXTENCODING_ISO_8859_15            (RTL_TEXTENC_CAST( 22 ))
+#define RTL_TEXTENCODING_IBM_737                (RTL_TEXTENC_CAST( 23 ))
+#define RTL_TEXTENCODING_IBM_775                (RTL_TEXTENC_CAST( 24 ))
+#define RTL_TEXTENCODING_IBM_852                (RTL_TEXTENC_CAST( 25 ))
+#define RTL_TEXTENCODING_IBM_855                (RTL_TEXTENC_CAST( 26 ))
+#define RTL_TEXTENCODING_IBM_857                (RTL_TEXTENC_CAST( 27 ))
+#define RTL_TEXTENCODING_IBM_862                (RTL_TEXTENC_CAST( 28 ))
+#define RTL_TEXTENCODING_IBM_864                (RTL_TEXTENC_CAST( 29 ))
+#define RTL_TEXTENCODING_IBM_866                (RTL_TEXTENC_CAST( 30 ))
+#define RTL_TEXTENCODING_IBM_869                (RTL_TEXTENC_CAST( 31 ))
+#define RTL_TEXTENCODING_MS_874                 (RTL_TEXTENC_CAST( 32 ))
+#define RTL_TEXTENCODING_MS_1250                (RTL_TEXTENC_CAST( 33 ))
+#define RTL_TEXTENCODING_MS_1251                (RTL_TEXTENC_CAST( 34 ))
+#define RTL_TEXTENCODING_MS_1253                (RTL_TEXTENC_CAST( 35 ))
+#define RTL_TEXTENCODING_MS_1254                (RTL_TEXTENC_CAST( 36 ))
+#define RTL_TEXTENCODING_MS_1255                (RTL_TEXTENC_CAST( 37 ))
+#define RTL_TEXTENCODING_MS_1256                (RTL_TEXTENC_CAST( 38 ))
+#define RTL_TEXTENCODING_MS_1257                (RTL_TEXTENC_CAST( 39 ))
+#define RTL_TEXTENCODING_MS_1258                (RTL_TEXTENC_CAST( 40 ))
+#define RTL_TEXTENCODING_APPLE_ARABIC           (RTL_TEXTENC_CAST( 41 ))
+#define RTL_TEXTENCODING_APPLE_CENTEURO         (RTL_TEXTENC_CAST( 42 ))
+#define RTL_TEXTENCODING_APPLE_CROATIAN         (RTL_TEXTENC_CAST( 43 ))
+#define RTL_TEXTENCODING_APPLE_CYRILLIC         (RTL_TEXTENC_CAST( 44 ))
+#define RTL_TEXTENCODING_APPLE_DEVANAGARI       (RTL_TEXTENC_CAST( 45 ))
+#define RTL_TEXTENCODING_APPLE_FARSI            (RTL_TEXTENC_CAST( 46 ))
+#define RTL_TEXTENCODING_APPLE_GREEK            (RTL_TEXTENC_CAST( 47 ))
+#define RTL_TEXTENCODING_APPLE_GUJARATI         (RTL_TEXTENC_CAST( 48 ))
+#define RTL_TEXTENCODING_APPLE_GURMUKHI         (RTL_TEXTENC_CAST( 49 ))
+#define RTL_TEXTENCODING_APPLE_HEBREW           (RTL_TEXTENC_CAST( 50 ))
+#define RTL_TEXTENCODING_APPLE_ICELAND          (RTL_TEXTENC_CAST( 51 ))
+#define RTL_TEXTENCODING_APPLE_ROMANIAN         (RTL_TEXTENC_CAST( 52 ))
+#define RTL_TEXTENCODING_APPLE_THAI             (RTL_TEXTENC_CAST( 53 ))
+#define RTL_TEXTENCODING_APPLE_TURKISH          (RTL_TEXTENC_CAST( 54 ))
+#define RTL_TEXTENCODING_APPLE_UKRAINIAN        (RTL_TEXTENC_CAST( 55 ))
+#define RTL_TEXTENCODING_APPLE_CHINSIMP         (RTL_TEXTENC_CAST( 56 ))
+#define RTL_TEXTENCODING_APPLE_CHINTRAD         (RTL_TEXTENC_CAST( 57 ))
+#define RTL_TEXTENCODING_APPLE_JAPANESE         (RTL_TEXTENC_CAST( 58 ))
+#define RTL_TEXTENCODING_APPLE_KOREAN           (RTL_TEXTENC_CAST( 59 ))
+#define RTL_TEXTENCODING_MS_932                 (RTL_TEXTENC_CAST( 60 ))
+#define RTL_TEXTENCODING_MS_936                 (RTL_TEXTENC_CAST( 61 ))
+#define RTL_TEXTENCODING_MS_949                 (RTL_TEXTENC_CAST( 62 ))
+#define RTL_TEXTENCODING_MS_950                 (RTL_TEXTENC_CAST( 63 ))
+#define RTL_TEXTENCODING_SHIFT_JIS              (RTL_TEXTENC_CAST( 64 ))
+#define RTL_TEXTENCODING_GB_2312                (RTL_TEXTENC_CAST( 65 ))
+#define RTL_TEXTENCODING_GBT_12345              (RTL_TEXTENC_CAST( 66 ))
+#define RTL_TEXTENCODING_GBK                    (RTL_TEXTENC_CAST( 67 ))
+#define RTL_TEXTENCODING_BIG5                   (RTL_TEXTENC_CAST( 68 ))
+#define RTL_TEXTENCODING_EUC_JP                 (RTL_TEXTENC_CAST( 69 ))
+#define RTL_TEXTENCODING_EUC_CN                 (RTL_TEXTENC_CAST( 70 ))
+#define RTL_TEXTENCODING_EUC_TW                 (RTL_TEXTENC_CAST( 71 ))
+#define RTL_TEXTENCODING_ISO_2022_JP            (RTL_TEXTENC_CAST( 72 ))
+#define RTL_TEXTENCODING_ISO_2022_CN            (RTL_TEXTENC_CAST( 73 ))
+#define RTL_TEXTENCODING_KOI8_R                 (RTL_TEXTENC_CAST( 74 ))
+#define RTL_TEXTENCODING_UTF7                   (RTL_TEXTENC_CAST( 75 ))
+#define RTL_TEXTENCODING_UTF8                   (RTL_TEXTENC_CAST( 76 ))
+#define RTL_TEXTENCODING_ISO_8859_10            (RTL_TEXTENC_CAST( 77 ))
+#define RTL_TEXTENCODING_ISO_8859_13            (RTL_TEXTENC_CAST( 78 ))
+#define RTL_TEXTENCODING_EUC_KR                 (RTL_TEXTENC_CAST( 79 ))
+#define RTL_TEXTENCODING_ISO_2022_KR            (RTL_TEXTENC_CAST( 80 ))
+#define RTL_TEXTENCODING_JIS_X_0201             (RTL_TEXTENC_CAST( 81 ))
+#define RTL_TEXTENCODING_JIS_X_0208             (RTL_TEXTENC_CAST( 82 ))
+#define RTL_TEXTENCODING_JIS_X_0212             (RTL_TEXTENC_CAST( 83 ))
+#define RTL_TEXTENCODING_MS_1361                (RTL_TEXTENC_CAST( 84 ))
+
+#define RTL_TEXTENCODING_STD_COUNT              (RTL_TEXTENC_CAST( 85 ))
+
+#define RTL_TEXTENCODING_USER_START             (RTL_TEXTENC_CAST( 0x8000 ))
+#define RTL_TEXTENCODING_USER_END               (RTL_TEXTENC_CAST( 0xEFFF ))
+
+#define RTL_TEXTENCODING_UCS4                   (RTL_TEXTENC_CAST( 0xFFFE ))
+#define RTL_TEXTENCODING_UCS2                   (RTL_TEXTENC_CAST( 0xFFFF ))
 #define RTL_TEXTENCODING_UNICODE                RTL_TEXTENCODING_UCS2
 
 /****** Overview over the TextEncodings *****