User: kz      
Date: 2008-03-05 17:05:32+0000
Modified:
   dba/dbaccess/source/ui/misc/dsmeta.cxx

Log:
 INTEGRATION: CWS dba30a (1.5.12); FILE MERGED
 2008/02/20 21:31:56 fs 1.5.12.2: remove unused code
 Issue number:  #i86284#
 Submitted by:  [EMAIL PROTECTED]
 Reviewed by:   [EMAIL PROTECTED]
 2008/02/14 08:37:49 oj 1.5.12.1: #i86088# add url handling for sdbc:mysqlc:

File Changes:

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

File [changed]: dsmeta.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsmeta.cxx?r1=1.5&r2=1.6
Delta lines:  +2 -6
-------------------
--- dsmeta.cxx  2008-01-30 08:53:14+0000        1.5
+++ dsmeta.cxx  2008-03-05 17:05:29+0000        1.6
@@ -125,6 +125,7 @@
             s_aSupport[ DST_MSACCESS            ] = InitAdvanced( 0, 1, 1, 0, 
1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0 );
             s_aSupport[ DST_MYSQL_ODBC          ] = InitAdvanced( 0, 0, 1, 0, 
1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 );
             s_aSupport[ DST_MYSQL_JDBC          ] = InitAdvanced( 0, 0, 1, 0, 
1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 );
+            s_aSupport[ DST_MYSQL_NATIVE        ] = InitAdvanced( 0, 0, 1, 0, 
1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0 );
             s_aSupport[ DST_ORACLE_JDBC         ] = InitAdvanced( 
InitAdvanced::All );
             s_aSupport[ DST_ADABAS              ] = InitAdvanced( 0, 1, 1, 0, 
0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0 );
             s_aSupport[ DST_CALC                ] = InitAdvanced( 
InitAdvanced::None );
@@ -169,6 +170,7 @@
         if ( s_aSupport.empty() )
         {
             s_aSupport[ DST_MSACCESS            ] = FeatureSupport( AuthNone   
 );
+            s_aSupport[ DST_MYSQL_NATIVE        ] = FeatureSupport( 
AuthUserPwd );
             s_aSupport[ DST_MYSQL_ODBC          ] = FeatureSupport( 
AuthUserPwd );
             s_aSupport[ DST_MYSQL_JDBC          ] = FeatureSupport( 
AuthUserPwd );
             s_aSupport[ DST_ORACLE_JDBC         ] = FeatureSupport( 
AuthUserPwd );
@@ -239,12 +241,6 @@
     }
 
        //--------------------------------------------------------------------
-    DATASOURCE_TYPE DataSourceMetaData::getType() const
-    {
-        return m_pImpl->getType();
-    }
-
-       //--------------------------------------------------------------------
     const AdvancedSettingsSupport& 
DataSourceMetaData::getAdvancedSettingsSupport() const
     {
         return ::dbaui::getAdvancedSettingsSupport( m_pImpl->getType() );




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

Reply via email to