Tag: cws_src680_os63 User: os Date: 05/09/15 15:44:07 Modified: /dba/dbaccess/source/ui/dlg/ DbAdminImpl.cxx
Log: RESYNC: (1.9-1.11); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DbAdminImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx?r1=1.8.54.2&r2=1.8.54.3 Delta lines: +23 -49 --------------------- --- DbAdminImpl.cxx 2 Aug 2005 06:42:14 -0000 1.8.54.2 +++ DbAdminImpl.cxx 15 Sep 2005 22:44:03 -0000 1.8.54.3 @@ -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_DBADMINIMPL_HXX_ @@ -367,7 +341,7 @@ makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE)); } - _rDriverParam = Sequence< PropertyValue >(aReturn.begin(), aReturn.size()); + _rDriverParam = Sequence< PropertyValue >(&(*aReturn.begin()), aReturn.size()); // append all the other stuff (charset etc.) fillDatasourceInfo(*m_pItemSetHelper->getOutputSet(), _rDriverParam); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
