sc/source/ui/src/scfuncs.src |  760 +++++++++++++++++++++----------------------
 1 file changed, 374 insertions(+), 386 deletions(-)

New commits:
commit 6b54ea54e0c374e0e79631087835e6cae67bc54c
Author: Eike Rathke <er...@redhat.com>
Date:   Tue Jan 12 13:07:59 2016 +0100

    remove nonsensical U2S void macro
    
    help IDs are strings since years..
    
    Change-Id: Ie3a939f43861b6a11a146db6df713dcf73098454

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 59b4cec..70508b3 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -45,7 +45,7 @@
  *
  *          Function group (text, math, ...), one of ID_FUNCTION_GRP_...
  *
- *          Help ID, U2S(HID_FUNC_...)
+ *          Help ID, HID_FUNC_...
  *
  *          Number of parameters. VAR_ARGS if variable number, or
  *          VAR_ARGS+number if number of fixed parameters and variable
@@ -71,14 +71,6 @@
  *      parameter.
  */
 
-// Hack:
-//#define   U2S(x)  ((x)-HID_START)
-#define U2S(x) x
-// Macro U2S: unsigned to signed
-// is needed because the resource compiler only knows signed short int in
-// ExtraData, but the HID_XXX are unsigned and exceed 32k. Code reading the
-// resource entries must consider this and undo the conversion.
-
 #include "scfuncs.hrc"
 #include "formula/compiler.hrc"
 
@@ -95,7 +87,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBANZAHL );
+            HID_FUNC_DBANZAHL;
             3;  0;  0;  0;
             0;
         };
@@ -135,7 +127,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBANZAHL2 );
+            HID_FUNC_DBANZAHL2;
             3;  0;  0;  0;
             0;
         };
@@ -175,7 +167,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBMITTELWERT );
+            HID_FUNC_DBMITTELWERT;
             3;  0;  0;  0;
             0;
         };
@@ -215,7 +207,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBAUSZUG );
+            HID_FUNC_DBAUSZUG;
             3;  0;  0;  0;
             0;
         };
@@ -255,7 +247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBMAX );
+            HID_FUNC_DBMAX;
             3;  0;  0;  0;
             0;
         };
@@ -295,7 +287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBMIN );
+            HID_FUNC_DBMIN;
             3;  0;  0;  0;
             0;
         };
@@ -335,7 +327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBPRODUKT );
+            HID_FUNC_DBPRODUKT;
             3;  0;  0;  0;
             0;
         };
@@ -375,7 +367,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBSTDABW );
+            HID_FUNC_DBSTDABW;
             3;  0;  0;  0;
             0;
         };
@@ -415,7 +407,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBSTDABWN );
+            HID_FUNC_DBSTDABWN;
             3;  0;  0;  0;
             0;
         };
@@ -455,7 +447,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBSUMME );
+            HID_FUNC_DBSUMME;
             3;  0;  0;  0;
             0;
         };
@@ -495,7 +487,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBVARIANZ );
+            HID_FUNC_DBVARIANZ;
             3;  0;  0;  0;
             0;
         };
@@ -535,7 +527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATABASE;
-            U2S( HID_FUNC_DBVARIANZEN );
+            HID_FUNC_DBVARIANZEN;
             3;  0;  0;  0;
             0;
         };
@@ -575,7 +567,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_DATUM );
+            HID_FUNC_DATUM;
             3;  0;  0;  0;
             0;
         };
@@ -615,7 +607,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_DATWERT );
+            HID_FUNC_DATWERT;
             1;  0;
             0;
         };
@@ -639,7 +631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_TAG );
+            HID_FUNC_TAG;
             1;  0;
             0;
         };
@@ -663,7 +655,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_TAGE360 );
+            HID_FUNC_TAGE360;
             3;  0;  0;  1;
             0;
         };
@@ -703,7 +695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_NETWORKDAYS );
+            HID_FUNC_NETWORKDAYS;
             4;  0;  0;  1;  1;
             0;
         };
@@ -751,7 +743,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_NETWORKDAYS_MS );
+            HID_FUNC_NETWORKDAYS_MS;
             4;  0;  0;  1;  1;
             0;
         };
@@ -799,7 +791,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_WORKDAY_MS );
+            HID_FUNC_WORKDAY_MS;
             4;  0;  0;  1;  1;
             0;
         };
@@ -847,7 +839,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_STUNDE );
+            HID_FUNC_STUNDE;
             1;  0;
             0;
         };
@@ -871,7 +863,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_MINUTE );
+            HID_FUNC_MINUTE;
             1;  0;
             0;
         };
@@ -895,7 +887,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_MONAT );
+            HID_FUNC_MONAT;
             1;  0;
             0;
         };
@@ -919,7 +911,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_JETZT );
+            HID_FUNC_JETZT;
             0;
             0;
         };
@@ -935,7 +927,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_SEKUNDE );
+            HID_FUNC_SEKUNDE;
             1;  0;
             0;
         };
@@ -959,7 +951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_ZEIT );
+            HID_FUNC_ZEIT;
             3;  0;  0;  0;
             0;
         };
@@ -999,7 +991,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_ZEITWERT );
+            HID_FUNC_ZEITWERT;
             1;  0;
             0;
         };
@@ -1023,7 +1015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_HEUTE );
+            HID_FUNC_HEUTE;
             0;
             0;
         };
@@ -1039,7 +1031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_WOCHENTAG );
+            HID_FUNC_WOCHENTAG;
             2;  0;  1;
             0;
         };
@@ -1071,7 +1063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_JAHR );
+            HID_FUNC_JAHR;
             1;  0;
             0;
         };
@@ -1095,7 +1087,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_TAGE );
+            HID_FUNC_TAGE;
             2;  0;  0;
             0;
         };
@@ -1127,7 +1119,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_DATEDIF );
+            HID_FUNC_DATEDIF;
             3;  0;  0; 0;
             0;
         };
@@ -1173,7 +1165,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_KALENDERWOCHE );
+            HID_FUNC_KALENDERWOCHE;
             2;  0;  1;
             0;
         };
@@ -1205,7 +1197,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_ISOWEEKNUM );
+            HID_FUNC_ISOWEEKNUM;
             1;  0;
             0;
         };
@@ -1228,7 +1220,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             2;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_WEEKNUM_OOO );
+            HID_FUNC_WEEKNUM_OOO;
             2;  0;  0;
             0;
         };
@@ -1260,7 +1252,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_DATETIME;
-            U2S( HID_FUNC_OSTERSONNTAG );
+            HID_FUNC_OSTERSONNTAG;
             1;  0;
             0;
         };
@@ -1284,7 +1276,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_BW );
+            HID_FUNC_BW;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -1340,7 +1332,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_ZW );
+            HID_FUNC_ZW;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -1396,7 +1388,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_ZZR );
+            HID_FUNC_ZZR;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -1452,7 +1444,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_RMZ );
+            HID_FUNC_RMZ;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -1508,7 +1500,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_ZINS );
+            HID_FUNC_ZINS;
             6;  0;  0;  0;  1;  1;  1;
             0;
         };
