From a8e32c17325f85a18895d6368fea19138a99454f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Thu, 10 Apr 2008 08:55:37 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.2.86); FILE MERGED 2008/04/01 15:08:54 thb 1.2.86.3: #i85898# Stripping all external header guards 2008/04/01 10:53:09 thb 1.2.86.2: #i85898# Stripping all external header guards 2008/03/28 15:23:47 rt 1.2.86.1: #i87441# Change license header to LPGL v3. --- .../source/drivers/macab/MacabResultSet.hxx | 62 ++++++------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 1d14188ef785..b687a02b237a 100755 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -1,72 +1,46 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: MacabResultSet.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: ihi $ $Date: 2007-09-13 17:54:08 $ + * $RCSfile: MacabResultSet.hxx,v $ + * $Revision: 1.3 $ * - * 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 + * 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 version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * 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, - * 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 + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _CONNECTIVITY_MACAB_RESULTSET_HXX_ #define _CONNECTIVITY_MACAB_RESULTSET_HXX_ -#ifndef _CONNECTIVITY_MACAB_STATEMENT_HXX_ #include "MacabStatement.hxx" -#endif -#ifndef _CONNECTIVITY_MACAB_RESULTSETMETADATA_HXX_ #include "MacabResultSetMetaData.hxx" -#endif - -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE12_HXX_ #include -#endif namespace connectivity {