INTEGRATION: CWS dba23a (1.31.44); FILE MERGED

2007/03/12 15:00:19 fs 1.31.44.1: #i75308# no semicolon-separated resource strings anymore
This commit is contained in:
Kurt Zenker 2007-05-10 09:48:15 +00:00
parent cd0d2e8d7d
commit 126c2b0fa3

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: formresid.hrc,v $ * $RCSfile: formresid.hrc,v $
* *
* $Revision: 1.31 $ * $Revision: 1.32 $
* *
* last change: $Author: kz $ $Date: 2006-12-13 11:59:35 $ * last change: $Author: kz $ $Date: 2007-05-10 10:48:15 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -152,18 +152,18 @@
#define RID_STR_TAG ( RID_FORMBROWSER_START + 116 ) #define RID_STR_TAG ( RID_FORMBROWSER_START + 116 )
#define RID_STR_HELPTEXT ( RID_FORMBROWSER_START + 117 ) #define RID_STR_HELPTEXT ( RID_FORMBROWSER_START + 117 )
#define RID_STR_HELPURL ( RID_FORMBROWSER_START + 118 ) #define RID_STR_HELPURL ( RID_FORMBROWSER_START + 118 )
#define RID_STR_BORDER_TYPE ( RID_FORMBROWSER_START + 119 ) // FREE
#define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 ) #define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 )
#define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 ) #define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 )
#define RID_STR_LISTSOURCE_TYPE ( RID_FORMBROWSER_START + 122 ) // FREE
#define RID_STR_ALIGNMENT ( RID_FORMBROWSER_START + 123 ) // FREE
#define RID_STR_ENUM_BUTTONTYPE ( RID_FORMBROWSER_START + 124 ) // FREE
#define RID_STR_ENUM_SUBMIT_METHOD ( RID_FORMBROWSER_START + 125 ) // FREE
#define RID_STR_ENUM_SUBMIT_ENCODING ( RID_FORMBROWSER_START + 126 ) // FREE
#define RID_STR_DATEFORMAT_LIST ( RID_FORMBROWSER_START + 127 ) // FREE
#define RID_STR_TIMEFORMAT_LIST ( RID_FORMBROWSER_START + 128 ) // FREE
#define RID_STR_ENUM_CHECKED ( RID_FORMBROWSER_START + 129 ) // FREE
#define RID_STR_ENUM_CYCLE ( RID_FORMBROWSER_START + 130 ) // FREE
#define RID_STR_ENUM_NAVIGATION ( RID_FORMBROWSER_START + 131 ) #define RID_STR_ENUM_NAVIGATION ( RID_FORMBROWSER_START + 131 )
#define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 ) #define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 )
#define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 ) #define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 )
@ -199,7 +199,7 @@
#define RID_STR_EVT_ERROROCCURED ( RID_FORMBROWSER_START + 163 ) #define RID_STR_EVT_ERROROCCURED ( RID_FORMBROWSER_START + 163 )
#define RID_STR_EVENTS ( RID_FORMBROWSER_START + 164 ) #define RID_STR_EVENTS ( RID_FORMBROWSER_START + 164 )
#define RID_STR_ESCAPE_PROCESSING ( RID_FORMBROWSER_START + 165 ) #define RID_STR_ESCAPE_PROCESSING ( RID_FORMBROWSER_START + 165 )
#define RID_STR_ENUM_SUBMIT_TARGET ( RID_FORMBROWSER_START + 166 ) // FREE
#define RID_STR_POSITIONX ( RID_FORMBROWSER_START + 167 ) #define RID_STR_POSITIONX ( RID_FORMBROWSER_START + 167 )
#define RID_STR_POSITIONY ( RID_FORMBROWSER_START + 168 ) #define RID_STR_POSITIONY ( RID_FORMBROWSER_START + 168 )
#define RID_STR_TITLE ( RID_FORMBROWSER_START + 169 ) #define RID_STR_TITLE ( RID_FORMBROWSER_START + 169 )
@ -213,7 +213,7 @@
#define RID_STR_BLOCKINCREMENT ( RID_FORMBROWSER_START + 177 ) #define RID_STR_BLOCKINCREMENT ( RID_FORMBROWSER_START + 177 )
#define RID_STR_VISIBLESIZE ( RID_FORMBROWSER_START + 178 ) #define RID_STR_VISIBLESIZE ( RID_FORMBROWSER_START + 178 )
#define RID_STR_ORIENTATION ( RID_FORMBROWSER_START + 179 ) #define RID_STR_ORIENTATION ( RID_FORMBROWSER_START + 179 )
#define RID_STR_ENUM_ORIENTATION ( RID_FORMBROWSER_START + 180 ) // FREE
#define RID_STR_VERTICAL_ALIGN ( RID_FORMBROWSER_START + 181 ) #define RID_STR_VERTICAL_ALIGN ( RID_FORMBROWSER_START + 181 )
#define RID_STR_EVT_ADJUSTMENTVALUECHANGED ( RID_FORMBROWSER_START + 182 ) #define RID_STR_EVT_ADJUSTMENTVALUECHANGED ( RID_FORMBROWSER_START + 182 )
#define RID_STR_DATE ( RID_FORMBROWSER_START + 183 ) #define RID_STR_DATE ( RID_FORMBROWSER_START + 183 )
@ -227,7 +227,7 @@
#define RID_STR_BOUND_CELL ( RID_FORMBROWSER_START + 191 ) #define RID_STR_BOUND_CELL ( RID_FORMBROWSER_START + 191 )
#define RID_STR_LIST_CELL_RANGE ( RID_FORMBROWSER_START + 192 ) #define RID_STR_LIST_CELL_RANGE ( RID_FORMBROWSER_START + 192 )
#define RID_STR_CELL_EXCHANGE_TYPE ( RID_FORMBROWSER_START + 193 ) #define RID_STR_CELL_EXCHANGE_TYPE ( RID_FORMBROWSER_START + 193 )
#define RID_STR_ENUM_CELL_EXCHANGE_TYPE ( RID_FORMBROWSER_START + 194 ) // FREE
#define RID_STR_SCROLLVALUE_MIN ( RID_FORMBROWSER_START + 195 ) #define RID_STR_SCROLLVALUE_MIN ( RID_FORMBROWSER_START + 195 )
#define RID_STR_DEFAULT_SCROLLVALUE ( RID_FORMBROWSER_START + 196 ) #define RID_STR_DEFAULT_SCROLLVALUE ( RID_FORMBROWSER_START + 196 )
#define RID_STR_REPEAT_DELAY ( RID_FORMBROWSER_START + 197 ) #define RID_STR_REPEAT_DELAY ( RID_FORMBROWSER_START + 197 )
@ -241,7 +241,7 @@
#define RID_STR_SHOW_SCROLLBARS ( RID_FORMBROWSER_START + 205 ) #define RID_STR_SHOW_SCROLLBARS ( RID_FORMBROWSER_START + 205 )
#define RID_STR_QUERYDESIGN_TITLE ( RID_FORMBROWSER_START + 206 ) #define RID_STR_QUERYDESIGN_TITLE ( RID_FORMBROWSER_START + 206 )
#define RID_STR_ICONSIZE ( RID_FORMBROWSER_START + 207 ) #define RID_STR_ICONSIZE ( RID_FORMBROWSER_START + 207 )
#define RID_STR_ICONSIZE_TYPE ( RID_FORMBROWSER_START + 208 ) // FREE
#define RID_STR_SHOW_POSITION ( RID_FORMBROWSER_START + 209 ) #define RID_STR_SHOW_POSITION ( RID_FORMBROWSER_START + 209 )
#define RID_STR_SHOW_NAVIGATION ( RID_FORMBROWSER_START + 210 ) #define RID_STR_SHOW_NAVIGATION ( RID_FORMBROWSER_START + 210 )
#define RID_STR_SHOW_RECORDACTIONS ( RID_FORMBROWSER_START + 211 ) #define RID_STR_SHOW_RECORDACTIONS ( RID_FORMBROWSER_START + 211 )
@ -315,6 +315,22 @@
#define RID_RSC_BUTTON_IMAGES ( RID_PROPCONTROLLER_START + 6 ) #define RID_RSC_BUTTON_IMAGES ( RID_PROPCONTROLLER_START + 6 )
#define RID_RSC_ENUM_WHITESPACE_HANDLING ( RID_PROPCONTROLLER_START + 7 ) #define RID_RSC_ENUM_WHITESPACE_HANDLING ( RID_PROPCONTROLLER_START + 7 )
#define RID_RSC_ENUM_VERTICAL_ALIGN ( RID_PROPCONTROLLER_START + 8 ) #define RID_RSC_ENUM_VERTICAL_ALIGN ( RID_PROPCONTROLLER_START + 8 )
#define RID_RSC_ENUM_BORDER_TYPE ( RID_PROPCONTROLLER_START + 9 )
#define RID_RSC_ENUM_ICONSIZE_TYPE ( RID_PROPCONTROLLER_START + 10 )
#define RID_RSC_ENUM_LISTSOURCE_TYPE ( RID_PROPCONTROLLER_START + 11 )
#define RID_RSC_ENUM_ALIGNMENT ( RID_PROPCONTROLLER_START + 12 )
#define RID_RSC_ENUM_BUTTONTYPE ( RID_PROPCONTROLLER_START + 13 )
#define RID_RSC_ENUM_PUSHBUTTONTYPE ( RID_PROPCONTROLLER_START + 14 )
#define RID_RSC_ENUM_SUBMIT_METHOD ( RID_PROPCONTROLLER_START + 15 )
#define RID_RSC_ENUM_SUBMIT_ENCODING ( RID_PROPCONTROLLER_START + 16 )
#define RID_RSC_ENUM_DATEFORMAT_LIST ( RID_PROPCONTROLLER_START + 17 )
#define RID_RSC_ENUM_TIMEFORMAT_LIST ( RID_PROPCONTROLLER_START + 18 )
#define RID_RSC_ENUM_CHECKED ( RID_PROPCONTROLLER_START + 19 )
#define RID_RSC_ENUM_CYCLE ( RID_PROPCONTROLLER_START + 20 )
#define RID_RSC_ENUM_NAVIGATION ( RID_PROPCONTROLLER_START + 21 )
#define RID_RSC_ENUM_ORIENTATION ( RID_PROPCONTROLLER_START + 22 )
#define RID_RSC_ENUM_CELL_EXCHANGE_TYPE ( RID_PROPCONTROLLER_START + 23 )
#define RID_RSC_ENUM_SUBMIT_TARGET ( RID_PROPCONTROLLER_START + 24 )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// - ImageList - local ids // - ImageList - local ids