User: hr Date: 2007-11-01 15:10:31+0000 Modified: dba/dbaccess/source/ui/dlg/dbadmin.cxx
Log: INTEGRATION: CWS dba24b (1.103.28); FILE MERGED 2007/09/05 08:40:33 fs 1.103.28.4: #i80845# change the defaults for field delimiter and thousands separator, to match the core defaults 2007/08/29 12:02:57 fs 1.103.28.3: getORB made const 2007/08/27 13:31:24 fs 1.103.28.2: #i80930# +DSID_CHECK_REQUIRED_FIELDS 2007/08/27 10:50:38 fs 1.103.28.1: prepare #i80930#: outsourced all the advanced settings into dedicated pages (they were never needed by more than one instance of the CommonBehaviourPage) File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.103&r2=1.104 Delta lines: +5 -6 ------------------- --- dbadmin.cxx 2007-07-06 08:13:45+0000 1.103 +++ dbadmin.cxx 2007-11-01 15:10:29+0000 1.104 @@ -81,9 +81,6 @@ #ifndef DBAUI_CONNECTIONPAGE_HXX #include "ConnectionPage.hxx" #endif -#ifndef DBAUI_ADVANCEDPAGEDLG_HXX -#include "AdvancedPageDlg.hxx" -#endif #ifndef DBAUI_DRIVERSETTINGS_HXX #include "DriverSettings.hxx" #endif @@ -380,7 +377,7 @@ return m_pImpl->createConnection(); } // ----------------------------------------------------------------------------- -Reference< XMultiServiceFactory > ODbAdminDialog::getORB() +Reference< XMultiServiceFactory > ODbAdminDialog::getORB() const { return m_pImpl->getORB(); } @@ -426,10 +423,10 @@ *pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False); *pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False); *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, String()); - *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, ';'); + *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, ','); *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, '"'); *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, '.'); - *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, ','); + *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, String()); *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, String::CreateFromAscii("txt")); *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True); *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_True); @@ -464,6 +461,7 @@ *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False); *pCounter++ = new SfxStringItem(DSID_DATABASENAME, String()); *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True); + *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); // create the pool static SfxItemInfo __READONLY_DATA aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] = @@ -520,6 +518,7 @@ {0,0}, {0,0}, {0,0}, + {0,0}, {0,0} }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