@@ -1572,7 +1564,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_ZINSZ );
+            HID_FUNC_ZINSZ;
             6;  0;  0;  0;  0;  1;  1;
             0;
         };
@@ -1636,7 +1628,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_KAPZ );
+            HID_FUNC_KAPZ;
             6;  0;  0;  0;  0;  1;  1;
             0;
         };
@@ -1700,7 +1692,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_KUMKAPITAL );
+            HID_FUNC_KUMKAPITAL;
             6;  0;  0;  0;  0;  0;  0;
             0;
         };
@@ -1764,7 +1756,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_KUMZINSZ );
+            HID_FUNC_KUMZINSZ;
             6;  0;  0;  0;  0;  0;  0;
             0;
         };
@@ -1828,7 +1820,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_DIA );
+            HID_FUNC_DIA;
             4;  0;  0;  0;  0;
             0;
         };
@@ -1876,7 +1868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_LIA );
+            HID_FUNC_LIA;
             3;  0;  0;  0;
             0;
         };
@@ -1916,7 +1908,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_GDA );
+            HID_FUNC_GDA;
             5;  0;  0;  0;  0;  1;
             0;
         };
@@ -1972,7 +1964,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_GDA2 );
+            HID_FUNC_GDA2;
             5;  0;  0;  0;  0;  1;
             0;
         };
@@ -2028,7 +2020,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_VDB );
+            HID_FUNC_VDB;
             7;  0;  0;  0;  0;  0;  1;  1;
             0;
         };
@@ -2100,7 +2092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_EFFEKTIV );
+            HID_FUNC_EFFEKTIV;
             2;  0;  0;
             0;
         };
@@ -2132,7 +2124,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_NOMINAL );
+            HID_FUNC_NOMINAL;
             2;  0;  0;
             0;
         };
@@ -2164,7 +2156,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_NBW );
+            HID_FUNC_NBW;
             VAR_ARGS+1; 0;  0;
             0;
         };
@@ -2196,7 +2188,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_IKV );
+            HID_FUNC_IKV;
             2;  0;  1;
             0;
         };
@@ -2228,7 +2220,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_QIKV );
+            HID_FUNC_QIKV;
             3;  0;  0;  0;
             0;
         };
@@ -2268,7 +2260,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_ISPMT );
+            HID_FUNC_ISPMT;
             4;  0;  0;  0;  0;
             0;
         };
@@ -2316,7 +2308,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_LAUFZEIT );
+            HID_FUNC_LAUFZEIT;
             3;  0;  0;  0;
             0;
         };
@@ -2356,7 +2348,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_FINANZ;
-            U2S( HID_FUNC_ZGZ );
+            HID_FUNC_ZGZ;
             3;  0;  0;  0;
             0;
         };
@@ -2396,7 +2388,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTBEZUG );
+            HID_FUNC_ISTBEZUG;
             1;  0;
             0;
         };
@@ -2420,7 +2412,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTFEHL );
+            HID_FUNC_ISTFEHL;
             1;  0;
             0;
         };
@@ -2444,7 +2436,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTFEHLER );
+            HID_FUNC_ISTFEHLER;
             1;  0;
             0;
         };
@@ -2468,7 +2460,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTLEER );
+            HID_FUNC_ISTLEER;
             1;  0;
             0;
         };
@@ -2492,7 +2484,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTLOG );
+            HID_FUNC_ISTLOG;
             1;  0;
             0;
         };
@@ -2516,7 +2508,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTNV );
+            HID_FUNC_ISTNV;
             1;  0;
             0;
         };
@@ -2540,7 +2532,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTKTEXT );
+            HID_FUNC_ISTKTEXT;
             1;  0;
             0;
         };
@@ -2564,7 +2556,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTTEXT );
+            HID_FUNC_ISTTEXT;
             1;  0;
             0;
         };
@@ -2588,7 +2580,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTZAHL );
+            HID_FUNC_ISTZAHL;
             1;  0;
             0;
         };
@@ -2612,7 +2604,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTFORMEL );
+            HID_FUNC_ISTFORMEL;
             1;  0;
             0;
         };
@@ -2636,7 +2628,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_FORMEL );
+            HID_FUNC_FORMEL;
             1;  0;
             0;
         };
@@ -2660,7 +2652,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_N );
+            HID_FUNC_N;
             1;  0;
             0;
         };
@@ -2684,7 +2676,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_NV );
+            HID_FUNC_NV;
             0;
             0;
         };
@@ -2700,7 +2692,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_TYP );
+            HID_FUNC_TYP;
             1;  0;
             0;
         };
@@ -2724,7 +2716,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ZELLE );
+            HID_FUNC_ZELLE;
             2;  0;  1;
             0;
         };
@@ -2756,7 +2748,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_AKTUELL );
+            HID_FUNC_AKTUELL;
             0;
             0;
         };
@@ -2772,7 +2764,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_FALSCH );
+            HID_FUNC_FALSCH;
             0;
             0;
         };
@@ -2788,7 +2780,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_NICHT );
+            HID_FUNC_NICHT;
             1;  0;
             0;
         };
@@ -2812,7 +2804,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_WAHR );
+            HID_FUNC_WAHR;
             0;
             0;
         };
@@ -2828,7 +2820,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_WENN );
+            HID_FUNC_WENN;
             3;  0;  1;  1;
             0;
         };
@@ -2868,7 +2860,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_IFERROR );
+            HID_FUNC_IFERROR;
             2;  0;  0;
             0;
         };
@@ -2900,7 +2892,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_IFNA );
+            HID_FUNC_IFNA;
             2;  0;  0;
             0;
         };
@@ -2932,7 +2924,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_ODER );
+            HID_FUNC_ODER;
             VAR_ARGS;   0;
             0;
         };
@@ -2956,7 +2948,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_XOR );
+            HID_FUNC_XOR;
             VAR_ARGS;  0;
             0;
         };
@@ -2980,7 +2972,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_LOGIC;
-            U2S( HID_FUNC_UND );
+            HID_FUNC_UND;
             VAR_ARGS;   0;
             0;
         };
@@ -3004,7 +2996,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ABS );
+            HID_FUNC_ABS;
             1;  0;
             0;
         };
@@ -3028,7 +3020,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_POTENZ );
+            HID_FUNC_POTENZ;
             2;  0;  0;
             0;
         };
@@ -3060,7 +3052,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ANZAHLLEEREZELLEN );
+            HID_FUNC_ANZAHLLEEREZELLEN;
             1;  0;
             0;
         };
@@ -3084,7 +3076,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_PI );
+            HID_FUNC_PI;
             0;
             0;
         };
@@ -3100,7 +3092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_SUMME );
+            HID_FUNC_SUMME;
             VAR_ARGS;   0;
             0;
         };
@@ -3124,7 +3116,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_QUADRATESUMME );
+            HID_FUNC_QUADRATESUMME;
             VAR_ARGS;   0;
             0;
         };
@@ -3148,7 +3140,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_PRODUKT );
+            HID_FUNC_PRODUKT;
             VAR_ARGS;   0;
             0;
         };
@@ -3172,7 +3164,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_SUMMEWENN );
+            HID_FUNC_SUMMEWENN;
             3;  0;  0;  1;
             0;
         };
