User: vg Date: 05/03/10 08:50:13 Modified: /dba/dbaccess/source/ui/dlg/ dsselect.cxx
Log: INTEGRATION: CWS dba24 (1.11.20); FILE MERGED 2005/03/08 10:20:27 oj 1.11.20.3: RESYNC: (1.11-1.12); FILE MERGED 2005/02/01 06:32:36 oj 1.11.20.2: #119241# use SelectEntryPos to select new inserted entry 2005/02/01 06:26:51 oj 1.11.20.1: #119241# use SelectEntryPos to select new inserted entry File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dsselect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsselect.cxx?r1=1.12&r2=1.13 Delta lines: +7 -1 ------------------- --- dsselect.cxx 21 Feb 2005 12:44:32 -0000 1.12 +++ dsselect.cxx 10 Mar 2005 16:50:10 -0000 1.13 @@ -133,6 +133,9 @@ #ifndef _SFXINTITEM_HXX #include <svtools/intitem.hxx> #endif +#ifndef _SFXENUMITEM_HXX +#include <svtools/eitem.hxx> +#endif #ifndef _SFXITEMSET_HXX #include <svtools/itemset.hxx> #endif @@ -247,7 +250,7 @@ { String sDatabaseName; sDatabaseName = String(::comphelper::getString(xProp->getPropertyValue(PROPERTY_DATABASENAME))); - m_aDatasource.SelectEntry(m_aDatasource.InsertEntry( sDatabaseName )); + m_aDatasource.SelectEntryPos(m_aDatasource.InsertEntry( sDatabaseName )); } if ( xPropInfo->hasPropertyByName(PROPERTY_CONTROLUSER) ) @@ -257,7 +260,10 @@ if ( xPropInfo->hasPropertyByName(PROPERTY_USER) ) m_pOutputSet->Put(SfxStringItem(DSID_USER, ::comphelper::getString(xProp->getPropertyValue(PROPERTY_USER)))); if ( xPropInfo->hasPropertyByName(PROPERTY_PASSWORD) ) + { m_pOutputSet->Put(SfxStringItem(DSID_PASSWORD, ::comphelper::getString(xProp->getPropertyValue(PROPERTY_PASSWORD)))); + m_pOutputSet->Put(SfxBoolItem(DSID_PASSWORDREQUIRED, TRUE)); + } if ( xPropInfo->hasPropertyByName(PROPERTY_CACHESIZE) ) m_pOutputSet->Put(SfxInt32Item(DSID_CONN_CACHESIZE, ::comphelper::getINT32(xProp->getPropertyValue(PROPERTY_CACHESIZE)))); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
