INTEGRATION: CWS changefileheader (1.6.122); FILE MERGED

2008/04/01 12:41:14 thb 1.6.122.2: #i85898# Stripping all external header guards
2008/03/31 13:17:12 rt 1.6.122.1: #i87441# Change license header to LPGL v3.

2 files changed, 36 insertions, 94 deletions

diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index aeeb132518ec..9e40a3097ab4 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -1,64 +1,41 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: columninfo.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 01:44:02 $
+ * $RCSfile: columninfo.cxx,v $
+ * $Revision: 1.7 $
  *
- *  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
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
-
-#ifndef GLOBAL_HXX_INCLUDED
 #include "internal/global.hxx"
-#endif
-
-#ifndef COLUMNINFO_HXX_INCLUDED
 #include "internal/columninfo.hxx"
-#endif
-
-#ifndef FILEEXTENSIONS_HXX_INCLUDED
 #include "internal/fileextensions.hxx"
-#endif
-
-#ifndef METAINFOREADER_HXX_INCLUDED
 #include "internal/metainforeader.hxx"
-#endif
-
-#ifndef UTILITIES_HXX_INCLUDED
 #include "internal/utilities.hxx"
-#endif
-
-#ifndef CONFIG_HXX_INCLUDED
 #include "internal/config.hxx"
-#endif
 
 #include <malloc.h>
 
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index ac0b8548a9e9..304bff841dbd 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -1,80 +1,45 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: infotips.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $Revision: 1.6 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 01:44:17 $
+ * $RCSfile: infotips.cxx,v $
+ * $Revision: 1.7 $
  *
- *  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
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
-
-#ifndef GLOBAL_HXX_INCLUDED
 #include "internal/global.hxx"
-#endif
-
-#ifndef INFOTIPS_HXX_INCLUDED
 #include "internal/infotips.hxx"
-#endif
-
-#ifndef SHLXTHDL_HXX_INCLUDED
 #include "internal/shlxthdl.hxx"
-#endif
-
-#ifndef METAINFOREADER_HXX_INCLUDED
 #include "internal/metainforeader.hxx"
-#endif
-
-#ifndef CONTENTREADER_HXX_INCLUDED
 #include "internal/contentreader.hxx"
-#endif
-
-#ifndef UTILITIES_HXX_INCLUDED
 #include "internal/utilities.hxx"
-#endif
-
-#ifndef REGISTRY_HXX_INCLUDED
 #include "internal/registry.hxx"
-#endif
-
-#ifndef FILEEXTENSIONS_HXX_INCLUDED
 #include "internal/fileextensions.hxx"
-#endif
-
-#ifndef ISO8601_CONVERTER_HXX_INCLUDED
 #include "internal/iso8601_converter.hxx"
-#endif
-
-#ifndef CONFIG_HXX_INCLUDED
 #include "internal/config.hxx"
-#endif
 
 #include "internal/resource.h"
 #include <stdio.h>