@@ -3213,7 +3205,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_AVERAGEIF );
+            HID_FUNC_AVERAGEIF;
             3;  0;  0;  1;
             0;
         };
@@ -3253,7 +3245,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_SUMIFS );
+            HID_FUNC_SUMIFS;
             PAIRED_VAR_ARGS+1;  0;  0;  0;
             0;
         };
@@ -3294,7 +3286,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_AVERAGEIFS );
+            HID_FUNC_AVERAGEIFS;
             PAIRED_VAR_ARGS+1;  0;  0;  0;
             0;
         };
@@ -3335,7 +3327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_COUNTIFS );
+            HID_FUNC_COUNTIFS;
             PAIRED_VAR_ARGS;    0;  0;
             0;
         };
@@ -3368,7 +3360,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ZAEHLENWENN );
+            HID_FUNC_ZAEHLENWENN;
             2;  0;  0;
             0;
         };
@@ -3400,7 +3392,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_WURZEL );
+            HID_FUNC_WURZEL;
             1;  0;
             0;
         };
@@ -3424,7 +3416,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ZUFALLSZAHL );
+            HID_FUNC_ZUFALLSZAHL;
             0;
             0;
         };
@@ -3440,7 +3432,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTGERADE );
+            HID_FUNC_ISTGERADE;
             1;  0;
             0;
         };
@@ -3464,7 +3456,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_ISTUNGERADE );
+            HID_FUNC_ISTUNGERADE;
             1;  0;
             0;
         };
@@ -3488,7 +3480,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_KOMBINATIONEN );
+            HID_FUNC_KOMBINATIONEN;
             2;  0;  0;
             0;
         };
@@ -3520,7 +3512,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_KOMBINATIONEN2 );
+            HID_FUNC_KOMBINATIONEN2;
             2;  0;  0;
             0;
         };
@@ -3552,7 +3544,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARCCOS );
+            HID_FUNC_ARCCOS;
             1;  0;
             0;
         };
@@ -3576,7 +3568,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARCSIN );
+            HID_FUNC_ARCSIN;
             1;  0;
             0;
         };
@@ -3600,7 +3592,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARCOSHYP );
+            HID_FUNC_ARCOSHYP;
             1;  0;
             0;
         };
@@ -3624,7 +3616,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARSINHYP );
+            HID_FUNC_ARSINHYP;
             1;  0;
             0;
         };
@@ -3648,7 +3640,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARCCOT );
+            HID_FUNC_ARCCOT;
             1;  0;
             0;
         };
@@ -3672,7 +3664,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARCTAN );
+            HID_FUNC_ARCTAN;
             1;  0;
             0;
         };
@@ -3696,7 +3688,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARCOTHYP );
+            HID_FUNC_ARCOTHYP;
             1;  0;
             0;
         };
@@ -3720,7 +3712,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARTANHYP );
+            HID_FUNC_ARTANHYP;
             1;  0;
             0;
         };
@@ -3744,7 +3736,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_COS );
+            HID_FUNC_COS;
             1;  0;
             0;
         };
@@ -3768,7 +3760,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_SIN );
+            HID_FUNC_SIN;
             1;  0;
             0;
         };
@@ -3792,7 +3784,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_COT );
+            HID_FUNC_COT;
             1;  0;
             0;
         };
@@ -3816,7 +3808,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_TAN );
+            HID_FUNC_TAN;
             1;  0;
             0;
         };
@@ -3840,7 +3832,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_COSHYP );
+            HID_FUNC_COSHYP;
             1;  0;
             0;
         };
@@ -3864,7 +3856,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_SINHYP );
+            HID_FUNC_SINHYP;
             1;  0;
             0;
         };
@@ -3888,7 +3880,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_COTHYP );
+            HID_FUNC_COTHYP;
             1;  0;
             0;
         };
@@ -3912,7 +3904,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_TANHYP );
+            HID_FUNC_TANHYP;
             1;  0;
             0;
         };
@@ -3936,7 +3928,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ARCTAN2 );
+            HID_FUNC_ARCTAN2;
             2;  0;  0;
             0;
         };
@@ -3969,7 +3961,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_COSECANT );
+            HID_FUNC_COSECANT;
             1; 0;
             0;
         };
@@ -3994,7 +3986,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_SECANT );
+            HID_FUNC_SECANT;
             1; 0;
             0;
         };
@@ -4018,7 +4010,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_COSECANTHYP );
+            HID_FUNC_COSECANTHYP;
             1; 0;
             0;
         };
@@ -4042,7 +4034,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_SECANTHYP );
+            HID_FUNC_SECANTHYP;
             1; 0;
             0;
         };
@@ -4067,7 +4059,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_DEG );
+            HID_FUNC_DEG;
             1;  0;
             0;
         };
@@ -4091,7 +4083,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_RAD );
+            HID_FUNC_RAD;
             1;  0;
             0;
         };
@@ -4115,7 +4107,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_EXP );
+            HID_FUNC_EXP;
             1;  0;
             0;
         };
@@ -4139,7 +4131,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_LOG );
+            HID_FUNC_LOG;
             2;  0;  1;
             0;
         };
@@ -4171,7 +4163,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_LN );
+            HID_FUNC_LN;
             1;  0;
             0;
         };
@@ -4195,7 +4187,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_LOG10 );
+            HID_FUNC_LOG10;
             1;  0;
             0;
         };
@@ -4219,7 +4211,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_FAKULTAET );
+            HID_FUNC_FAKULTAET;
             1;  0;
             0;
         };
@@ -4243,7 +4235,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_REST );
+            HID_FUNC_REST;
             2;  0;  0;
             0;
         };
@@ -4275,7 +4267,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_VORZEICHEN );
+            HID_FUNC_VORZEICHEN;
             1;  0;
             0;
         };
@@ -4299,7 +4291,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_TEILERGEBNIS );
+            HID_FUNC_TEILERGEBNIS;
             2;  0;  0;
             0;
         };
@@ -4331,7 +4323,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_AGGREGATE );
+            HID_FUNC_AGGREGATE;
             VAR_ARGS+3;  0;  0;  0; 1;
             0;
         };
@@ -4379,7 +4371,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_GANZZAHL );
+            HID_FUNC_GANZZAHL;
             1;  0;
             0;
         };
@@ -4403,7 +4395,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_KUERZEN );
+            HID_FUNC_KUERZEN;
             2;  0;  0;
             0;
         };
@@ -4435,7 +4427,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_RUNDEN );
+            HID_FUNC_RUNDEN;
             2;  0;  1;
             0;
         };
@@ -4467,7 +4459,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_AUFRUNDEN );
+            HID_FUNC_AUFRUNDEN;
             2;  0;  1;
             0;
         };
@@ -4499,7 +4491,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_ABRUNDEN );
+            HID_FUNC_ABRUNDEN;
             2;  0;  1;
             0;
         };
@@ -4531,7 +4523,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_GERADE );
+            HID_FUNC_GERADE;
             1;  0;
             0;
         };
@@ -4555,7 +4547,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_UNGERADE );
+            HID_FUNC_UNGERADE;
             1;  0;
             0;
         };
