From 4256042317ce14245a274e15761e17673222f327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 11 Apr 2008 12:59:35 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.4.16); FILE MERGED 2008/04/01 12:27:39 thb 1.4.16.2: #i85898# Stripping all external header guards 2008/03/31 12:22:57 rt 1.4.16.1: #i87441# Change license header to LPGL v3. --- configmgr/source/treemgr/valuenodeimpl.hxx | 43 +++++++++------------- configmgr/source/treemgr/viewnode.hxx | 43 +++++++++------------- 2 files changed, 36 insertions(+), 50 deletions(-) diff --git a/configmgr/source/treemgr/valuenodeimpl.hxx b/configmgr/source/treemgr/valuenodeimpl.hxx index f1fac0d9acd5..0b1d1692d3df 100644 --- a/configmgr/source/treemgr/valuenodeimpl.hxx +++ b/configmgr/source/treemgr/valuenodeimpl.hxx @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: valuenodeimpl.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: ihi $ $Date: 2007-11-23 14:48:41 $ + * $RCSfile: valuenodeimpl.hxx,v $ + * $Revision: 1.5 $ * - * 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 CONFIGMGR_VALUENODEBEHAVIOR_HXX_ #define CONFIGMGR_VALUENODEBEHAVIOR_HXX_ -#ifndef CONFIGMGR_CONFIGNODEBEHAVIOR_HXX_ #include "nodeimpl.hxx" -#endif namespace configmgr { diff --git a/configmgr/source/treemgr/viewnode.hxx b/configmgr/source/treemgr/viewnode.hxx index 6cd9a9ada812..524f2c2da20e 100644 --- a/configmgr/source/treemgr/viewnode.hxx +++ b/configmgr/source/treemgr/viewnode.hxx @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: viewnode.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: ihi $ $Date: 2007-11-23 14:49:54 $ + * $RCSfile: viewnode.hxx,v $ + * $Revision: 1.5 $ * - * 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 CONFIGMGR_VIEWNODE_HXX_ #define CONFIGMGR_VIEWNODE_HXX_ -#ifndef CONFIGMGR_CONFIGNODEIMPL_HXX_ #include "treeimpl.hxx" -#endif #include "valuenodeaccess.hxx" #include "groupnodeaccess.hxx"