User: rt Date: 2008-04-10 11:31:26+0000 Modified: dba/connectivity/source/inc/java/sql/ResultSet.hxx
Log: INTEGRATION: CWS changefileheader (1.13.22); FILE MERGED 2008/04/01 15:09:15 thb 1.13.22.3: #i85898# Stripping all external header guards 2008/04/01 10:53:37 thb 1.13.22.2: #i85898# Stripping all external header guards 2008/03/28 15:24:30 rt 1.13.22.1: #i87441# Change license header to LPGL v3. File Changes: Directory: /dba/connectivity/source/inc/java/sql/ ================================================= File [changed]: ResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/ResultSet.hxx?r1=1.13&r2=1.14 Delta lines: +25 -60 --------------------- --- ResultSet.hxx 2008-01-30 08:03:13+0000 1.13 +++ ResultSet.hxx 2008-04-10 11:31:23+0000 1.14 @@ -1,85 +1,50 @@ /************************************************************************* * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * * 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 GNU Lesser General Public License Version 2.1. + * This file is part of OpenOffice.org. * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * 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 - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, + * OpenOffice.org is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_RESULTSET_HXX_ #define _CONNECTIVITY_JAVA_SQL_RESULTSET_HXX_ -#ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ #include "java/lang/Object.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include <com/sun/star/sdbc/XResultSet.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include <com/sun/star/sdbc/XCloseable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include <com/sun/star/sdbc/XColumnLocate.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCANCELLABLE_HPP_ #include <com/sun/star/util/XCancellable.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include <com/sun/star/sdbc/XRowUpdate.hpp> -#endif -#ifndef _CPPUHELPER_COMPBASE10_HXX_ #include <cppuhelper/compbase10.hxx> -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" -#endif -#ifndef _CONNECTIVITY_JAVA_SQL_STATEMENT_HXX_ #include "java/sql/JStatement.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include "java/sql/ConnectionLog.hxx" namespace connectivity --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
