INTEGRATION: CWS changefileheader (1.3.184); FILE MERGED

2008/04/01 16:02:30 thb 1.3.184.2: #i85898# Stripping all external header guards
2008/03/31 15:30:33 rt 1.3.184.1: #i87441# Change license header to LPGL v3.

2 files changed, 38 insertions, 68 deletions

diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx
index eff5ec22f2..99e947204b 100644
--- a/ucb/workben/cachemap/cachemapobject1.hxx
+++ b/ucb/workben/cachemap/cachemapobject1.hxx
@@ -1,56 +1,41 @@
 /*************************************************************************
  *
- *  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: cachemapobject1.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * $RCSfile: cachemapobject1.hxx,v $
+ * $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 16:19:30 $
+ * 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
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
 #ifndef INCLUDED_UCB_CACHEMAPOBJECT1_HXX
 #define INCLUDED_UCB_CACHEMAPOBJECT1_HXX
 
-#ifndef _OSL_INTERLOCK_H_
 #include "osl/interlck.h"
-#endif
-#ifndef _OSL_MUTEX_HXX_
 #include "osl/mutex.hxx"
-#endif
-#ifndef _RTL_REF_HXX_
 #include "rtl/ref.hxx"
-#endif
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
-#ifndef _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_
 #include "salhelper/simplereferenceobject.hxx"
-#endif
 
 #ifndef INCLUDED_MAP
 #include <map>
diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx
index b309bc9ac2..0cf2c982a1 100644
--- a/ucb/workben/cachemap/cachemapobject3.hxx
+++ b/ucb/workben/cachemap/cachemapobject3.hxx
@@ -1,56 +1,41 @@
 /*************************************************************************
  *
- *  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: cachemapobject3.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * $RCSfile: cachemapobject3.hxx,v $
+ * $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 16:20:26 $
+ * 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
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
 #ifndef INCLUDED_UCB_CACHEMAPOBJECT3_HXX
 #define INCLUDED_UCB_CACHEMAPOBJECT3_HXX
 
-#ifndef _OSL_INTERLOCK_H_
 #include "osl/interlck.h"
-#endif
-#ifndef _OSL_MUTEX_HXX_
 #include "osl/mutex.hxx"
-#endif
-#ifndef _RTL_REF_HXX_
 #include "rtl/ref.hxx"
-#endif
-#ifndef _SAL_TYPES_H_
 #include "sal/types.h"
-#endif
-#ifndef _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_
 #include "salhelper/simplereferenceobject.hxx"
-#endif
 
 #ifndef INCLUDED_MAP
 #include <map>