User: hr Date: 05/09/23 05:25:51 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionPage.cxx
Log: INTEGRATION: CWS dba201b (1.10.38); FILE MERGED 2005/09/21 08:18:38 oj 1.10.38.2: RESYNC: (1.10-1.11); FILE MERGED 2005/07/11 13:37:17 fs 1.10.38.1: merging CWS dba201 into CWS dba201b File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.11&r2=1.12 Delta lines: +6 -2 ------------------- --- ConnectionPage.cxx 8 Sep 2005 14:44:34 -0000 1.11 +++ ConnectionPage.cxx 23 Sep 2005 12:25:48 -0000 1.12 @@ -243,6 +243,7 @@ m_eType = m_pAdminDialog->getDatasourceType(_rSet); OConnectionHelper::implInitControls( _rSet, _bSaveValue); + sal_Bool bShowUser = sal_True; OLocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); switch( m_eType ) { @@ -257,6 +258,7 @@ case DST_CALC: m_aFT_Connection.SetText(String(ModuleRes(STR_CALC_PATH_OR_FILE))); m_aET_Connection.SetHelpId(HID_DSADMIN_CALC_PATH); + bShowUser = sal_False; break; case DST_ADABAS: m_aFT_Connection.SetText(String(ModuleRes(STR_ADABAS_DATABASE_NAME))); @@ -318,9 +320,11 @@ m_aPB_Connection.SetHelpId(HID_DSADMIN_BROWSECONN); BOOL bShowUserAuthenfication = m_pCollection->hasAuthentication(m_eType); m_aFL2.Show(bShowUserAuthenfication); - m_aUserNameLabel.Show(bShowUserAuthenfication); - m_aUserName.Show(bShowUserAuthenfication); + m_aUserNameLabel.Show(bShowUser && bShowUserAuthenfication); + m_aUserName.Show(bShowUser && bShowUserAuthenfication); m_aPasswordRequired.Show(bShowUserAuthenfication); + if ( !bShowUser && bShowUserAuthenfication ) + m_aPasswordRequired.SetPosPixel(m_aUserNameLabel.GetPosPixel()); // collect the items SFX_ITEMSET_GET(_rSet, pUidItem, SfxStringItem, DSID_USER, sal_True); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
