diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 07:28:20 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 07:28:20 +0000 |
commit | a89ad08954173e5658a744f43c0fd3ca872cba00 (patch) | |
tree | 6e65cebece7c43eaadf5b23cbebc45bbd1e03849 /connectivity/source/drivers/calc | |
parent | 327254b8bc2c400117661fa997588aff69fae69a (diff) |
INTEGRATION: CWS changefileheader (1.6.8); FILE MERGED
2008/04/01 10:52:51 thb 1.6.8.2: #i85898# Stripping all external header guards
2008/03/28 15:23:27 rt 1.6.8.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'connectivity/source/drivers/calc')
-rw-r--r-- | connectivity/source/drivers/calc/CCatalog.cxx | 54 |
1 files changed, 19 insertions, 35 deletions
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx index 084b2323a7..214c05cd6d 100644 --- a/connectivity/source/drivers/calc/CCatalog.cxx +++ b/connectivity/source/drivers/calc/CCatalog.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: CCatalog.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.6 $ + * $RCSfile: CCatalog.cxx,v $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2008-03-05 16:25:59 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * 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, - * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -37,22 +32,11 @@ #include "precompiled_connectivity.hxx" -#ifndef _CONNECTIVITY_CALC_CATALOG_HXX_ #include "calc/CCatalog.hxx" -#endif - -#ifndef _CONNECTIVITY_CALC_CONNECTION_HXX_ #include "calc/CConnection.hxx" -#endif -#ifndef _CONNECTIVITY_CALC_TABLES_HXX_ #include "calc/CTables.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include <com/sun/star/sdbc/XResultSet.hpp> -#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; |