INTEGRATION: CWS ooo19126 (1.1.1.1.110); FILE MERGED

2005/09/05 18:43:58 rt 1.1.1.1.110.1: #i54170# Change license header: remove SISSL

2 files changed, 63 insertions, 90 deletions

diff --git a/chart2/workbench/fileformat/table.mod b/chart2/workbench/fileformat/table.mod
index 1d57c690de66..9800a1e66e0d 100644
--- a/chart2/workbench/fileformat/table.mod
+++ b/chart2/workbench/fileformat/table.mod
@@ -1,56 +1,36 @@
 <!--
-	$Id: table.mod,v 1.1.1.1 2003-10-06 09:58:35 bm Exp $
-
-   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 EXPRESS 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: table.mod,v $
+ 
+    $Revision: 1.2 $
+ 
+    last change: $Author: rt $ $Date: 2005-09-08 01:57:07 $
+ 
+    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
+ 
 -->
 
 <!ELEMENT table:calculation-settings (table:null-date?, table:iteration?)>
diff --git a/chart2/workbench/fileformat/text.mod b/chart2/workbench/fileformat/text.mod
index 6a257e4c8e86..0c545742d61e 100644
--- a/chart2/workbench/fileformat/text.mod
+++ b/chart2/workbench/fileformat/text.mod
@@ -1,43 +1,36 @@
 <!--
-	$Id: text.mod,v 1.1.1.1 2003-10-06 09:58:35 bm Exp $
 
-   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 EXPRESS 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: text.mod,v $
+ 
+    $Revision: 1.2 $
+ 
+    last change: $Author: rt $ $Date: 2005-09-08 01:57:22 $
+ 
+    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
+ 
 -->
 <!ENTITY % fields "text:date |
 				   text:time |
@@ -899,4 +892,4 @@ indices, and there may be only one text:index-title element.
 <!ATTLIST text:changed-region text:merge-last-paragraph %boolean; "true">
 <!ELEMENT text:insertion (office:change-info, %sectionText;)>
 <!ELEMENT text:deletion (office:change-info, %sectionText;)>
-<!ELEMENT text:format-change (office:change-info)>
\ No newline at end of file
+<!ELEMENT text:format-change (office:change-info)>