INTEGRATION: CWS ooo19126 (1.1.168); FILE MERGED

2005/09/05 15:40:41 rt 1.1.168.1: #i54170# Change license header: remove SISSL

2 files changed, 64 insertions, 116 deletions

diff --git a/qadevOOo/tests/basic/mod/sw/XMLContentImporter/sw_XMLContentImporter.xba b/qadevOOo/tests/basic/mod/sw/XMLContentImporter/sw_XMLContentImporter.xba
index fc646cf01b87..a5829d86cbcf 100644
--- a/qadevOOo/tests/basic/mod/sw/XMLContentImporter/sw_XMLContentImporter.xba
+++ b/qadevOOo/tests/basic/mod/sw/XMLContentImporter/sw_XMLContentImporter.xba
@@ -4,64 +4,38 @@
 
 
 '*************************************************************************
-'*
-'*  $RCSfile: sw_XMLContentImporter.xba,v $ 
-'*
-'*  $Revision: 1.1 $ 
-'*
-'*  last change:$Date: 2003-01-27 18:04:39 $ 
-'*
-'*  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: sw_XMLContentImporter.xba,v $
+'
+'   $Revision: 1.2 $
+'
+'   last change: $Author: rt $ $Date: 2005-09-08 22:17:04 $
+'
+'   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
+'
 '*************************************************************************
 '*************************************************************************
 
diff --git a/qadevOOo/tests/basic/mod/sw/XMLExporter/sw_XMLExporter.xba b/qadevOOo/tests/basic/mod/sw/XMLExporter/sw_XMLExporter.xba
index 596aba74d298..0c5f57ace6df 100644
--- a/qadevOOo/tests/basic/mod/sw/XMLExporter/sw_XMLExporter.xba
+++ b/qadevOOo/tests/basic/mod/sw/XMLExporter/sw_XMLExporter.xba
@@ -4,64 +4,38 @@
 
 
 '*************************************************************************
-'*
-'*  $RCSfile: sw_XMLExporter.xba,v $ 
-'*
-'*  $Revision: 1.1 $ 
-'*
-'*  last change:$Date: 2003-01-27 18:04:40 $ 
-'*
-'*  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: sw_XMLExporter.xba,v $
+'
+'   $Revision: 1.2 $
+'
+'   last change: $Author: rt $ $Date: 2005-09-08 22:17:20 $
+'
+'   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
+'
 '*************************************************************************
 '*************************************************************************