Tag: cws_src680_dba24c User: oj Date: 2007-10-30 12:57:50+0000 Modified: dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx dba/dbaccess/source/ui/dlg/ConnectionPage.cxx dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx dba/dbaccess/source/ui/dlg/dbwiz.cxx dba/dbaccess/source/ui/dlg/dbwizsetup.cxx dba/dbaccess/source/ui/inc/dbu_dlg.hrc dba/dbaccess/source/ui/inc/dsntypes.hxx dba/dbaccess/source/ui/misc/dbumiscres.hrc dba/dbaccess/source/ui/misc/dbumiscres.src dba/dbaccess/source/ui/misc/dsmeta.cxx dba/dbaccess/source/ui/misc/dsntypes.cxx
Log: #i81043# impl new type access 2007 File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.16.38.1&r2=1.16.38.2 Delta lines: +12 -3 -------------------- --- ConnectionHelper.cxx 2007-10-02 10:27:00+0000 1.16.38.1 +++ ConnectionHelper.cxx 2007-10-30 12:57:46+0000 1.16.38.2 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionHelper.cxx,v $ * - * $Revision: 1.16.38.1 $ + * $Revision: 1.16.38.2 $ * - * last change: $Author: oj $ $Date: 2007/10/02 10:27:00 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -341,8 +341,15 @@ String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN); aFileDlg.AddFilter(sFilterName,sExt); + aFileDlg.SetCurrentFilter(sFilterName); + askForFileName(aFileDlg); + } + break; + case DST_MSACCESS_2007: + { ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb")); String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); + ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN); aFileDlg.AddFilter(sFilterName2,sAccdb); aFileDlg.SetCurrentFilter(sFilterName2); askForFileName(aFileDlg); @@ -812,6 +819,7 @@ if ( (DST_DBASE == m_eType) || (DST_FLAT == m_eType) || (DST_MSACCESS == m_eType) + || (DST_MSACCESS_2007 == m_eType) || (DST_CALC == m_eType) ) switch (_rNEvt.GetType()) { @@ -932,6 +940,7 @@ if ( (DST_DBASE == m_eType) || (DST_FLAT == m_eType) || (DST_MSACCESS == m_eType) + || (DST_MSACCESS_2007 == m_eType) || (DST_CALC == m_eType) ) { if ((sURL != sOldPath) && (0 != sURL.Len())) @@ -941,7 +950,7 @@ OFileNotation aTransformer(sURL); sURL = aTransformer.get(OFileNotation::N_URL); - if ( (DST_CALC == m_eType) || (DST_MSACCESS == m_eType) ) + if ( (DST_CALC == m_eType) || (DST_MSACCESS == m_eType) || (DST_MSACCESS_2007 == 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.20.2.2&r2=1.20.2.3 Delta lines: +3 -2 ------------------- --- ConnectionPage.cxx 2007-10-29 22:44:07+0000 1.20.2.2 +++ ConnectionPage.cxx 2007-10-30 12:57:46+0000 1.20.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.20.2.2 $ + * $Revision: 1.20.2.3 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:07 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -270,6 +270,7 @@ m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); break; case DST_MSACCESS: + case DST_MSACCESS_2007: 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.18.40.1&r2=1.18.40.2 Delta lines: +3 -2 ------------------- --- DbAdminImpl.cxx 2007-10-29 22:44:07+0000 1.18.40.1 +++ DbAdminImpl.cxx 2007-10-30 12:57:46+0000 1.18.40.2 @@ -4,9 +4,9 @@ * * $RCSfile: DbAdminImpl.cxx,v $ * - * $Revision: 1.18.40.1 $ + * $Revision: 1.18.40.2 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:07 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -528,6 +528,7 @@ } break; case DST_MSACCESS: + case DST_MSACCESS_2007: { ::rtl::OUString sFileName = pCollection->cutPrefix(pUrlItem->GetValue()); ::rtl::OUString sNewFileName; File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.16.2.1&r2=1.16.2.2 Delta lines: +3 -2 ------------------- --- dbwiz.cxx 2007-10-29 22:44:08+0000 1.16.2.1 +++ dbwiz.cxx 2007-10-30 12:57:46+0000 1.16.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbwiz.cxx,v $ * - * $Revision: 1.16.2.1 $ + * $Revision: 1.16.2.2 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:08 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -221,6 +221,7 @@ case DST_KAB: case DST_MACAB: case DST_MSACCESS: + case DST_MSACCESS_2007: 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.27.2.1&r2=1.27.2.2 Delta lines: +5 -2 ------------------- --- dbwizsetup.cxx 2007-10-29 22:44:08+0000 1.27.2.1 +++ dbwizsetup.cxx 2007-10-30 12:57:46+0000 1.27.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.27.2.1 $ + * $Revision: 1.27.2.2 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:08 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -261,6 +261,7 @@ #define CREATENEW_PATH 22 #define USERDEFINED_PATH 23 #define OPEN_DOC_PATH 24 +#define MSACCESS2007_PATH 25 OFinalDBPageSetup* pFinalPage; @@ -343,6 +344,7 @@ declareAuthDepPath( DST_ADABAS, ADABAS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ADABAS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_LDAP, LDAP_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_LDAP, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_MSACCESS, MSACCESS_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); + declareAuthDepPath( DST_MSACCESS_2007, MSACCESS2007_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_OUTLOOKEXP, OUTLOOKEXP_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_OUTLOOK, OUTLOOK_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); declareAuthDepPath( DST_MOZILLA, MOZILLA_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 ); @@ -503,6 +505,7 @@ { DST_ADABAS, ADABAS_PATH }, { DST_LDAP, LDAP_PATH }, { DST_MSACCESS, MSACCESS_PATH }, + { DST_MSACCESS_2007,MSACCESS2007_PATH }, { DST_OUTLOOKEXP, OUTLOOKEXP_PATH }, { DST_OUTLOOK, OUTLOOK_PATH }, { DST_MOZILLA, MOZILLA_PATH }, Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dbu_dlg.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_dlg.hrc?r1=1.13.40.3&r2=1.13.40.4 Delta lines: +4 -3 ------------------- --- dbu_dlg.hrc 2007-10-29 22:44:09+0000 1.13.40.3 +++ dbu_dlg.hrc 2007-10-30 12:57:47+0000 1.13.40.4 @@ -4,9 +4,9 @@ * * $RCSfile: dbu_dlg.hrc,v $ * - * $Revision: 1.13.40.3 $ + * $Revision: 1.13.40.4 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:09 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,11 +127,12 @@ #define STR_EXCEPTION_INFO RID_STR_DLG_START + 64 #define STR_EXCEPTION_DETAILS RID_STR_DLG_START + 65 #define STR_MSACCESS_2007_FILTERNAME RID_STR_DLG_START + 66 +#define STR_MSACCESS_ACCDB_FILE RID_STR_DLG_START + 67 // please adjust checking before insert new strings -#define LAST_STR_HERE RID_STR_DLG_START + 66 +#define LAST_STR_HERE RID_STR_DLG_START + 67 #if LAST_STR_HERE > RID_STR_DLG_END #error Resource-Id Overflow in #file, #line File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsntypes.hxx?r1=1.23.2.1&r2=1.23.2.2 Delta lines: +5 -4 ------------------- --- dsntypes.hxx 2007-10-29 22:44:10+0000 1.23.2.1 +++ dsntypes.hxx 2007-10-30 12:57:47+0000 1.23.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.23.2.1 $ + * $Revision: 1.23.2.2 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:10 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,7 +74,8 @@ DST_EVOLUTION_LDAP = 19, DST_KAB = 20, DST_MACAB = 21, - DST_EMBEDDED_HSQLDB = 22, + DST_MSACCESS_2007 = 22, + DST_EMBEDDED_HSQLDB = 23, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dbumiscres.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.hrc?r1=1.10.2.1&r2=1.10.2.2 Delta lines: +25 -20 --------------------- --- dbumiscres.hrc 2007-10-29 22:44:10+0000 1.10.2.1 +++ dbumiscres.hrc 2007-10-30 12:57:47+0000 1.10.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.hrc,v $ * - * $Revision: 1.10.2.1 $ + * $Revision: 1.10.2.2 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:10 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,22 +47,27 @@ #define STR_ODBC 6 #define STR_DBASE 7 #define STR_MSACCESS 8 -#define STR_ADO 9 -#define STR_FLAT 10 -#define STR_CALC 11 -#define STR_MOZILLA 12 -#define STR_LDAP 13 -#define STR_OUTLOOK 14 -#define STR_OUTLOOKEXP 15 -#define STR_EVOLUTION 16 -#define STR_EVOLUTION_GROUPWISE 17 -#define STR_EVOLUTION_LDAP 18 -#define STR_KAB 19 -#define STR_MACAB 20 -#define STR_EMBEDDED_HSQLDB 21 -#define STR_THUNDERBIRD 22 +#define STR_MSACCESS2007 9 +#define STR_ADO 10 +#define STR_FLAT 11 +#define STR_CALC 12 +#define STR_MOZILLA 13 +#define STR_LDAP 14 +#define STR_OUTLOOK 15 +#define STR_OUTLOOKEXP 16 +#define STR_EVOLUTION 17 +#define STR_EVOLUTION_GROUPWISE 18 +#define STR_EVOLUTION_LDAP 19 +#define STR_KAB 20 +#define STR_MACAB 21 +#define STR_EMBEDDED_HSQLDB 22 +#define STR_THUNDERBIRD 23 #define STR_END STR_THUNDERBIRD + 1 #endif // _DBU_MISCRES_HRC_ + + + + \ No newline at end of file File [changed]: dbumiscres.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.src?r1=1.76.2.1&r2=1.76.2.2 Delta lines: +19 -11 --------------------- --- dbumiscres.src 2007-10-29 22:44:10+0000 1.76.2.1 +++ dbumiscres.src 2007-10-30 12:57:47+0000 1.76.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbumiscres.src,v $ * - * $Revision: 1.76.2.1 $ + * $Revision: 1.76.2.2 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:10 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:47 $ * * 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 @@ { 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 @@ { 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"; File [changed]: dsmeta.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsmeta.cxx?r1=1.1.4.2&r2=1.1.4.3 Delta lines: +5 -3 ------------------- --- dsmeta.cxx 2007-10-30 06:10:14+0000 1.1.4.2 +++ dsmeta.cxx 2007-10-30 12:57:47+0000 1.1.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: dsmeta.cxx,v $ * - * $Revision: 1.1.4.2 $ + * $Revision: 1.1.4.3 $ * - * last change: $Author: fs $ $Date: 2007/10/30 06:10:14 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -140,6 +140,7 @@ s_aSupport[ DST_EVOLUTION_GROUPWISE ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ DST_EVOLUTION_LDAP ] = InitAdvanced( InitAdvanced::None ); s_aSupport[ DST_KAB ] = InitAdvanced( InitAdvanced::None ); + s_aSupport[ DST_MSACCESS_2007 ] = InitAdvanced( 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1 ); s_aSupport[ DST_EMBEDDED_HSQLDB ] = InitAdvanced( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 ); s_aSupport[ DST_USERDEFINE1 ] = InitAdvanced( InitAdvanced::All ); s_aSupport[ DST_USERDEFINE2 ] = InitAdvanced( InitAdvanced::All ); @@ -183,6 +184,7 @@ s_aSupport[ DST_EVOLUTION_GROUPWISE ] = FeatureSupport( AuthNone ); s_aSupport[ DST_EVOLUTION_LDAP ] = FeatureSupport( AuthNone ); s_aSupport[ DST_KAB ] = FeatureSupport( AuthNone ); + s_aSupport[ DST_MSACCESS_2007 ] = FeatureSupport( AuthNone ); s_aSupport[ DST_EMBEDDED_HSQLDB ] = FeatureSupport( AuthNone ); s_aSupport[ DST_USERDEFINE1 ] = FeatureSupport( AuthUserPwd ); s_aSupport[ DST_USERDEFINE2 ] = FeatureSupport( AuthUserPwd ); File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.35.40.2&r2=1.35.40.3 Delta lines: +14 -4 -------------------- --- dsntypes.cxx 2007-10-29 22:44:10+0000 1.35.40.2 +++ dsntypes.cxx 2007-10-30 12:57:47+0000 1.35.40.3 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.cxx,v $ * - * $Revision: 1.35.40.2 $ + * $Revision: 1.35.40.3 $ * - * last change: $Author: fs $ $Date: 2007/10/29 22:44:10 $ + * last change: $Author: oj $ $Date: 2007/10/30 12:57:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -286,6 +286,7 @@ } break; case DST_MSACCESS: + case DST_MSACCESS_2007: { ::rtl::OUString sNewFileName; if ( ::osl::FileBase::getFileURLFromSystemPath( sUrl, sNewFileName ) == ::osl::FileBase::E_None ) @@ -308,6 +309,7 @@ case DST_FLAT: case DST_CALC: case DST_MSACCESS: + case DST_MSACCESS_2007: return sal_True; case DST_USERDEFINE1: @@ -351,6 +353,7 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: + case DST_MSACCESS_2007: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MYSQL_JDBC: @@ -375,6 +378,7 @@ case DST_ADABAS: case DST_ADO: case DST_MSACCESS: + case DST_MSACCESS_2007: case DST_MYSQL_ODBC: case DST_ODBC: case DST_MOZILLA: @@ -443,7 +447,13 @@ { nSeparator = _rDsn.Search((sal_Unicode)':', nSeparator + 1); if (STRING_NOTFOUND != nSeparator && _rDsn.EqualsIgnoreCaseAscii("sdbc:ado:access",0, nSeparator) ) + { + nSeparator = _rDsn.Search((sal_Unicode)';', nSeparator + 1); + if (STRING_NOTFOUND != nSeparator && _rDsn.EqualsIgnoreCaseAscii("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0",0, nSeparator) ) + return DST_MSACCESS_2007; + return DST_MSACCESS; + } return DST_ADO; } if (_rDsn.EqualsIgnoreCaseAscii("sdbc:flat:", 0, nSeparator)) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