@@ -4579,7 +4571,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_CEIL_MS );
+            HID_FUNC_CEIL_MS;
             2;  0;  0;
             0;
         };
@@ -4611,7 +4603,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_CEIL_PRECISE );
+            HID_FUNC_CEIL_PRECISE;
             2;  0;  1;
             0;
         };
@@ -4643,7 +4635,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_CEIL_ISO );
+            HID_FUNC_CEIL_ISO;
             2;  0;  1;
             0;
         };
@@ -4675,7 +4667,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_OBERGRENZE );
+            HID_FUNC_OBERGRENZE;
             3;  0;  1;  1;
             0;
         };
@@ -4715,7 +4707,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_CEIL_MATH );
+            HID_FUNC_CEIL_MATH;
             3;  0;  1;  1;
             0;
         };
@@ -4755,7 +4747,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_UNTERGRENZE );
+            HID_FUNC_UNTERGRENZE;
             3;  0;  1;  1;
             0;
         };
@@ -4795,7 +4787,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_FLOOR_MS );
+            HID_FUNC_FLOOR_MS;
             2;  0;  0;
             0;
         };
@@ -4827,7 +4819,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_FLOOR_MATH );
+            HID_FUNC_FLOOR_MATH;
             3;  0;  1;  1;
             0;
         };
@@ -4867,7 +4859,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_FLOOR_PRECISE );
+            HID_FUNC_FLOOR_PRECISE;
             2;  0;  1;
             0;
         };
@@ -4899,7 +4891,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_GGT );
+            HID_FUNC_GGT;
             VAR_ARGS;   0;
             0;
         };
@@ -4923,7 +4915,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_KGV );
+            HID_FUNC_KGV;
             VAR_ARGS;   0;
             0;
         };
@@ -4947,7 +4939,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_MTRANS );
+            HID_FUNC_MTRANS;
             1;  0;
             0;
         };
@@ -4971,7 +4963,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_MMULT );
+            HID_FUNC_MMULT;
             2;  0;  0;
             0;
         };
@@ -5003,7 +4995,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_MDET );
+            HID_FUNC_MDET;
             1;  0;
             0;
         };
@@ -5027,7 +5019,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_MINV );
+            HID_FUNC_MINV;
             1;  0;
             0;
         };
@@ -5051,7 +5043,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_EINHEITSMATRIX );
+            HID_FUNC_EINHEITSMATRIX;
             1;  0;
             0;
         };
@@ -5075,7 +5067,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_SUMMENPRODUKT );
+            HID_FUNC_SUMMENPRODUKT;
             VAR_ARGS;   0;
             0;
         };
@@ -5099,7 +5091,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_SUMMEX2MY2 );
+            HID_FUNC_SUMMEX2MY2;
             2;  0;  0;
             0;
         };
@@ -5131,7 +5123,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_SUMMEX2PY2 );
+            HID_FUNC_SUMMEX2PY2;
             2;  0;  0;
             0;
         };
@@ -5163,7 +5155,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_SUMMEXMY2 );
+            HID_FUNC_SUMMEXMY2;
             2;  0;  0;
             0;
         };
@@ -5199,7 +5191,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_HAEUFIGKEIT );
+            HID_FUNC_HAEUFIGKEIT;
             2;  0;  0;
             0;
         };
@@ -5231,7 +5223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_RGP );
+            HID_FUNC_RGP;
             4;  0;  1;  1;  1;
             0;
         };
@@ -5279,7 +5271,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_RKP );
+            HID_FUNC_RKP;
             4;  0;  1;  1;  1;
             0;
         };
@@ -5327,7 +5319,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_TREND );
+            HID_FUNC_TREND;
             4;  0;  1;  1;  1;
             0;
         };
@@ -5375,7 +5367,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATRIX;
-            U2S( HID_FUNC_VARIATION );
+            HID_FUNC_VARIATION;
             4;  0;  1;  1;  1;
             0;
         };
@@ -5423,7 +5415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ANZAHL );
+            HID_FUNC_ANZAHL;
             VAR_ARGS;   0;
             0;
         };
@@ -5447,7 +5439,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ANZAHL2 );
+            HID_FUNC_ANZAHL2;
             VAR_ARGS;   0;
             0;
         };
@@ -5471,7 +5463,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MAX );
+            HID_FUNC_MAX;
             VAR_ARGS;   0;
             0;
         };
@@ -5495,7 +5487,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MAXA );
+            HID_FUNC_MAXA;
             VAR_ARGS;   0;
             0;
         };
@@ -5519,7 +5511,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MIN );
+            HID_FUNC_MIN;
             VAR_ARGS;   0;
             0;
         };
@@ -5543,7 +5535,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MINA );
+            HID_FUNC_MINA;
             VAR_ARGS;   0;
             0;
         };
@@ -5567,7 +5559,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VARIANZ );
+            HID_FUNC_VARIANZ;
             VAR_ARGS;   0;
             0;
         };
@@ -5591,7 +5583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VAR_S );
+            HID_FUNC_VAR_S;
             VAR_ARGS;   0;
             0;
         };
@@ -5615,7 +5607,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VARIANZA );
+            HID_FUNC_VARIANZA;
             VAR_ARGS;   0;
             0;
         };
@@ -5639,7 +5631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VARIANZEN );
+            HID_FUNC_VARIANZEN;
             VAR_ARGS;   0;
             0;
         };
@@ -5663,7 +5655,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VAR_P_MS );
+            HID_FUNC_VAR_P_MS;
             VAR_ARGS;   0;
             0;
         };
@@ -5687,7 +5679,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VARIANZENA );
+            HID_FUNC_VARIANZENA;
             VAR_ARGS;   0;
             0;
         };
@@ -5711,7 +5703,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STABW );
+            HID_FUNC_STABW;
             VAR_ARGS;   0;
             0;
         };
@@ -5735,7 +5727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ST_DEV_S );
+            HID_FUNC_ST_DEV_S;
             VAR_ARGS;   0;
             0;
         };
@@ -5759,7 +5751,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STABWA );
+            HID_FUNC_STABWA;
             VAR_ARGS;   0;
             0;
         };
@@ -5783,7 +5775,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STABWN );
+            HID_FUNC_STABWN;
             VAR_ARGS;   0;
             0;
         };
@@ -5807,7 +5799,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ST_DEV_P_MS );
+            HID_FUNC_ST_DEV_P_MS;
             VAR_ARGS;   0;
             0;
         };
@@ -5831,7 +5823,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STABWNA );
+            HID_FUNC_STABWNA;
             VAR_ARGS;   0;
             0;
         };
@@ -5855,7 +5847,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MITTELWERT );
+            HID_FUNC_MITTELWERT;
             VAR_ARGS;   0;
             0;
         };
@@ -5879,7 +5871,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MITTELWERTA );
+            HID_FUNC_MITTELWERTA;
             VAR_ARGS;   0;
             0;
         };
@@ -5903,7 +5895,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_SUMQUADABW );
+            HID_FUNC_SUMQUADABW;
             VAR_ARGS;   0;
             0;
         };
@@ -5927,7 +5919,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MITTELABW );
+            HID_FUNC_MITTELABW;
             VAR_ARGS;   0;
             0;
         };
