Tag: cws_src680_kaddrbook
User: kendy   
Date: 05/11/29 16:55:33

Modified:
 /dba/dbaccess/source/ui/inc/
  dsntypes.hxx

Log:
 RESYNC: (1.17-1.19); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/ui/inc/
=======================================

File [changed]: dsntypes.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsntypes.hxx?r1=1.17.110.1&r2=1.17.110.2
Delta lines:  +40 -64
---------------------
--- dsntypes.hxx        29 Aug 2005 08:51:34 -0000      1.17.110.1
+++ dsntypes.hxx        30 Nov 2005 00:55:30 -0000      1.17.110.2
@@ -1,22 +1,20 @@
 /*************************************************************************
  *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
  *  $RCSfile$
  *
  *  $Revision$
  *
  *  last change: $Author$ $Date$
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  Sun Microsystems Inc., October, 2000
  *
  *  GNU Lesser General Public License Version 2.1
  *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
+ *    Copyright 2005 by Sun Microsystems, Inc.
  *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
  *  This library is free software; you can redistribute it and/or
@@ -33,30 +31,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
  ************************************************************************/
 
 #ifndef _DBAUI_DSNTYPES_HXX_
@@ -83,25 +57,27 @@
 /// known datasource types
 enum DATASOURCE_TYPE
 {
-       DST_MYSQL_ODBC  =       1,      
-       DST_MYSQL_JDBC  =       2,      
-       DST_ADABAS              =       3,      
+       DST_MSACCESS    =       1,      
+    DST_MYSQL_ODBC     =       2,      
+       DST_MYSQL_JDBC  =       3,      
        DST_ORACLE_JDBC =       4,      
-       DST_JDBC                =       5,
-       DST_ODBC                =       6,      
+       DST_ADABAS              =       5,      
+       DST_CALC                =       6,      
        DST_DBASE               =       7,      
-       DST_MSACCESS    =       8,      
-       DST_ADO                 =       9,      
-       DST_FLAT                =       10,
-       DST_CALC                =       11,     
+       DST_FLAT                =       8,
+
+    DST_JDBC           =       9,
+       DST_ODBC                =       10,     
+       DST_ADO                 =       11,     
+
        DST_MOZILLA             =       12,     
-       DST_LDAP                =       13,     
-       DST_OUTLOOK             =       14,     
-       DST_OUTLOOKEXP  =       15,     
-       DST_EVOLUTION   =       16,
-       DST_KAB                 =       17,
-       DST_EMBEDDED    =       18,
-       DST_THUNDERBIRD =       19,     
+       DST_THUNDERBIRD =       13,     
+       DST_LDAP                =       14,     
+       DST_OUTLOOK             =       15,     
+       DST_OUTLOOKEXP  =       16,     
+       DST_EVOLUTION   =       17,
+       DST_KAB                 =       18,
+       DST_EMBEDDED    =       19,
 
        DST_USERDEFINE1,        /// first user defined driver
        DST_USERDEFINE2,




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to