CWS-TOOLING: integrate CWS dba31b

5 files changed, 87 insertions, 19 deletions

diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
index 9584481f636a..659c67d65088 100644
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ b/connectivity/source/inc/resource/calc_res.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: calc_res.hrc,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,16 +31,14 @@
 #ifndef CONNECTIVITY_RESOURCE_CALC_HRC
 #define CONNECTIVITY_RESOURCE_CALC_HRC
 
-#ifndef CONNECTIVITY_SHARED_RES_HRC
 #include "resource/conn_shared_res.hrc"
-#endif
+#include "resource/common_res.hrc"
 
 // ============================================================================
 // = the calc driver's resource strings
 // ============================================================================
 
-#define STR_COULD_NOT_LOAD_FILE     ( STR_CALC_BASE +    0 )
-#define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE +    1 )
+#define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE +    0 )
 
 #endif // CONNECTIVITY_RESOURCE_CALC_HRC
 
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index 2c8ad42aa12b..036a4c00f0cf 100644
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: common_res.hrc,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.56.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,7 +39,43 @@
 // = common strings
 // ============================================================================
 
-#define STR_STRING_LENGTH_EXCEEDED      ( STR_COMMON_BASE +  1 )
-#define STR_CANNOT_CONVERT_STRING       ( STR_COMMON_BASE +  2 )
+#define STR_STRING_LENGTH_EXCEEDED              ( STR_COMMON_BASE +  1 )
+#define STR_CANNOT_CONVERT_STRING               ( STR_COMMON_BASE +  2 )
+#define STR_URI_SYNTAX_ERROR                    ( STR_COMMON_BASE +  3 )
+#define STR_COULD_NOT_LOAD_FILE                 ( STR_COMMON_BASE +  4 )
+#define STR_QUERY_TOO_COMPLEX                   ( STR_COMMON_BASE +  5 )
+#define STR_OPERATOR_TOO_COMPLEX                ( STR_COMMON_BASE +  6 )
+#define STR_QUERY_INVALID_LIKE_COLUMN           ( STR_COMMON_BASE +  7 )
+#define STR_QUERY_INVALID_LIKE_STRING           ( STR_COMMON_BASE +  8 )
+#define STR_QUERY_NOT_LIKE_TOO_COMPLEX          ( STR_COMMON_BASE +  9 )
+#define STR_QUERY_LIKE_WILDCARD                 ( STR_COMMON_BASE + 10 )
+#define STR_QUERY_LIKE_WILDCARD_MANY            ( STR_COMMON_BASE + 11 )
+#define STR_INVALID_COLUMNNAME                  ( STR_COMMON_BASE + 12 )
+#define STR_NO_CLASSNAME                        ( STR_COMMON_BASE + 13 )
+#define STR_NO_CLASSNAME_PATH                   ( STR_COMMON_BASE + 14 )
+#define STR_UNKNOWN_PARA_TYPE                   ( STR_COMMON_BASE + 15 )
+#define STR_INVALID_COLUMN_SELECTION            ( STR_COMMON_BASE + 16 )
+#define STR_PARA_ONLY_PREPARED                  ( STR_COMMON_BASE + 17 )
+#define STR_COLUMN_NOT_UPDATEABLE               ( STR_COMMON_BASE + 18 )
+#define STR_ROW_ALREADY_DELETED                 ( STR_COMMON_BASE + 19 )
+#define STR_UNKNOWN_COLUMN_TYPE                 ( STR_COMMON_BASE + 20 )
+#define STR_FORMULA_WRONG                       ( STR_COMMON_BASE + 21 )
+#define STR_NO_JAVA                             ( STR_COMMON_BASE + 22 )
+#define STR_NO_RESULTSET                        ( STR_COMMON_BASE + 23 )
+#define STR_NO_ROWCOUNT                         ( STR_COMMON_BASE + 24 )
+#define STR_ERRORMSG_SEQUENCE                   ( STR_COMMON_BASE + 25 )
+#define STR_INVALID_INDEX                       ( STR_COMMON_BASE + 26 )
+#define STR_UNSUPPORTED_FUNCTION                ( STR_COMMON_BASE + 27 )
+#define STR_UNSUPPORTED_FEATURE                 ( STR_COMMON_BASE + 28 )
+#define STR_UNKNOWN_COLUMN_NAME                 ( STR_COMMON_BASE + 29 )
+#define STR_INVALID_PARA_COUNT                  ( STR_COMMON_BASE + 30 )
+#define STR_PRIVILEGE_NOT_GRANTED               ( STR_COMMON_BASE + 31 )
+#define STR_PRIVILEGE_NOT_REVOKED               ( STR_COMMON_BASE + 32 )
+#define STR_INVALID_BOOKMARK                    ( STR_COMMON_BASE + 33 )
+#define STR_NO_ELEMENT_NAME                     ( STR_COMMON_BASE + 34 )
+#define STR_NO_INPUTSTREAM                      ( STR_COMMON_BASE + 35 )
+#define STR_INPUTSTREAM_WRONG_LEN               ( STR_COMMON_BASE + 36 )
+#define STR_WRONG_PARAM_INDEX                   ( STR_COMMON_BASE + 37 )
+#define STR_NO_CONNECTION_GIVEN                 ( STR_COMMON_BASE + 38 )
 
 #endif // CONNECTIVITY_RESOURCE_COMMON_HRC
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 42c23281671d..203396aef835 100644
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: conn_shared_res.hrc,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -43,6 +43,29 @@
 // Spreadsheet driver resource ids
 #define STR_CALC_BASE                   1300
 