@@ -5951,7 +5943,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_SCHIEFE );
+            HID_FUNC_SCHIEFE;
             VAR_ARGS;   0;
             0;
         };
@@ -5975,7 +5967,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_SKEWP );
+            HID_FUNC_SKEWP;
             VAR_ARGS;   0;
             0;
         };
@@ -5999,7 +5991,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_KURT );
+            HID_FUNC_KURT;
             VAR_ARGS;   0;
             0;
         };
@@ -6023,7 +6015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GEOMITTEL );
+            HID_FUNC_GEOMITTEL;
             VAR_ARGS;   0;
             0;
         };
@@ -6047,7 +6039,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_HARMITTEL );
+            HID_FUNC_HARMITTEL;
             VAR_ARGS;   0;
             0;
         };
@@ -6071,7 +6063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MODALWERT );
+            HID_FUNC_MODALWERT;
             VAR_ARGS;   0;
             0;
         };
@@ -6095,7 +6087,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MODAL_VALUE_MS );
+            HID_FUNC_MODAL_VALUE_MS;
             VAR_ARGS;   0;
             0;
         };
@@ -6119,7 +6111,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MODAL_VALUE_MULTI );
+            HID_FUNC_MODAL_VALUE_MULTI;
             VAR_ARGS;   0;
             0;
         };
@@ -6143,7 +6135,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_MEDIAN );
+            HID_FUNC_MEDIAN;
             VAR_ARGS;   0;
             0;
         };
@@ -6167,7 +6159,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_QUANTIL );
+            HID_FUNC_QUANTIL;
             2;  0;  0;
             0;
         };
@@ -6199,7 +6191,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_PERCENTILE_EXC );
+            HID_FUNC_PERCENTILE_EXC;
             2;  0;  0;
             0;
         };
@@ -6231,7 +6223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_PERCENTILE_INC );
+            HID_FUNC_PERCENTILE_INC;
             2;  0;  0;
             0;
         };
@@ -6263,7 +6255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_QUARTILE );
+            HID_FUNC_QUARTILE;
             2;  0;  0;
             0;
         };
@@ -6295,7 +6287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_QUARTILE_EXC );
+            HID_FUNC_QUARTILE_EXC;
             2;  0;  0;
             0;
         };
@@ -6327,7 +6319,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_QUARTILE_INC );
+            HID_FUNC_QUARTILE_INC;
             2;  0;  0;
             0;
         };
@@ -6359,7 +6351,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_KGROESSTE );
+            HID_FUNC_KGROESSTE;
             2;  0;  0;
             0;
         };
@@ -6391,7 +6383,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_KKLEINSTE );
+            HID_FUNC_KKLEINSTE;
             2;  0;  0;
             0;
         };
@@ -6423,7 +6415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_QUANTILSRANG );
+            HID_FUNC_QUANTILSRANG;
             3;  0;  0;  1;
             0;
         };
@@ -6463,7 +6455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_PERCENTRANK_EXC );
+            HID_FUNC_PERCENTRANK_EXC;
             3;  0;  0;  1;
             0;
         };
@@ -6503,7 +6495,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_PERCENTRANK_INC );
+            HID_FUNC_PERCENTRANK_INC;
             3;  0;  0;  1;
             0;
         };
@@ -6543,7 +6535,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_RANG );
+            HID_FUNC_RANG;
             3;  0;  0;  1;
             0;
         };
@@ -6583,7 +6575,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_RANK_EQ );
+            HID_FUNC_RANK_EQ;
             3;  0;  0;  1;
             0;
         };
@@ -6623,7 +6615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_RANK_AVG );
+            HID_FUNC_RANK_AVG;
             3;  0;  0;  1;
             0;
         };
@@ -6663,7 +6655,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GESTUTZTMITTEL );
+            HID_FUNC_GESTUTZTMITTEL;
             2;  0;  0;
             0;
         };
@@ -6695,7 +6687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_WAHRSCHBEREICH );
+            HID_FUNC_WAHRSCHBEREICH;
             4;  0;  0;  0;  1;
             0;
         };
@@ -6743,7 +6735,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_B );
+            HID_FUNC_B;
             4;  0;  0;  0;  1;
             0;
         };
@@ -6791,7 +6783,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_PHI );
+            HID_FUNC_PHI;
             1;  0;
             0;
         };
@@ -6815,7 +6807,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAUSS );
+            HID_FUNC_GAUSS;
             1;  0;
             0;
         };
@@ -6839,7 +6831,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_FISHER );
+            HID_FUNC_FISHER;
             1;  0;
             0;
         };
@@ -6863,7 +6855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_FISHERINV );
+            HID_FUNC_FISHERINV;
             1;  0;
             0;
         };
@@ -6887,7 +6879,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BINOMVERT );
+            HID_FUNC_BINOMVERT;
             4;  0;  0;  0;  0;
             0;
         };
@@ -6935,7 +6927,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BINOM_DIST_MS );
+            HID_FUNC_BINOM_DIST_MS;
             4;  0;  0;  0;  0;
             0;
         };
@@ -6983,7 +6975,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_NEGBINOMVERT );
+            HID_FUNC_NEGBINOMVERT;
             3;  0;  0;  0;
             0;
         };
@@ -7023,7 +7015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_NEGBINOMDIST_MS );
+            HID_FUNC_NEGBINOMDIST_MS;
             4;  0;  0;  0;  0;
             0;
         };
@@ -7071,7 +7063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_KRITBINOM );
+            HID_FUNC_KRITBINOM;
             3;  0;  0;  0;
             0;
         };
@@ -7111,7 +7103,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BINOM_INV_MS );
+            HID_FUNC_BINOM_INV_MS;
             3;  0;  0;  0;
             0;
         };
@@ -7151,7 +7143,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_POISSON );
+            HID_FUNC_POISSON;
             3;  0;  0;  1;
             0;
         };
@@ -7191,7 +7183,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_POISSON_DIST_MS );
+            HID_FUNC_POISSON_DIST_MS;
             3;  0;  0;  1;
             0;
         };
@@ -7231,7 +7223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_NORMVERT );
+            HID_FUNC_NORMVERT;
             4;  0;  0;  0;  1;
             0;
         };
@@ -7279,7 +7271,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_NORMDIST_MS );
+            HID_FUNC_NORMDIST_MS;
             4;  0;  0;  0;  0;
             0;
         };
@@ -7327,7 +7319,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_NORMINV );
+            HID_FUNC_NORMINV;
             3;  0;  0;  0;
             0;
         };
@@ -7367,7 +7359,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_NORMINV_MS );
+            HID_FUNC_NORMINV_MS;
             3;  0;  0;  0;
             0;
         };
@@ -7407,7 +7399,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STANDNORMVERT );
+            HID_FUNC_STANDNORMVERT;
             1;  0;
             0;
         };
@@ -7431,7 +7423,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STD_NORMDIST_MS );
+            HID_FUNC_STD_NORMDIST_MS;
             2;  0; 0;
             0;
         };
@@ -7463,7 +7455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STANDNORMINV );
+            HID_FUNC_STANDNORMINV;
             1;  0;
             0;
         };
