INTEGRATION: CWS ooo19126 (1.2.428); FILE MERGED

2005/09/05 13:22:42 rt 1.2.428.1: #i54170# Change license header: remove SISSL
This commit is contained in:
Rüdiger Timm 2005-09-09 04:09:09 +00:00
parent b186ab9636
commit 7814c5321d
2 changed files with 42 additions and 94 deletions

View file

@ -1,61 +1,35 @@
/************************************************************************* /*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: MutexOwner.hxx,v $ * $RCSfile: MutexOwner.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: rt $ $Date: 2004-07-13 13:56:43 $ * last change: $Author: rt $ $Date: 2005-09-09 05:08:36 $
* *
* 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
* =============================================
* 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 * GNU Lesser General Public License Version 2.1
* ================================================= * =============================================
* The contents of this file are subject to the Sun Industry Standards * Copyright 2005 by Sun Microsystems, Inc.
* Source License Version 1.1 (the "License"); You may not use this file * 901 San Antonio Road, Palo Alto, CA 94303, USA
* 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, * This library is free software; you can redistribute it and/or
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, * modify it under the terms of the GNU Lesser General Public
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * License version 2.1, as published by the Free Software Foundation.
* 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. * This library is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Copyright: 2000 by Sun Microsystems, Inc. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* * Lesser General Public License for more details.
* All Rights Reserved.
*
* Contributor(s): _______________________________________
* *
* 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
* *
************************************************************************/ ************************************************************************/

View file

@ -1,61 +1,35 @@
/************************************************************************* /*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: NotesChildWindow.hrc,v $ * $RCSfile: NotesChildWindow.hrc,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: rt $ $Date: 2004-07-13 13:56:57 $ * last change: $Author: rt $ $Date: 2005-09-09 05:09:09 $
* *
* 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
* =============================================
* 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 * GNU Lesser General Public License Version 2.1
* ================================================= * =============================================
* The contents of this file are subject to the Sun Industry Standards * Copyright 2005 by Sun Microsystems, Inc.
* Source License Version 1.1 (the "License"); You may not use this file * 901 San Antonio Road, Palo Alto, CA 94303, USA
* 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, * This library is free software; you can redistribute it and/or
* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, * modify it under the terms of the GNU Lesser General Public
* WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * License version 2.1, as published by the Free Software Foundation.
* 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. * This library is distributed in the hope that it will be useful,
* * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Copyright: 2000 by Sun Microsystems, Inc. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* * Lesser General Public License for more details.
* All Rights Reserved.
*
* Contributor(s): _______________________________________
* *
* 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
* *
************************************************************************/ ************************************************************************/