INTEGRATION: CWS ooo19126 (1.1.16); FILE MERGED

2005/09/05 14:03:19 rt 1.1.16.1: #i54170# Change license header: remove SISSL

4 files changed, 96 insertions, 174 deletions

diff --git a/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index 10e7edacc79d..042b450cec3f 100644
--- a/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ b/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -1,55 +1,35 @@
 /************************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: ConverterInfoReader.java,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.2 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2005-09-09 11:43:53 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************/
 
diff --git a/xmerge/java/org/openoffice/xmerge/util/registry/RegistryException.java b/xmerge/java/org/openoffice/xmerge/util/registry/RegistryException.java
index 0dbba18a48a2..3c48417bd643 100644
--- a/xmerge/java/org/openoffice/xmerge/util/registry/RegistryException.java
+++ b/xmerge/java/org/openoffice/xmerge/util/registry/RegistryException.java
@@ -1,55 +1,35 @@
 /************************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: RegistryException.java,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.2 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2005-09-09 11:44:19 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************/
 
diff --git a/xmerge/java/org/openoffice/xmerge/util/registry/converter.dtd b/xmerge/java/org/openoffice/xmerge/util/registry/converter.dtd
index 7983a21a285b..a84fefb95d07 100644
--- a/xmerge/java/org/openoffice/xmerge/util/registry/converter.dtd
+++ b/xmerge/java/org/openoffice/xmerge/util/registry/converter.dtd
@@ -1,56 +1,37 @@
 <!--
- #  The Contents of this file are made available subject to the terms of
- #  either of the following licenses
- #
- #         - GNU Lesser General Public License Version 2.1
- #         - Sun Industry Standards Source License Version 1.1
- #
- #  Sun Microsystems Inc., October, 2000
- #
- #  GNU Lesser General Public License Version 2.1
- #  =============================================
- #  Copyright 2000 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
- #
- #
- #  Sun Industry Standards Source License Version 1.1
- #  =================================================
- #  The contents of this file are subject to the Sun Industry Standards
- #  Source License Version 1.1 (the "License"); You may not use this file
- #  except in compliance with the License. You may obtain a copy of the
- #  License at http://www.openoffice.org/license.html.
- #
- #  Software provided under this License is provided on an "AS IS" basis,
- #  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- #  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- #  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- #  See the License for the specific provisions governing your rights and
- #  obligations concerning the Software.
- #
- #  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- #
- #  Copyright: 2000 by Sun Microsystems, Inc.
- #
- #  All Rights Reserved.
- #
- #  Contributor(s): _______________________________________
- #
- #
- -->
+
+    OpenOffice.org - a multi-platform office productivity suite
+ 
+    $RCSfile: converter.dtd,v $
+ 
+    $Revision: 1.2 $
+ 
+    last change: $Author: rt $ $Date: 2005-09-09 11:44:50 $
+ 
+    The Contents of this file are made available subject to
+    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
+      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
+ 
+-->
 
 <!-- converter.dtd
 
diff --git a/xmerge/java/org/openoffice/xmerge/util/registry/makefile.mk b/xmerge/java/org/openoffice/xmerge/util/registry/makefile.mk
index 8a758756cee2..ef79ce6fe9f1 100644
--- a/xmerge/java/org/openoffice/xmerge/util/registry/makefile.mk
+++ b/xmerge/java/org/openoffice/xmerge/util/registry/makefile.mk
@@ -1,54 +1,35 @@
 #***************************************************************************
 #
-#  The Contents of this file are made available subject to the terms of
-#  either of the following licenses
+#   OpenOffice.org - a multi-platform office productivity suite
 #
-#         - GNU Lesser General Public License Version 2.1
-#         - Sun Industry Standards Source License Version 1.1
+#   $RCSfile: makefile.mk,v $
 #
-#  Sun Microsystems Inc., October, 2000
+#   $Revision: 1.2 $
 #
-#  GNU Lesser General Public License Version 2.1
-#  =============================================
-#  Copyright 2000 by Sun Microsystems, Inc.
-#  901 San Antonio Road, Palo Alto, CA 94303, USA
+#   last change: $Author: rt $ $Date: 2005-09-09 11:45:06 $
 #
-#  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.
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
 #
-#  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
+#     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.
 #
-#  Sun Industry Standards Source License Version 1.1
-#  =================================================
-#  The contents of this file are subject to the Sun Industry Standards
-#  Source License Version 1.1 (the "License"); You may not use this file
-#  except in compliance with the License. You may obtain a copy of the
-#  License at http://www.openoffice.org/license.html.
+#     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.
 #
-#  Software provided under this License is provided on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-#  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-#  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-#  See the License for the specific provisions governing your rights and
-#  obligations concerning the Software.
-#
-#  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-#
-#  Copyright: 2000 by Sun Microsystems, Inc.
-#
-#  All Rights Reserved.
-#
-#  Contributor(s): _______________________________________
+#     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
 #
 #***************************************************************************