From 552a48321c12599a72c4057afeba55275e12f815 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 10 Apr 2008 06:44:41 +0000 Subject: INTEGRATION: CWS changefileheader (1.10.372); FILE MERGED 2008/04/01 15:08:29 thb 1.10.372.3: #i85898# Stripping all external header guards 2008/04/01 10:52:42 thb 1.10.372.2: #i85898# Stripping all external header guards 2008/03/28 15:23:16 rt 1.10.372.1: #i87441# Change license header to LPGL v3. --- connectivity/inc/connectivity/sdbcx/VIndex.hxx | 67 +++++++------------------- connectivity/inc/connectivity/sdbcx/VKey.hxx | 59 +++++++---------------- 2 files changed, 36 insertions(+), 90 deletions(-) (limited to 'connectivity/inc') diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index 95bcb7059f88..f6cc199f966c 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: VIndex.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.10 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-08 05:04:34 $ + * $RCSfile: VIndex.hxx,v $ + * $Revision: 1.11 $ * - * 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. * ************************************************************************/ @@ -39,45 +34,19 @@ //#ifndef _OSL_DIAGNOSE_H_ //#include //#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include -#endif -#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX #include -#endif -#ifndef _CPPUHELPER_COMPBASE2_HXX_ #include -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _CONNECTIVITY_SDBCX_TYPEDEF_HXX_ #include "connectivity/sdbcx/VTypeDef.hxx" -#endif -#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_ #include "connectivity/sdbcx/IRefreshable.hxx" -#endif -#ifndef _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_ #include "connectivity/sdbcx/VDescriptor.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif namespace connectivity { diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index 0eae788a1bce..2aa4253835f9 100644 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: VKey.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.10 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-08 05:05:04 $ + * $RCSfile: VKey.hxx,v $ + * $Revision: 1.11 $ * - * 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. * ************************************************************************/ @@ -37,33 +32,15 @@ #define _CONNECTIVITY_SDBCX_KEY_HXX_ -#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX #include -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/CommonTools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _CONNECTIVITY_SDBCX_TYPEDEF_HXX_ #include "connectivity/sdbcx/VTypeDef.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include -#endif -#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_ #include "connectivity/sdbcx/IRefreshable.hxx" -#endif -#ifndef _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_ #include "connectivity/sdbcx/VDescriptor.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include -#endif namespace connectivity { -- cgit v1.2.3