INTEGRATION: CWS changefileheader (1.7.16); FILE MERGED

2008/04/01 15:06:50 thb 1.7.16.3: #i85898# Stripping all external header guards
2008/04/01 12:27:29 thb 1.7.16.2: #i85898# Stripping all external header guards
2008/03/31 12:22:49 rt 1.7.16.1: #i87441# Change license header to LPGL v3.

configmgr/source/misc/bootstrapcontext.cxx

@@ -1,35 +1,30 @@
 /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: bootstrapcontext.cxx,v $
+ * $Revision: 1.8 $
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: ihi $ $Date: 2007-11-23 14:28:57 $
+ * 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.
  *
- *  The Contents of this file are made available subject to
+ * OpenOffice.org is distributed in the hope that it will be useful,
- *  the terms of GNU Lesser General Public License Version 2.1.
- *
- *
- *    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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    Lesser General Public License for more details.
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Lesser General Public License
- *    License along with this library; if not, write to the Free Software
+ * version 3 along with OpenOffice.org.  If not, see
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * <http://www.openoffice.org/license.html>
- *    MA  02111-1307  USA
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
@@ -37,31 +32,14 @@
 #include "precompiled_configmgr.hxx"
 
 #include "bootstrapcontext.hxx"
-
-#ifndef _UNO_CURRENT_CONTEXT_HXX_
 #include <uno/current_context.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
 #include <cppuhelper/implbase2.hxx>
-#endif
-#ifndef _CPPUHELPER_EXC_HLP_HXX_
 #include <cppuhelper/exc_hlp.hxx>
-#endif
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
 #include <cppuhelper/typeprovider.hxx>
-#endif
-#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_
 #include <com/sun/star/uno/XComponentContext.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
 #include <com/sun/star/lang/DisposedException.hpp>
-#endif
-#ifndef CONFIGMGR_UTILITY_HXX_
 #include "utility.hxx"
-#endif
 
 namespace configmgr
 {