+// DBase driver resource ids
+#define STR_DBASE_BASE                  1400
+
+// ADO driver resource ids
+#define STR_ADO_BASE                    1450
+
+// EVOAB2 driver resource ids
+#define STR_EVOAB2_BASE                 1500
+
+// FILE driver resource ids
+#define STR_FILE_BASE                   1550
+
+// KAB driver resource ids
+#define STR_KAB_BASE                    1600
+
+// MACAB driver resource ids
+#define STR_MACAB_BASE                  1650
+
+// Adabas D driver resource ids
+#define STR_ADABAS_BASE                 1700
+
+// hsqldb driver resource ids
+#define STR_HSQLDB_BASE                 1750
 // ============================================================================
 // = resource ids for log messages
 #define STR_LOG_MESSAGE_BASE            10000
diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc
index b227f442edda..5ad8fc86e95c 100644
--- a/connectivity/source/inc/resource/mozab_res.hrc
+++ b/connectivity/source/inc/resource/mozab_res.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: mozab_res.hrc,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.56.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,10 +54,22 @@
 #define STR_FOREIGN_PROCESS_CHANGED_AB      ( STR_MOZAB_BASE +   12 )
 #define STR_CANT_FIND_ROW                   ( STR_MOZAB_BASE +   13 )
 #define STR_CANT_FIND_CARD_FOR_ROW          ( STR_MOZAB_BASE +   14 )
-#define STR_URI_SYNTAX_ERROR                ( STR_MOZAB_BASE +   15 )
+#define STR_QUERY_INVALID_IS_NULL_COLUMN    ( STR_MOZAB_BASE +   15 )
 #define STR_NO_HOSTNAME                     ( STR_MOZAB_BASE +   16 )
 #define STR_NO_BASEDN                       ( STR_MOZAB_BASE +   17 )
 #define STR_COULD_NOT_CONNECT_LDAP          ( STR_MOZAB_BASE +   18 )
+#define STR_ERROR_REFRESH_ROW               ( STR_MOZAB_BASE +   19 )
+#define STR_ILLEGAL_MOVEMENT                ( STR_MOZAB_BASE +   20 )
+#define STR_ERROR_GET_ROW                   ( STR_MOZAB_BASE +   21 )
+#define STR_COMMIT_ROW                      ( STR_MOZAB_BASE +   22 )
+#define STR_INVALID_ROW_UPDATE              ( STR_MOZAB_BASE +   23 )
+#define STR_ROW_CAN_NOT_SAVE                ( STR_MOZAB_BASE +   24 )
+#define STR_CAN_NOT_CANCEL_ROW_UPDATE       ( STR_MOZAB_BASE +   25 )
+#define STR_CAN_NOT_CREATE_ROW              ( STR_MOZAB_BASE +   26 )
+#define STR_QUERY_AT_LEAST_ONE_TABLES       ( STR_MOZAB_BASE +   27 )
+#define STR_NO_COUNT_SUPPORT                ( STR_MOZAB_BASE +   28 )
+#define STR_STMT_TYPE_NOT_SUPPORTED         ( STR_MOZAB_BASE +   29 )
+#define STR_COULD_NOT_LOAD_LIB              ( STR_MOZAB_BASE +   30 )
 
 #endif // CONNECTIVITY_RESOURCE_MOZAB_HRC
 
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index 5d216b7fd20b..b6683882929f 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sharedresources.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -34,7 +34,6 @@
 /** === begin UNO includes === **/
 /** === end UNO includes === **/
 
-#include <tools/solar.h>
 #include <rtl/ustring.hxx>
 
 //........................................................................
@@ -42,7 +41,7 @@ namespace connectivity
 {
 //........................................................................
 
-    typedef USHORT  ResourceId;
+    typedef sal_uInt16  ResourceId;
     //====================================================================
     //= SharedResources
     //====================================================================
@@ -62,9 +61,9 @@ namespace connectivity
                 the string from the resource file
         */
         ::rtl::OUString
-            getResurceString(
+            getResourceString(
                 ResourceId _nResId
-            );
+            ) const;
 
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
@@ -84,7 +83,7 @@ namespace connectivity
                 ResourceId _nResId,
                 const sal_Char* _pAsciiPatternToReplace,
                 const ::rtl::OUString& _rStringToSubstitute
-            );
+            ) const;
 
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
@@ -110,7 +109,7 @@ namespace connectivity
                 const ::rtl::OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2,
                 const ::rtl::OUString& _rStringToSubstitute2
-            );
+            ) const;
 
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
@@ -142,7 +141,7 @@ namespace connectivity
                 const ::rtl::OUString& _rStringToSubstitute2,
                 const sal_Char* _pAsciiPatternToReplace3,
                 const ::rtl::OUString& _rStringToSubstitute3
-            );
+            ) const;
     };
 
 //........................................................................