From 9eb4e30e16d8ebfe38d78a0209e9ff64f8067c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 11 Apr 2008 13:03:46 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.14.72); FILE MERGED 2008/04/01 12:27:40 thb 1.14.72.2: #i85898# Stripping all external header guards 2008/03/31 12:23:00 rt 1.14.72.1: #i87441# Change license header to LPGL v3. --- configmgr/source/xml/elementparser.cxx | 47 ++++++++++---------------- configmgr/source/xml/layerparser.cxx | 43 ++++++++++------------- configmgr/source/xml/layerwriter.cxx | 47 ++++++++++---------------- 3 files changed, 54 insertions(+), 83 deletions(-) diff --git a/configmgr/source/xml/elementparser.cxx b/configmgr/source/xml/elementparser.cxx index fe49e59ee8e3..fdd4dd213820 100644 --- a/configmgr/source/xml/elementparser.cxx +++ b/configmgr/source/xml/elementparser.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: elementparser.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2006-09-16 15:33:48 $ + * $RCSfile: elementparser.cxx,v $ + * $Revision: 1.15 $ * - * 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,14 +32,8 @@ #include "precompiled_configmgr.hxx" #include "elementparser.hxx" - -#ifndef CONFIGMGR_XML_STRINGS_HXX_ #include "xmlstrings.hxx" -#endif - -#ifndef CONFIGMGR_TYPECONVERTER_HXX #include "typeconverter.hxx" -#endif #include #include diff --git a/configmgr/source/xml/layerparser.cxx b/configmgr/source/xml/layerparser.cxx index ab49b4a2febf..f4c169f74ab7 100644 --- a/configmgr/source/xml/layerparser.cxx +++ b/configmgr/source/xml/layerparser.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: layerparser.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2006-09-16 15:34:01 $ + * $RCSfile: layerparser.cxx,v $ + * $Revision: 1.15 $ * - * 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. * ************************************************************************/ @@ -40,9 +35,7 @@ #include "layerparser.hxx" // ----------------------------------------------------------------------------- -#ifndef CONFIGMGR_WRAPEXCEPTION_HXX #include "wrapexception.hxx" -#endif #define WRAP_PARSE_EXCEPTIONS() \ PASS_EXCEPTION(sax::SAXException) \ diff --git a/configmgr/source/xml/layerwriter.cxx b/configmgr/source/xml/layerwriter.cxx index c0832e2de657..b2289c403d7f 100644 --- a/configmgr/source/xml/layerwriter.cxx +++ b/configmgr/source/xml/layerwriter.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: layerwriter.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.14 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2006-09-16 15:34:15 $ + * $RCSfile: layerwriter.cxx,v $ + * $Revision: 1.15 $ * - * 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. * ************************************************************************/ @@ -41,14 +36,8 @@ #ifndef CONFIGMGR_API_FACTORY_HXX_ #include "confapifactory.hxx" #endif - -#ifndef CONFIGMGR_XML_VALUEFORMATTER_HXX #include "valueformatter.hxx" -#endif - -#ifndef _COM_SUN_STAR_BEANS_ILLEGALTYPEEXCEPTION_HPP_ #include -#endif #include #include #include