From b23680a9d8dc7c5ee1d3b70483f3e19f1192afe2 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 10 Apr 2008 17:18:04 +0000 Subject: INTEGRATION: CWS changefileheader (1.3.8); FILE MERGED 2008/04/01 15:23:34 thb 1.3.8.3: #i85898# Stripping all external header guards 2008/04/01 12:33:05 thb 1.3.8.2: #i85898# Stripping all external header guards 2008/03/31 13:32:02 rt 1.3.8.1: #i87441# Change license header to LPGL v3. --- reportdesign/source/core/inc/Functions.hxx | 57 ++++++++++----------------- reportdesign/source/core/inc/Group.hxx | 63 ++++++++++-------------------- 2 files changed, 42 insertions(+), 78 deletions(-) diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx index e646a9f36..23bf5e092 100644 --- a/reportdesign/source/core/inc/Functions.hxx +++ b/reportdesign/source/core/inc/Functions.hxx @@ -1,55 +1,40 @@ -#ifndef REPORTDESIGN_API_FUNCTIONS_HXX -#define REPORTDESIGN_API_FUNCTIONS_HXX /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Functions.hxx,v $ - * - * $Revision: 1.3 $ + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * last change: $Author: kz $ $Date: 2008-03-05 17:54:43 $ + * OpenOffice.org - a multi-platform office productivity suite * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * $RCSfile: Functions.hxx,v $ + * $Revision: 1.4 $ * + * This file is part of OpenOffice.org. * - * 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 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. * - * 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. + * 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 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 REPORTDESIGN_API_FUNCTIONS_HXX +#define REPORTDESIGN_API_FUNCTIONS_HXX -#ifndef _COM_SUN_STAR_REPORT_XFUNCTIONS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_REPORT_XFUNCTIONSSUPPLIER_HPP_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE1_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include -#endif #include diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index 3a8004124..147a0467a 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -1,64 +1,43 @@ -#ifndef REPORTDESIGN_API_GROUP_HXX -#define REPORTDESIGN_API_GROUP_HXX /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: Group.hxx,v $ - * - * $Revision: 1.3 $ + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * last change: $Author: kz $ $Date: 2008-03-05 17:54:57 $ + * OpenOffice.org - a multi-platform office productivity suite * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * $RCSfile: Group.hxx,v $ + * $Revision: 1.4 $ * + * This file is part of OpenOffice.org. * - * 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 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. * - * 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. + * 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 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 REPORTDESIGN_API_GROUP_HXX +#define REPORTDESIGN_API_GROUP_HXX -#ifndef _COM_SUN_STAR_REPORT_XGROUP_HPP_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE2_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include -#endif -#ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX #include -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include -#endif -#ifndef RPT_SHARED_GROUPS_PROPERTIES_HXX #include "GroupProperties.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif #include namespace reportdesign -- cgit v1.2.3