From 88e49f997feeea065496ab27e6c2bc1e451eb796 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Apr 2008 13:14:37 +0000 Subject: INTEGRATION: CWS changefileheader (1.4.72); FILE MERGED 2008/04/01 12:27:42 thb 1.4.72.2: #i85898# Stripping all external header guards 2008/03/31 12:23:04 rt 1.4.72.1: #i87441# Change license header to LPGL v3. --- configmgr/workben/logger/loggerdfn.cxx | 46 +++++++++++++------------------ configmgr/workben/logger/simplelogger.cxx | 46 +++++++++++++------------------ 2 files changed, 38 insertions(+), 54 deletions(-) (limited to 'configmgr/workben') diff --git a/configmgr/workben/logger/loggerdfn.cxx b/configmgr/workben/logger/loggerdfn.cxx index f1ad25773e..ae8931435b 100644 --- a/configmgr/workben/logger/loggerdfn.cxx +++ b/configmgr/workben/logger/loggerdfn.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: loggerdfn.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.4 $ + * $RCSfile: loggerdfn.cxx,v $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:39:51 $ + * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -37,10 +32,7 @@ #include "precompiled_configmgr.hxx" #include "simplelogger.hxx" - -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include -#endif #ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include #endif diff --git a/configmgr/workben/logger/simplelogger.cxx b/configmgr/workben/logger/simplelogger.cxx index 3b892e0b68..2fb8de0937 100644 --- a/configmgr/workben/logger/simplelogger.cxx +++ b/configmgr/workben/logger/simplelogger.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: simplelogger.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.4 $ + * $RCSfile: simplelogger.cxx,v $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:40:05 $ + * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -37,10 +32,7 @@ #include "precompiled_configmgr.hxx" #include "simplelogger.hxx" - -#ifndef _COM_SUN_STAR_UTIL_LOGGING_LOGLEVEL_HPP_ #include -#endif #include #include // for getenv -- cgit v1.2.3