@@ -7487,7 +7479,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STD_NORMINV_MS );
+            HID_FUNC_STD_NORMINV_MS;
             1;  0;
             0;
         };
@@ -7511,7 +7503,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_LOGNORMVERT );
+            HID_FUNC_LOGNORMVERT;
             4;  0;  1;  1;  1;
             0;
         };
@@ -7559,7 +7551,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_LOGNORMDIST_MS );
+            HID_FUNC_LOGNORMDIST_MS;
             4;  0;  0;  0;  0;
             0;
         };
@@ -7607,7 +7599,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_LOGINV );
+            HID_FUNC_LOGINV;
             3;  0;  0;  0;
             0;
         };
@@ -7647,7 +7639,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_LOGINV );
+            HID_FUNC_LOGINV;
             3;  0;  0;  0;
             0;
         };
@@ -7687,7 +7679,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_EXPONVERT );
+            HID_FUNC_EXPONVERT;
             3;  0;  0;  0;
             0;
         };
@@ -7727,7 +7719,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_EXP_DIST_MS );
+            HID_FUNC_EXP_DIST_MS;
             3;  0;  0;  0;
             0;
         };
@@ -7767,7 +7759,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAMMAVERT );
+            HID_FUNC_GAMMAVERT;
             4;  0;  0;  0;  1;
             0;
         };
@@ -7815,7 +7807,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAMMADIST_MS );
+            HID_FUNC_GAMMADIST_MS;
             4;  0;  0;  0;  0;
             0;
         };
@@ -7863,7 +7855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAMMAINV );
+            HID_FUNC_GAMMAINV;
             3;  0;  0;  0;
             0;
         };
@@ -7903,7 +7895,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAMMAINV_MS );
+            HID_FUNC_GAMMAINV_MS;
             3;  0;  0;  0;
             0;
         };
@@ -7943,7 +7935,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAMMALN );
+            HID_FUNC_GAMMALN;
             1;  0;
             0;
         };
@@ -7967,7 +7959,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAMMALN_MS );
+            HID_FUNC_GAMMALN_MS;
             1;  0;
             0;
         };
@@ -7992,7 +7984,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GAMMA );
+            HID_FUNC_GAMMA;
             1;  0;
             0;
         };
@@ -8017,7 +8009,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BETAVERT );
+            HID_FUNC_BETAVERT;
             6;  0;  0;  0;  1;  1;  1;
             0;
         };
@@ -8081,7 +8073,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BETAINV );
+            HID_FUNC_BETAINV;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -8137,7 +8129,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BETADIST_MS );
+            HID_FUNC_BETADIST_MS;
             6;  0;  0;  0;  0;  1;  1;
             0;
         };
@@ -8201,7 +8193,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BETAINV_MS );
+            HID_FUNC_BETAINV_MS;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -8257,7 +8249,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_WEIBULL );
+            HID_FUNC_WEIBULL;
             4;  0;  0;  0;  0;
             0;
         };
@@ -8305,7 +8297,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_WEIBULL_DIST_MS );
+            HID_FUNC_WEIBULL_DIST_MS;
             4;  0;  0;  0;  0;
             0;
         };
@@ -8353,7 +8345,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_HYPGEOMVERT );
+            HID_FUNC_HYPGEOMVERT;
             4;  0;  0;  0;  0;
             0;
         };
@@ -8401,7 +8393,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_HYP_GEOM_DIST_MS );
+            HID_FUNC_HYP_GEOM_DIST_MS;
             5;  0;  0;  0;  0;  0;
             0;
         };
@@ -8457,7 +8449,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TVERT );
+            HID_FUNC_TVERT;
             3;  0;  0;  0;
             0;
         };
@@ -8497,7 +8489,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TDIST_2T );
+            HID_FUNC_TDIST_2T;
             2;  0;  0;
             0;
         };
@@ -8529,7 +8521,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TDIST_MS );
+            HID_FUNC_TDIST_MS;
             3;  0;  0;  0;
             0;
         };
@@ -8569,7 +8561,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TDIST_RT );
+            HID_FUNC_TDIST_RT;
             2;  0;  0;
             0;
         };
@@ -8601,7 +8593,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TINV );
+            HID_FUNC_TINV;
             2;  0;  0;
             0;
         };
@@ -8633,7 +8625,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TINV_MS );
+            HID_FUNC_TINV_MS;
             2;  0;  0;
             0;
         };
@@ -8665,7 +8657,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TINV_2T );
+            HID_FUNC_TINV_2T;
             2;  0;  0;
             0;
         };
@@ -8697,7 +8689,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_FVERT );
+            HID_FUNC_FVERT;
             3;  0;  0;  0;
             0;
         };
@@ -8737,7 +8729,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_F_DIST_LT );
+            HID_FUNC_F_DIST_LT;
             4;  0;  0;  0; 1;
             0;
         };
@@ -8785,7 +8777,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_F_DIST_RT );
+            HID_FUNC_F_DIST_RT;
             3;  0;  0;  0;
             0;
         };
@@ -8825,7 +8817,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_FINV );
+            HID_FUNC_FINV;
             3;  0;  0;  0;
             0;
         };
@@ -8865,7 +8857,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_F_INV_LT );
+            HID_FUNC_F_INV_LT;
             3;  0;  0;  0;
             0;
         };
@@ -8905,7 +8897,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_F_INV_RT );
+            HID_FUNC_F_INV_RT;
             3;  0;  0;  0;
             0;
         };
@@ -8945,7 +8937,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHIVERT );
+            HID_FUNC_CHIVERT;
             2;  0;  0;
             0;
         };
@@ -8977,7 +8969,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHIVERT_MS );
+            HID_FUNC_CHIVERT_MS;
             2;  0;  0;
             0;
         };
@@ -9010,7 +9002,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHISQDIST );
+            HID_FUNC_CHISQDIST;
             3;  0;  0;  1;
             0;
         };
@@ -9051,7 +9043,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHISQDIST_MS );
+            HID_FUNC_CHISQDIST_MS;
             3;  0;  0;  0;
             0;
         };
@@ -9092,7 +9084,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHIINV );
+            HID_FUNC_CHIINV;
             2;  0;  0;
             0;
         };
@@ -9125,7 +9117,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHIINV_MS );
+            HID_FUNC_CHIINV_MS;
             2;  0;  0;
             0;
         };
@@ -9158,7 +9150,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHISQINV );
+            HID_FUNC_CHISQINV;
             2;  0;  0;
             0;
         };
@@ -9191,7 +9183,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHISQINV_MS );
+            HID_FUNC_CHISQINV_MS;
             2;  0;  0;
             0;
         };
@@ -9224,7 +9216,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STANDARDISIERUNG );
+            HID_FUNC_STANDARDISIERUNG;
             3;  0;  0;  0;
             0;
         };
@@ -9264,7 +9256,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VARIATIONEN );
+            HID_FUNC_VARIATIONEN;
             2;  0;  0;
             0;
         };
@@ -9296,7 +9288,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_VARIATIONEN2 );
+            HID_FUNC_VARIATIONEN2;
             2;  0;  0;
             0;
         };
