INTEGRATION: CWS dba24c (1.76.2); FILE MERGED

2007/10/30 12:57:47 oj 1.76.2.2: #i81043# impl new type access 2007
2007/10/29 22:44:10 fs 1.76.2.1: merging changes from CWS dba24b herein, to not wait for later resync

1 files changed, 18 insertions, 10 deletions

diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 3adc2859c3c8..9db42c2b3777 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbumiscres.src,v $
  *
- *  $Revision: 1.77 $
+ *  $Revision: 1.78 $
  *
- *  last change: $Author: hr $ $Date: 2007-11-01 15:23:37 $
+ *  last change: $Author: ihi $ $Date: 2007-11-21 16:09:34 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -71,14 +71,18 @@ Resource RSC_DATASOURCE_TYPES
     {
         Text  ="sdbc:dbase:";
     };
-    String STR_ADO
-    {
-        Text  ="sdbc:ado:";
-    };
     String STR_MSACCESS
     {
         Text  ="sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=";
     };
+    String STR_MSACCESS2007
+    {
+        Text  ="sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=";
+    };
+    String STR_ADO
+    {
+        Text  ="sdbc:ado:";
+    };
     String STR_FLAT
     {
         Text  ="sdbc:flat:";
@@ -163,14 +167,18 @@ Resource RSC_DATASOURCE_TYPE_UINAMES
     {
         Text[ en-US ] = "dBASE";
     };
-    String STR_ADO
-    {
-        Text[ en-US ] = "ADO";
-    };
     String STR_MSACCESS
     {
         Text[ en-US ] = "Microsoft Access";
     };
+    String STR_MSACCESS2007
+    {
+        Text[ en-US ] = "Microsoft Access 2007";
+    };
+    String STR_ADO
+    {
+        Text[ en-US ] = "ADO";
+    };
     String STR_FLAT
     {
         Text[ en-US ] = "Text";