INTEGRATION: CWS dba24c (1.26.200); FILE MERGED

2007/09/18 20:11:42 fs 1.26.200.2: during #i81095#: outsourced the CYCLIC_SUB_QUERIES error to the new css.sdb.ErrorCondition
2007/09/05 07:56:01 fs 1.26.200.1: #i80879#

1 files changed, 69 insertions, 64 deletions

diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index e7af7fde49fb..a30e9264c2f4 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.hrc
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fmresids.hrc,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: kz $ $Date: 2007-05-10 10:08:00 $
+ *  last change: $Author: ihi $ $Date: 2007-11-21 15:27:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -152,66 +152,67 @@
 #define RID_STR_UNDO_MODEL_REPLACE                  (RID_FORMS_START +  31)
 #define RID_STR_NAVIGATIONBAR                       (RID_FORMS_START +  32)
 #define RID_STR_DEFAULT_CONTROL                     (RID_FORMS_START +  33)
-#define RID_STR_TABWIN_PREFIX                       (RID_FORMS_START +  34)
-#define RID_STR_FORM                                (RID_FORMS_START +  35)
-#define RID_STR_FIELDSELECTION                      (RID_FORMS_START +  36)
-#define RID_STR_NO_PROPERTIES                       (RID_FORMS_START +  37)
-#define RID_STR_PROPERTIES_CONTROL                  (RID_FORMS_START +  38)
-#define RID_STR_PROPERTIES_FORM                     (RID_FORMS_START +  39)
-#define RID_STR_FMEXPLORER                          (RID_FORMS_START +  40)
-#define RID_STR_FORMS                               (RID_FORMS_START +  41)
-#define RID_STR_WRITEERROR                          (RID_FORMS_START +  42)
-#define RID_STR_DELETECONFIRM_RECORD                (RID_FORMS_START +  43)
-#define RID_STR_DELETECONFIRM                       (RID_FORMS_START +  44)
-#define RID_STR_GROUPBOX                            (RID_FORMS_START +  45)
-#define RID_STR_NAVIGATION                          (RID_FORMS_START +  46)
-#define RID_STR_COLUMN                              (RID_FORMS_START +  47)
-#define RID_STR_DATE                                (RID_FORMS_START +  48)
-#define RID_STR_TIME                                (RID_FORMS_START +  49)
-#define RID_STR_PROPTITLE_NAVBAR                    (RID_FORMS_START +  50)
-#define RID_STR_PROPTITLE_PUSHBUTTON                (RID_FORMS_START +  51)
-#define RID_STR_PROPTITLE_RADIOBUTTON               (RID_FORMS_START +  52)
-#define RID_STR_PROPTITLE_CHECKBOX                  (RID_FORMS_START +  53)
-#define RID_STR_PROPTITLE_FIXEDTEXT                 (RID_FORMS_START +  54)
-#define RID_STR_PROPTITLE_GROUPBOX                  (RID_FORMS_START +  55)
-#define RID_STR_PROPTITLE_EDIT                      (RID_FORMS_START +  56)
-#define RID_STR_PROPTITLE_LISTBOX                   (RID_FORMS_START +  57)
-#define RID_STR_PROPTITLE_COMBOBOX                  (RID_FORMS_START +  58)
-#define RID_STR_PROPTITLE_IMAGEBUTTON               (RID_FORMS_START +  59)
-#define RID_STR_PROPTITLE_IMAGECONTROL              (RID_FORMS_START +  60)
-#define RID_STR_PROPTITLE_FILECONTROL               (RID_FORMS_START +  61)
-#define RID_STR_PROPTITLE_DATEFIELD                 (RID_FORMS_START +  62)
-#define RID_STR_PROPTITLE_TIMEFIELD                 (RID_FORMS_START +  63)
-#define RID_STR_PROPTITLE_NUMERICFIELD              (RID_FORMS_START +  64)
-#define RID_STR_PROPTITLE_CURRENCYFIELD             (RID_FORMS_START +  65)
-#define RID_STR_PROPTITLE_PATTERNFIELD              (RID_FORMS_START +  66)
-#define RID_STR_PROPTITLE_DBGRID                    (RID_FORMS_START +  67)
-#define RID_STR_PROPTITLE_MULTISELECT               (RID_FORMS_START +  68)
-#define RID_STR_DELETECONFIRM_RECORDS               (RID_FORMS_START +  69)
-#define RID_STR_CONTROL                             (RID_FORMS_START +  70)
-#define RID_STR_RECORDSEARCH_METHODS                (RID_FORMS_START +  71)
-#define RID_STR_RECORDSEARCH_BUTTONS                (RID_FORMS_START +  72)
-#define RID_STR_SEARCH_OVERFLOW                     (RID_FORMS_START +  73)
-#define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  74)
-#define RID_STR_NODATACONTROLS                      (RID_FORMS_START +  75)
-#define RID_STR_DATETIME_LABELPOSTFIX               (RID_FORMS_START +  76)
-#define RID_STR_FILTER_NAVIGATOR                    (RID_FORMS_START +  77)
-#define RID_STR_FILTER_FILTER_FOR                   (RID_FORMS_START +  78)
-#define RID_STR_FILTER_FILTER_OR                    (RID_FORMS_START +  79)
-#define RID_STR_PROPTITLE_FORMATTED                 (RID_FORMS_START +  80)
-#define RID_STR_SYNTAXERROR                         (RID_FORMS_START +  81)
-#define RID_STR_MOVING_CURSOR                       (RID_FORMS_START +  82)
-#define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY      (RID_FORMS_START +  83)
-    // FREE
-#define RID_STR_AUTOFIELD                           (RID_FORMS_START +  86)
-#define RID_STR_SVT_SQL_INTERNATIONAL               (RID_FORMS_START +  87)
-#define RID_STR_SVT_SQL_SYNTAX_ERROR                (RID_FORMS_START +  88)
-    // FREE
-#define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE        (RID_FORMS_START +  90)
-#define RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE        (RID_FORMS_START +  91)
-#define RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE      (RID_FORMS_START +  92)
-#define RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID         (RID_FORMS_START +  93)
-    // FREE
+#define RID_STR_OVERFLOW_FORWARD                    (RID_FORMS_START +  34)
+#define RID_STR_OVERFLOW_BACKWARD                   (RID_FORMS_START +  35)
+#define RID_STR_FORM                                (RID_FORMS_START +  36)
+#define RID_STR_FIELDSELECTION                      (RID_FORMS_START +  37)
+#define RID_STR_NO_PROPERTIES                       (RID_FORMS_START +  38)
+#define RID_STR_PROPERTIES_CONTROL                  (RID_FORMS_START +  39)
+#define RID_STR_PROPERTIES_FORM                     (RID_FORMS_START +  40)
+#define RID_STR_FMEXPLORER                          (RID_FORMS_START +  41)
+#define RID_STR_FORMS                               (RID_FORMS_START +  42)
+#define RID_STR_WRITEERROR                          (RID_FORMS_START +  43)
+#define RID_STR_DELETECONFIRM_RECORD                (RID_FORMS_START +  44)
+#define RID_STR_DELETECONFIRM                       (RID_FORMS_START +  45)
+#define RID_STR_GROUPBOX                            (RID_FORMS_START +  46)
+#define RID_STR_NAVIGATION                          (RID_FORMS_START +  47)
+#define RID_STR_COLUMN                              (RID_FORMS_START +  48)
+#define RID_STR_DATE                                (RID_FORMS_START +  49)
+#define RID_STR_TIME                                (RID_FORMS_START +  50)
+#define RID_STR_PROPTITLE_NAVBAR                    (RID_FORMS_START +  51)
+#define RID_STR_PROPTITLE_PUSHBUTTON                (RID_FORMS_START +  52)
+#define RID_STR_PROPTITLE_RADIOBUTTON               (RID_FORMS_START +  53)
+#define RID_STR_PROPTITLE_CHECKBOX                  (RID_FORMS_START +  54)
+#define RID_STR_PROPTITLE_FIXEDTEXT                 (RID_FORMS_START +  55)
+#define RID_STR_PROPTITLE_GROUPBOX                  (RID_FORMS_START +  56)
+#define RID_STR_PROPTITLE_EDIT                      (RID_FORMS_START +  57)
+#define RID_STR_PROPTITLE_LISTBOX                   (RID_FORMS_START +  58)
+#define RID_STR_PROPTITLE_COMBOBOX                  (RID_FORMS_START +  59)
+#define RID_STR_PROPTITLE_IMAGEBUTTON               (RID_FORMS_START +  60)
+#define RID_STR_PROPTITLE_IMAGECONTROL              (RID_FORMS_START +  61)
+#define RID_STR_PROPTITLE_FILECONTROL               (RID_FORMS_START +  62)
+#define RID_STR_PROPTITLE_DATEFIELD                 (RID_FORMS_START +  63)
+#define RID_STR_PROPTITLE_TIMEFIELD                 (RID_FORMS_START +  64)
+#define RID_STR_PROPTITLE_NUMERICFIELD              (RID_FORMS_START +  65)
+#define RID_STR_PROPTITLE_CURRENCYFIELD             (RID_FORMS_START +  66)
+#define RID_STR_PROPTITLE_PATTERNFIELD              (RID_FORMS_START +  67)
+#define RID_STR_PROPTITLE_DBGRID                    (RID_FORMS_START +  68)
+#define RID_STR_PROPTITLE_MULTISELECT               (RID_FORMS_START +  69)
+#define RID_STR_DELETECONFIRM_RECORDS               (RID_FORMS_START +  70)
+#define RID_STR_CONTROL                             (RID_FORMS_START +  71)
+#define RID_STR_POSTFIX_DATE                        (RID_FORMS_START +  72)
+#define RID_STR_POSTFIX_TIME                        (RID_FORMS_START +  73)
+#define RID_STR_FROM_TOP                            (RID_FORMS_START +  74)
+#define RID_STR_FROM_BOTTOM                         (RID_FORMS_START +  75)
+#define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  76)
+#define RID_STR_NODATACONTROLS                      (RID_FORMS_START +  77)
+#define RID_STR_FILTER_NAVIGATOR                    (RID_FORMS_START +  78)
+#define RID_STR_FILTER_FILTER_FOR                   (RID_FORMS_START +  79)
+#define RID_STR_FILTER_FILTER_OR                    (RID_FORMS_START +  80)
+#define RID_STR_PROPTITLE_FORMATTED                 (RID_FORMS_START +  81)
+#define RID_STR_SYNTAXERROR                         (RID_FORMS_START +  82)
+#define RID_STR_MOVING_CURSOR                       (RID_FORMS_START +  83)
+#define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY      (RID_FORMS_START +  84)
+#define RID_STR_SEARCH_ANYWHERE                     (RID_FORMS_START +  85)
+#define RID_STR_SEARCH_BEGINNING                    (RID_FORMS_START +  86)
+#define RID_STR_SEARCH_END                          (RID_FORMS_START +  87)
+#define RID_STR_SEARCH_WHOLE                        (RID_FORMS_START +  88)
+#define RID_STR_AUTOFIELD                           (RID_FORMS_START +  89)
+#define RID_STR_SVT_SQL_SYNTAX_ERROR                (RID_FORMS_START +  90)
+#define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE        (RID_FORMS_START +  91)
+#define RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE        (RID_FORMS_START +  92)
+#define RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE      (RID_FORMS_START +  93)
+#define RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID         (RID_FORMS_START +  94)
 #define RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID  (RID_FORMS_START +  95)
 #define RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID        (RID_FORMS_START +  96)
 #define RID_STR_SVT_SQL_SYNTAX_TABLE                (RID_FORMS_START +  97)
@@ -265,8 +266,7 @@
 #define RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY       (RID_FORMS_START + 145)
 #define RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS         (RID_FORMS_START + 146)
 #define RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS         (RID_FORMS_START + 147)
-#define RID_STR_SVT_SQL_CYCLIC_SUB_QUERIES          (RID_FORMS_START + 148)
-#define RID_STR_READONLY_VIEW                       (RID_FORMS_START + 149)
+#define RID_STR_READONLY_VIEW                       (RID_FORMS_START + 148)
 
 // Error-String-Id's -----------------------------------------------------------
 #define RID_ERR_START                               (RID_FORMS_START + 600)
@@ -275,5 +275,10 @@
 #define RID_ERR_FIELDREQUIRED                       (RID_ERR_START + 2)
 #define RID_ERR_NO_ELEMENT                          (RID_ERR_START + 4)
 
+// untyped resources  ----------------------------------------------------------
+
+#define RID_RSC_TABWIN_PREFIX                       ( RID_FORMS_START +  0 )
+#define RID_RSC_SQL_INTERNATIONAL                   ( RID_FORMS_START +  1 )
+
 #endif          // _FM_FMPAGE_HXX