@@ -9328,7 +9320,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_KONFIDENZ );
+            HID_FUNC_KONFIDENZ;
             3;  0;  0;  0;
             0;
         };
@@ -9368,7 +9360,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CONFIDENCE_N );
+            HID_FUNC_CONFIDENCE_N;
             3;  0;  0;  0;
             0;
         };
@@ -9408,7 +9400,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CONFIDENCE_T );
+            HID_FUNC_CONFIDENCE_T;
             3;  0;  0;  0;
             0;
         };
@@ -9448,7 +9440,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_GTEST );
+            HID_FUNC_GTEST;
             3;  0;  0;  1;
             0;
         };
@@ -9488,7 +9480,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_Z_TEST_MS );
+            HID_FUNC_Z_TEST_MS;
             3;  0;  0;  1;
             0;
         };
@@ -9528,7 +9520,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHITEST );
+            HID_FUNC_CHITEST;
             2;  0;  0;
             0;
         };
@@ -9560,7 +9552,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_CHITEST_MS );
+            HID_FUNC_CHITEST_MS;
             2;  0;  0;
             0;
         };
@@ -9592,7 +9584,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_FTEST );
+            HID_FUNC_FTEST;
             2;  0;  0;
             0;
         };
@@ -9624,7 +9616,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_F_TEST_MS );
+            HID_FUNC_F_TEST_MS;
             2;  0;  0;
             0;
         };
@@ -9656,7 +9648,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TTEST );
+            HID_FUNC_TTEST;
             4;  0;  0;  0;  0;
             0;
         };
@@ -9704,7 +9696,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_TTEST_MS );
+            HID_FUNC_TTEST_MS;
             4;  0;  0;  0;  0;
             0;
         };
@@ -9752,7 +9744,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_BESTIMMTHEITSMASS );
+            HID_FUNC_BESTIMMTHEITSMASS;
             2;  0;  0;
             0;
         };
@@ -9784,7 +9776,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ACHSENABSCHNITT );
+            HID_FUNC_ACHSENABSCHNITT;
             2;  0;  0;
             0;
         };
@@ -9816,7 +9808,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STEIGUNG );
+            HID_FUNC_STEIGUNG;
             2;  0;  0;
             0;
         };
@@ -9848,7 +9840,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_STFEHLERYX );
+            HID_FUNC_STFEHLERYX;
             2;  0;  0;
             0;
         };
@@ -9880,7 +9872,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_PEARSON );
+            HID_FUNC_PEARSON;
             2;  0;  0;
             0;
         };
@@ -9912,7 +9904,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_KORREL );
+            HID_FUNC_KORREL;
             2;  0;  0;
             0;
         };
@@ -9944,7 +9936,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_KOVAR );
+            HID_FUNC_KOVAR;
             2;  0;  0;
             0;
         };
@@ -9976,7 +9968,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_COVARIANCE_P );
+            HID_FUNC_COVARIANCE_P;
             2;  0;  0;
             0;
         };
@@ -10008,7 +10000,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_COVARIANCE_S );
+            HID_FUNC_COVARIANCE_S;
             2;  0;  0;
             0;
         };
@@ -10040,7 +10032,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_SCHAETZER );
+            HID_FUNC_SCHAETZER;
             3;  0;  0;  0;
             0;
         };
@@ -10080,7 +10072,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_ADRESSE );
+            HID_FUNC_ADRESSE;
             5;  0;  0;  1;  1;  1;
             0;
         };
@@ -10138,7 +10130,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_BEREICHE );
+            HID_FUNC_BEREICHE;
             1;  0;
             0;
         };
@@ -10162,7 +10154,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_WAHL );
+            HID_FUNC_WAHL;
             VAR_ARGS+1; 0;  0;
             0;
         };
@@ -10194,7 +10186,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_SPALTE );
+            HID_FUNC_SPALTE;
             1;  1;
             0;
         };
@@ -10218,7 +10210,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_ZEILE );
+            HID_FUNC_ZEILE;
             1;  1;
             0;
         };
@@ -10242,7 +10234,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_TABELLE );
+            HID_FUNC_TABELLE;
             1;  1;
             0;
         };
@@ -10266,7 +10258,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_SPALTEN );
+            HID_FUNC_SPALTEN;
             1;  0;
             0;
         };
@@ -10290,7 +10282,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_ZEILEN );
+            HID_FUNC_ZEILEN;
             1;  0;
             0;
         };
@@ -10314,7 +10306,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_TABELLEN );
+            HID_FUNC_TABELLEN;
             1;  1;
             0;
         };
@@ -10338,7 +10330,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_WVERWEIS );
+            HID_FUNC_WVERWEIS;
             4;  0;  0;  0;  1;
             0;
         };
@@ -10386,7 +10378,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_SVERWEIS );
+            HID_FUNC_SVERWEIS;
             4;  0;  0;  0;  1;
             0;
         };
@@ -10434,7 +10426,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_INDEX );
+            HID_FUNC_INDEX;
             4;  0;  1;  1;  1;
             0;
         };
@@ -10482,7 +10474,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_INDIREKT );
+            HID_FUNC_INDIREKT;
             2;  0;  1;
             0;
         };
@@ -10514,7 +10506,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_VERWEIS );
+            HID_FUNC_VERWEIS;
             3;  0;  0;  1;
             0;
         };
@@ -10554,7 +10546,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_VERGLEICH );
+            HID_FUNC_VERGLEICH;
             3;  0;  0;  1;
             0;
         };
@@ -10594,7 +10586,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_VERSCHIEBUNG );
+            HID_FUNC_VERSCHIEBUNG;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -10650,7 +10642,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_FEHLERTYP );
+            HID_FUNC_FEHLERTYP;
             1;  0;
             0;
         };
@@ -10674,7 +10666,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_ERROR_TYPE_ODF );
+            HID_FUNC_ERROR_TYPE_ODF;
             1;  0;
             0;
         };
@@ -10698,7 +10690,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_VORLAGE );
+            HID_FUNC_VORLAGE;
             3;  0;  1;  1;
             0;
         };
@@ -10738,7 +10730,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_DDE );
+            HID_FUNC_DDE;
             4;  0;  0;  0;  1;
             0;
         };
@@ -10786,7 +10778,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_HYPERLINK );
+            HID_FUNC_HYPERLINK;
             2;  0;  1;
             0;
         };
@@ -10818,7 +10810,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TABLE;
-            U2S( HID_FUNC_GETPIVOTDATA );
+            HID_FUNC_GETPIVOTDATA;
             VAR_ARGS+2;      0; 0;  1;
             0;
         };
@@ -10858,7 +10850,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_BAHTTEXT );
+            HID_FUNC_BAHTTEXT;
             1;  0;
             0;
         };
@@ -10882,7 +10874,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_JIS );
+            HID_FUNC_JIS;
             1;  0;
             0;
         };
@@ -10906,7 +10898,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_ASC );
+            HID_FUNC_ASC;
             1;  0;
             0;
         };
@@ -10930,7 +10922,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_CODE );
+            HID_FUNC_CODE;
             1;  0;
             0;
         };
@@ -10954,7 +10946,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_DM );
+            HID_FUNC_DM;
             2;  0;  1;
             0;
         };
