INTEGRATION: CWS ooo19126 (1.11.90); FILE MERGED

2005/09/05 12:05:28 rt 1.11.90.1: #i54170# Change license header: remove SISSL

2 files changed, 52 insertions, 104 deletions

diff --git a/scripting/source/storage/ScriptMetadataImporter.cxx b/scripting/source/storage/ScriptMetadataImporter.cxx
index 7b3a702a24c4..6e82dbf0d3ab 100644
--- a/scripting/source/storage/ScriptMetadataImporter.cxx
+++ b/scripting/source/storage/ScriptMetadataImporter.cxx
@@ -1,61 +1,35 @@
 /*************************************************************************
  *
- *  $RCSfile: ScriptMetadataImporter.cxx,v $
- *
- *  $Revision: 1.11 $
- *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:29: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
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *  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
+ *  $RCSfile: ScriptMetadataImporter.cxx,v $
  *
+ *  $Revision: 1.12 $
  *
- *  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.
+ *  last change: $Author: rt $ $Date: 2005-09-09 02:36:54 $
  *
- *  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 Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
  *
- *  Copyright: 2000 by Sun Microsystems, Inc.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  All Rights Reserved.
+ *    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.
  *
- *  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/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx
index 578570d6e3d2..cf94d1bcf06c 100755
--- a/scripting/source/storage/ScriptSecurityManager.hxx
+++ b/scripting/source/storage/ScriptSecurityManager.hxx
@@ -1,62 +1,36 @@
 /*************************************************************************
 *
-*  $RCSfile: ScriptSecurityManager.hxx,v $
-*
-*  $Revision: 1.11 $
-*
-*  last change: $Author: dfoster $ $Date: 2003-03-12 15:54:16 $
-*
-*  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: ScriptSecurityManager.hxx,v $
+ *
+ *  $Revision: 1.12 $
+ *
+ *  last change: $Author: rt $ $Date: 2005-09-09 02:37:37 $
+ *
+ *  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
+ *
 ************************************************************************/