Tag: cws_src680_mdbdriver02 User: fridrich_strba Date: 05/11/03 03:37:14 Modified: /dba/dbaccess/source/ui/dlg/ AdabasStatDlg.cxx, AdvancedPageDlg.cxx, ConnectionHelper.cxx, ConnectionPage.cxx, DbAdminImpl.cxx, DriverSettings.cxx, dbwiz.cxx, dbwizsetup.cxx /dba/dbaccess/source/ui/inc/ dsntypes.hxx /dba/dbaccess/source/ui/misc/ dsntypes.cxx
Log: Issue number: N/A Submitted by: fridrich_strba Reviewed by: fridrich_strba Optimize the code by removing some duplicates File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: AdabasStatDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdabasStatDlg.cxx?r1=1.7.36.1&r2=1.7.36.2 Delta lines: +2 -3 ------------------- --- AdabasStatDlg.cxx 3 Nov 2005 10:47:49 -0000 1.7.36.1 +++ AdabasStatDlg.cxx 3 Nov 2005 11:37:09 -0000 1.7.36.2 @@ -4,9 +4,9 @@ * * $RCSfile: AdabasStatDlg.cxx,v $ * - * $Revision: 1.7.36.1 $ + * $Revision: 1.7.36.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:49 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -121,7 +121,6 @@ case DST_DBASE: case DST_FLAT: case DST_MSACCESS: - case DST_MDBFILE: case DST_ADO: case DST_ODBC: case DST_MYSQL_ODBC: File [changed]: AdvancedPageDlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AdvancedPageDlg.cxx?r1=1.7.36.1&r2=1.7.36.2 Delta lines: +2 -3 ------------------- --- AdvancedPageDlg.cxx 3 Nov 2005 10:47:49 -0000 1.7.36.1 +++ AdvancedPageDlg.cxx 3 Nov 2005 11:37:09 -0000 1.7.36.2 @@ -4,9 +4,9 @@ * * $RCSfile: AdvancedPageDlg.cxx,v $ * - * $Revision: 1.7.36.1 $ + * $Revision: 1.7.36.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:49 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,7 +119,6 @@ AddTabPage(PAGE_DS_PROPERTIES_FILE, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateFileDsProperties,NULL); break; case DST_MSACCESS: - case DST_MDBFILE: AddTabPage(PAGE_DS_PROPERTIES_ACCESS, String(ResId(STR_DS_BEHAVIOUR)), ODriversSettings::CreateAccessDsProperties,NULL); break; case DST_ADABAS: File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.8.34.1&r2=1.8.34.2 Delta lines: +3 -6 ------------------- --- ConnectionHelper.cxx 3 Nov 2005 10:47:50 -0000 1.8.34.1 +++ ConnectionHelper.cxx 3 Nov 2005 11:37:09 -0000 1.8.34.2 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionHelper.cxx,v $ * - * $Revision: 1.8.34.1 $ + * $Revision: 1.8.34.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -318,7 +318,6 @@ } break; case DST_MSACCESS: - case DST_MDBFILE: { ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb")); String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); @@ -806,7 +805,6 @@ if ( (DST_DBASE == m_eType) || (DST_FLAT == m_eType) || (DST_MSACCESS == m_eType) - || (DST_MDBFILE == m_eType) || (DST_CALC == m_eType) ) switch (_rNEvt.GetType()) { @@ -928,7 +926,6 @@ if ( (DST_DBASE == m_eType) || (DST_FLAT == m_eType) || (DST_MSACCESS == m_eType) - || (DST_MDBFILE == m_eType) || (DST_CALC == m_eType) ) { if ((sURL != sOldPath) && (0 != sURL.Len())) @@ -938,7 +935,7 @@ OFileNotation aTransformer(sURL); sURL = aTransformer.get(OFileNotation::N_URL); - if ( (DST_CALC == m_eType) || (DST_MSACCESS == m_eType) || (DST_MDBFILE == m_eType) ) + if ( (DST_CALC == m_eType) || (DST_MSACCESS == m_eType) ) { // #106016# -------------------------- if( pathExists(sURL, sal_True) == PATH_NOT_EXIST ) { File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.12.34.1&r2=1.12.34.2 Delta lines: +2 -3 ------------------- --- ConnectionPage.cxx 3 Nov 2005 10:47:50 -0000 1.12.34.1 +++ ConnectionPage.cxx 3 Nov 2005 11:37:10 -0000 1.12.34.2 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.12.34.1 $ + * $Revision: 1.12.34.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -268,7 +268,6 @@ m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); break; case DST_MSACCESS: - case DST_MDBFILE: m_aFT_Connection.SetText(String(ModuleRes(STR_MSACCESS_MDB_FILE))); m_aET_Connection.SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE); break; File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.11.42.1&r2=1.11.42.2 Delta lines: +2 -3 ------------------- --- DbAdminImpl.cxx 3 Nov 2005 10:47:50 -0000 1.11.42.1 +++ DbAdminImpl.cxx 3 Nov 2005 11:37:10 -0000 1.11.42.2 @@ -4,9 +4,9 @@ * * $RCSfile: DbAdminImpl.cxx,v $ * - * $Revision: 1.11.42.1 $ + * $Revision: 1.11.42.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -526,7 +526,6 @@ } break; case DST_MSACCESS: - case DST_MDBFILE: { ::rtl::OUString sFileName = pCollection->cutPrefix(pUrlItem->GetValue()); ::rtl::OUString sNewFileName; File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.4.44.1&r2=1.4.44.2 Delta lines: +2 -3 ------------------- --- DriverSettings.cxx 3 Nov 2005 10:47:50 -0000 1.4.44.1 +++ DriverSettings.cxx 3 Nov 2005 11:37:10 -0000 1.4.44.2 @@ -4,9 +4,9 @@ * * $RCSfile: DriverSettings.cxx,v $ * - * $Revision: 1.4.44.1 $ + * $Revision: 1.4.44.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:50 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,7 +64,6 @@ _rDetailsIds.push_back(DSID_DOSLINEENDS); break; case DST_MSACCESS: - case DST_MDBFILE: _rDetailsIds.push_back(DSID_SQL92CHECK); _rDetailsIds.push_back(DSID_ENABLEOUTERJOIN); _rDetailsIds.push_back(DSID_APPEND_TABLE_ALIAS); File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.8.44.1&r2=1.8.44.2 Delta lines: +18 -19 --------------------- --- dbwiz.cxx 3 Nov 2005 10:47:51 -0000 1.8.44.1 +++ dbwiz.cxx 3 Nov 2005 11:37:11 -0000 1.8.44.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.cxx,v $ * - * $Revision: 1.8.44.1 $ + * $Revision: 1.8.44.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:51 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -219,7 +219,6 @@ case DST_OUTLOOKEXP: case DST_EVOLUTION: case DST_MSACCESS: - case DST_MDBFILE: case DST_JDBC: case DST_CALC: nNextState = WZS_INVALID_STATE; File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.13.42.1&r2=1.13.42.2 Delta lines: +2 -8 ------------------- --- dbwizsetup.cxx 3 Nov 2005 10:47:51 -0000 1.13.42.1 +++ dbwizsetup.cxx 3 Nov 2005 11:37:11 -0000 1.13.42.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.13.42.1 $ + * $Revision: 1.13.42.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:51 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -368,11 +368,6 @@ else declarePath( MSACCESS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); - if ( m_pCollection->hasAuthentication(DST_MDBFILE)) - declarePath( MSACCESS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); - else - declarePath( MSACCESS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); - if ( m_pCollection->hasAuthentication(DST_OUTLOOKEXP)) declarePath( OUTLOOKEXP_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); else @@ -534,7 +529,6 @@ { DST_ADABAS, ADABAS_PATH }, { DST_LDAP, LDAP_PATH }, { DST_MSACCESS, MSACCESS_PATH }, - { DST_MDBFILE, MSACCESS_PATH }, { DST_OUTLOOKEXP, OUTLOOKEXP_PATH }, { DST_OUTLOOK, OUTLOOK_PATH }, { DST_MOZILLA, MOZILLA_PATH }, 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.18.38.1&r2=1.18.38.2 Delta lines: +2 -3 ------------------- --- dsntypes.hxx 3 Nov 2005 10:47:51 -0000 1.18.38.1 +++ dsntypes.hxx 3 Nov 2005 11:37:11 -0000 1.18.38.2 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.18.38.1 $ + * $Revision: 1.18.38.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:51 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,7 +75,6 @@ DST_EVOLUTION = 16, DST_EMBEDDED = 17, DST_THUNDERBIRD = 18, - DST_MDBFILE = 19, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.27.36.1&r2=1.27.36.2 Delta lines: +5 -10 -------------------- --- dsntypes.cxx 3 Nov 2005 10:47:52 -0000 1.27.36.1 +++ dsntypes.cxx 3 Nov 2005 11:37:12 -0000 1.27.36.2 @@ -1,12 +1,12 @@ -/************************************************************************* +st/************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.27.36.1 $ + * $Revision: 1.27.36.2 $ * - * last change: $Author: fridrich_strba $ $Date: 2005/11/03 10:47:52 $ + * last change: $Author: fridrich_strba $ $Date: 2005/11/03 11:37:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -330,7 +330,6 @@ } break; case DST_MSACCESS: - case DST_MDBFILE: { ::rtl::OUString sNewFileName; if ( ::osl::FileBase::getFileURLFromSystemPath( sUrl, sNewFileName ) == ::osl::FileBase::E_None ) @@ -356,7 +355,6 @@ case DST_FLAT: case DST_CALC: case DST_MSACCESS: - case DST_MDBFILE: return sal_True; case DST_USERDEFINE1: @@ -397,7 +395,6 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: - case DST_MDBFILE: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MYSQL_JDBC: @@ -422,7 +419,6 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: - case DST_MDBFILE: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MOZILLA: @@ -473,7 +469,6 @@ return sal_True; break; case DST_MSACCESS: - case DST_MDBFILE: case DST_MOZILLA: case DST_THUNDERBIRD: case DST_EVOLUTION: @@ -525,7 +520,7 @@ if (_rDsn.EqualsIgnoreCaseAscii("sdbc:dbase", 0, nSeparator)) return DST_DBASE; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:mdb:", 0, nSeparator)) - return DST_MDBFILE; + return DST_MSACCESS; if (_rDsn.EqualsIgnoreCaseAscii("sdbc:ado:", 0, nSeparator)) { nSeparator = _rDsn.Search((sal_Unicode)':', nSeparator + 1); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
