User: kz Date: 2008-03-05 17:00:37+0000 Modified: dba/dbaccess/source/ui/dlg/generalpage.cxx
Log: INTEGRATION: CWS dba30a (1.54.12); FILE MERGED 2008/02/14 08:37:48 oj 1.54.12.1: #i86088# add url handling for sdbc:mysqlc: File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: generalpage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.cxx?r1=1.54&r2=1.55 Delta lines: +5 -2 ------------------- --- generalpage.cxx 2008-01-30 08:45:43+0000 1.54 +++ generalpage.cxx 2008-03-05 17:00:34+0000 1.55 @@ -442,10 +442,13 @@ if ( m_DBWizardMode && ( eType == DST_MYSQL_JDBC ) ) _inout_rDisplayName = m_sMySQLEntry; - if ( m_DBWizardMode && ( eType == DST_MYSQL_ODBC ) ) + else if ( m_DBWizardMode && ( eType == DST_MYSQL_ODBC ) ) _inout_rDisplayName = String(); - if ( eType == DST_EMBEDDED_HSQLDB ) + else if ( m_DBWizardMode && ( eType == DST_MYSQL_NATIVE ) ) + _inout_rDisplayName = String(); + + else if ( eType == DST_EMBEDDED_HSQLDB ) _inout_rDisplayName = String(); return _inout_rDisplayName.Len() > 0; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
