User: rt Date: 2008-04-10 10:34:03+0000 Modified: dba/connectivity/source/drivers/odbc/OStatement.cxx
Log: INTEGRATION: CWS changefileheader (1.39.22); FILE MERGED 2008/04/01 15:09:04 thb 1.39.22.3: #i85898# Stripping all external header guards 2008/04/01 10:53:16 thb 1.39.22.2: #i85898# Stripping all external header guards 2008/03/28 15:24:04 rt 1.39.22.1: #i87441# Change license header to LPGL v3. File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OStatement.cxx?r1=1.39&r2=1.40 Delta lines: +19 -60 --------------------- --- OStatement.cxx 2008-01-30 07:58:45+0000 1.39 +++ OStatement.cxx 2008-04-10 10:34:00+0000 1.40 @@ -1,35 +1,30 @@ /************************************************************************* * + * 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. + * 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 along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * 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. * ************************************************************************/ @@ -37,59 +32,23 @@ #include "precompiled_connectivity.hxx" #include <stdio.h> - -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _CONNECTIVITY_ODBC_OSTATEMENT_HXX_ #include "odbc/OStatement.hxx" -#endif -#ifndef _CONNECTIVITY_ODBC_OCONNECTION_HXX_ #include "odbc/OConnection.hxx" -#endif -#ifndef _CONNECTIVITY_ODBC_ORESULTSET_HXX_ #include "odbc/OResultSet.hxx" -#endif -#ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> -#endif -#ifndef _CONNECTIVITY_OTOOLS_HXX_ #include "odbc/OTools.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> -#endif -#ifndef _OSL_THREAD_H_ #include <osl/thread.h> -#endif - -#ifndef _COM_SUN_STAR_SDBC_RESULTSETCONCURRENCY_HPP_ #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_RESULTSETTYPE_HPP_ #include <com/sun/star/sdbc/ResultSetType.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_FETCHDIRECTION_HPP_ #include <com/sun/star/sdbc/FetchDirection.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> -#endif -#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> -#endif -#ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> -#endif -#ifndef CONNECTIVITY_DIAGNOSE_EX_H #include "diagnose_ex.h" -#endif #include <algorithm> using namespace ::comphelper; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
