From d60d89c83590781e564477428af10522c7e67ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 11 Apr 2008 12:40:28 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.23.16); FILE MERGED 2008/04/01 15:06:55 thb 1.23.16.3: #i85898# Stripping all external header guards 2008/04/01 12:27:35 thb 1.23.16.2: #i85898# Stripping all external header guards 2008/03/31 12:22:54 rt 1.23.16.1: #i87441# Change license header to LPGL v3. --- configmgr/source/treecache/disposetimer.cxx | 53 +++++++-------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/configmgr/source/treecache/disposetimer.cxx b/configmgr/source/treecache/disposetimer.cxx index eda9257af70e..2876b62bf288 100644 --- a/configmgr/source/treecache/disposetimer.cxx +++ b/configmgr/source/treecache/disposetimer.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: disposetimer.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.23 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: ihi $ $Date: 2007-11-23 14:38:01 $ + * $RCSfile: disposetimer.cxx,v $ + * $Revision: 1.24 $ * - * 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,22 +34,10 @@ #include #include "disposetimer.hxx" - -#ifndef CONFIGMGR_BACKEND_CACHECONTROLLER_HXX #include "cachecontroller.hxx" -#endif - -#ifndef CONFIGMGR_CONFIGEXCEPT_HXX_ #include "configexcept.hxx" -#endif - -#ifndef _CONFIGMGR_TRACER_HXX_ #include "tracer.hxx" -#endif - -#ifndef _OSL_DIAGNOSE_H_ #include -#endif namespace configmgr