INTEGRATION: CWS ooo19126 (1.2.474); FILE MERGED

2005/09/05 13:01:45 rt 1.2.474.1: #i54170# Change license header: remove SISSL

2 files changed, 52 insertions, 105 deletions

diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp
index 6ef79f0d8..1db69766f 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp
@@ -1,61 +1,35 @@
 /*************************************************************************
  *
- *  $RCSfile: XCallback_Impl.cpp,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: vg $ $Date: 2003-05-22 10:08: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
+ *  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: XCallback_Impl.cpp,v $
  *
+ *  $Revision: 1.3 $
  *
- *  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-08 20:56:40 $
  *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRUNTIES 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
  *
  ************************************************************************/
 // XCallback_Impl.cpp : Implementation of DLL Exports.
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc
index a6d8e7fd0..124b7ea81 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc
@@ -1,63 +1,36 @@
 /*************************************************************************
 *
-*   $RCSfile: XCallback_Impl.rc,v $
-*
-*   $Revision: 1.2 $
-*
-*   last change: $Author: vg $ $Date: 2003-05-22 10:10:11 $
-*
-*   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 WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
-*   WITHOUT LIMITATION, WARRUNTIES 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: XCallback_Impl.rc,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: rt $ $Date: 2005-09-08 20: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
+ *
 **************************************************************************/
 
 #include "resource.h"