@@ -10986,7 +10978,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_ZEICHEN );
+            HID_FUNC_ZEICHEN;
             1;  0;
             0;
         };
@@ -11010,7 +11002,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_SAEUBERN );
+            HID_FUNC_SAEUBERN;
             1;  0;
             0;
         };
@@ -11034,7 +11026,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_VERKETTEN );
+            HID_FUNC_VERKETTEN;
             VAR_ARGS;   0;
             0;
         };
@@ -11058,7 +11050,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_IDENTISCH );
+            HID_FUNC_IDENTISCH;
             2;  0;  0;
             0;
         };
@@ -11090,7 +11082,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_FINDEN );
+            HID_FUNC_FINDEN;
             3;  0;  0;  1;
             0;
         };
@@ -11130,7 +11122,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_SUCHEN );
+            HID_FUNC_SUCHEN;
             3;  0;  0;  1;
             0;
         };
@@ -11170,7 +11162,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_GLAETTEN );
+            HID_FUNC_GLAETTEN;
             1;  0;
             0;
         };
@@ -11194,7 +11186,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_GROSS2 );
+            HID_FUNC_GROSS2;
             1;  0;
             0;
         };
@@ -11218,7 +11210,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_GROSS );
+            HID_FUNC_GROSS;
             1;  0;
             0;
         };
@@ -11242,7 +11234,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_KLEIN );
+            HID_FUNC_KLEIN;
             1;  0;
             0;
         };
@@ -11266,7 +11258,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_WERT );
+            HID_FUNC_WERT;
             1;  0;
             0;
         };
@@ -11290,7 +11282,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_TEXT );
+            HID_FUNC_TEXT;
             2;  0;  0;
             0;
         };
@@ -11322,7 +11314,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_T );
+            HID_FUNC_T;
             1;  0;
             0;
         };
@@ -11346,7 +11338,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_ERSETZEN );
+            HID_FUNC_ERSETZEN;
             4;  0;  0;  0;  0;
             0;
         };
@@ -11394,7 +11386,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_FEST );
+            HID_FUNC_FEST;
             3;  0;  0;  1;
             0;
         };
@@ -11434,7 +11426,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_LAENGE );
+            HID_FUNC_LAENGE;
             1;  0;
             0;
         };
@@ -11458,7 +11450,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_LINKS );
+            HID_FUNC_LINKS;
             2;  0;  1;
             0;
         };
@@ -11490,7 +11482,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_RECHTS );
+            HID_FUNC_RECHTS;
             2;  0;  1;
             0;
         };
@@ -11522,7 +11514,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_TEIL );
+            HID_FUNC_TEIL;
             3;  0;  0;  0;
             0;
         };
@@ -11562,7 +11554,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_WIEDERHOLEN );
+            HID_FUNC_WIEDERHOLEN;
             2;  0;  0;
             0;
         };
@@ -11594,7 +11586,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_WECHSELN );
+            HID_FUNC_WECHSELN;
             4;  0;  0;  0;  1;
             0;
         };
@@ -11642,7 +11634,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_BASIS );
+            HID_FUNC_BASIS;
             3;  0;  0;  1;
             0;
         };
@@ -11682,7 +11674,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_DEZIMAL );
+            HID_FUNC_DEZIMAL;
             2;  0;  0;
             0;
         };
@@ -11714,7 +11706,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_UMRECHNEN );
+            HID_FUNC_UMRECHNEN;
             3;  0;  0;  0;
             0;
         };
@@ -11754,7 +11746,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_ROEMISCH );
+            HID_FUNC_ROEMISCH;
             2;  0;  1;
             0;
         };
@@ -11786,7 +11778,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_ARABISCH );
+            HID_FUNC_ARABISCH;
             1;  0;
             0;
         };
@@ -11809,7 +11801,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_INFO;
-            U2S( HID_FUNC_INFO );
+            HID_FUNC_INFO;
             1;  0;
             0;
         };
@@ -11832,7 +11824,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_UNICODE );
+            HID_FUNC_UNICODE;
             1;  0;
             0;
         };
@@ -11855,7 +11847,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_UNICHAR );
+            HID_FUNC_UNICHAR;
             1;  0;
             0;
         };
@@ -11878,7 +11870,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;  // DOING
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_EUROCONVERT );
+            HID_FUNC_EUROCONVERT;
             5;  0;  0;  0;  1;  1;
             0;
         };
@@ -11934,7 +11926,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_NUMBERVALUE );
+            HID_FUNC_NUMBERVALUE;
             3;  0; 1; 1;
             0;
         };
@@ -11974,7 +11966,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_BITAND );
+            HID_FUNC_BITAND;
             2;  0;  0;
             0;
         };
@@ -12005,7 +11997,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_BITOR );
+            HID_FUNC_BITOR;
             2;  0;  0;
             0;
         };
@@ -12036,7 +12028,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_BITXOR );
+            HID_FUNC_BITXOR;
             2;  0;  0;
             0;
         };
@@ -12067,7 +12059,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_BITRSHIFT );
+            HID_FUNC_BITRSHIFT;
             2;  0;  0;
             0;
         };
@@ -12098,7 +12090,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_BITLSHIFT );
+            HID_FUNC_BITLSHIFT;
             2;  0;  0;
             0;
         };
@@ -12129,7 +12121,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_LENB );
+            HID_FUNC_LENB;
             1;  0;
             0;
         };
@@ -12152,7 +12144,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_RIGHTB );
+            HID_FUNC_RIGHTB;
             2;  0;  1;
             0;
         };
@@ -12183,7 +12175,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_LEFTB );
+            HID_FUNC_LEFTB;
             2;  0;  1;
             0;
         };
@@ -12214,7 +12206,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_MIDB );
+            HID_FUNC_MIDB;
             3;  0;  0;  0;
             0;
         };
@@ -12249,7 +12241,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_FILTERXML );
+            HID_FUNC_FILTERXML;
             2; 0; 0;
             0;
         };
@@ -12280,7 +12272,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_COLOR );
+            HID_FUNC_COLOR;
             4; 0; 0; 0; 1;
             0;
         };
@@ -12331,7 +12323,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_WEBSERVICE );
+            HID_FUNC_WEBSERVICE;
             1; 0;
             0;
         };
@@ -12354,7 +12346,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_TEXT;
-            U2S( HID_FUNC_ENCODEURL );
+            HID_FUNC_ENCODEURL;
             1; 0;
             0;
         };
@@ -12377,7 +12369,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ERF_MS );
+            HID_FUNC_ERF_MS;
             1; 0;
             0;
         };
@@ -12400,7 +12392,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_STATISTIC;
-            U2S( HID_FUNC_ERFC_MS );
+            HID_FUNC_ERFC_MS;
             1; 0;
             0;
         };
@@ -12423,7 +12415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         {
             0;
             ID_FUNCTION_GRP_MATH;
-            U2S( HID_FUNC_RAWSUBTRACT );
+            HID_FUNC_RAWSUBTRACT;
             VAR_ARGS+2; 0; 0; 1;
             0;
         };
@@ -12454,8 +12446,4 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
     };
 };
 
-#if defined(U2S)
-#undef U2S
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to