Tag: cws_src680_codecleanup01 User: mt Date: 05/10/07 18:06:11 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionPage.cxx
Log: RESYNC: (1.10-1.12); FILE MERGED 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.10.64.1&r2=1.10.64.2 Delta lines: +27 -49 --------------------- --- ConnectionPage.cxx 26 Jul 2005 12:40:48 -0000 1.10.64.1 +++ ConnectionPage.cxx 8 Oct 2005 01:06:08 -0000 1.10.64.2 @@ -1,22 +1,20 @@ /************************************************************************* * + * OpenOffice.org - a multi-platform office productivity suite + * * $RCSfile$ * * $Revision$ * * last change: $Author$ $Date$ * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 + * The Contents of this file are made available subject to + * the terms of GNU Lesser General Public License Version 2.1. * - * Sun Microsystems Inc., October, 2000 * * GNU Lesser General Public License Version 2.1 * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. + * Copyright 2005 by Sun Microsystems, Inc. * 901 San Antonio Road, Palo Alto, CA 94303, USA * * This library is free software; you can redistribute it and/or @@ -33,30 +31,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc.. - * - * Copyright: 2000 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): Ocke Janssen - * - * ************************************************************************/ #ifndef DBAUI_CONNECTIONPAGE_HXX @@ -269,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 ) { @@ -283,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))); @@ -344,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]
