INTEGRATION: CWS ooo19126 (1.9.12); FILE MERGED

2005/09/05 18:39:21 rt 1.9.12.1: #i54170# Change license header: remove SISSL
This commit is contained in:
Rüdiger Timm 2005-09-08 15:53:17 +00:00
parent 2c5dbe5823
commit 17f8f574d1

View file

@ -1,22 +1,20 @@
/************************************************************************* /*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: pyuno_module.cxx,v $ * $RCSfile: pyuno_module.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: vg $ $Date: 2005-02-24 14:25:09 $ * last change: $Author: rt $ $Date: 2005-09-08 16:53:17 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to
* either of the following licenses * the terms of GNU Lesser General Public License Version 2.1.
* *
* - 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 * GNU Lesser General Public License Version 2.1
* ============================================= * =============================================
* Copyright 2000 by Sun Microsystems, Inc. * Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 901 San Antonio Road, Palo Alto, CA 94303, USA
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -33,30 +31,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * 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: Ralph Thomas
*
* Copyright: 2000 by Sun Microsystems, Inc.
*
* All Rights Reserved.
*
* Contributor(s): Ralph Thomas, Joerg Budischewski
*
*
************************************************************************/ ************************************************************************/
#include <osl/module.hxx> #include <osl/module.hxx>
#include <osl/thread.h> #include <osl/thread.h>