INTEGRATION: CWS changefileheader (1.10.10); FILE MERGED

2008/03/31 13:24:06 rt 1.10.10.1: #i87441# Change license header to LPGL v3.

2 files changed, 37 insertions, 46 deletions

diff --git a/sal/systools/win32/uwinapi/macros.h b/sal/systools/win32/uwinapi/macros.h
index 61367a63a6d3..a362f94703a4 100644
--- a/sal/systools/win32/uwinapi/macros.h
+++ b/sal/systools/win32/uwinapi/macros.h
@@ -1,35 +1,30 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: macros.h,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $Revision: 1.10 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: rt $ $Date: 2008-03-12 07:38:25 $
+ * $RCSfile: macros.h,v $
+ * $Revision: 1.11 $
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp b/sal/systools/win32/uwinapi/uwinapi.dxp
index b3a7bf1e8c53..06d98948b72b 100644
--- a/sal/systools/win32/uwinapi/uwinapi.dxp
+++ b/sal/systools/win32/uwinapi/uwinapi.dxp
@@ -1,35 +1,31 @@
 ;*************************************************************************
 ;
-;   OpenOffice.org - a multi-platform office productivity suite
+; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+; 
+; Copyright 2008 by Sun Microsystems, Inc.
 ;
-;   $RCSfile: uwinapi.dxp,v $
+; OpenOffice.org - a multi-platform office productivity suite
 ;
-;   $Revision: 1.10 $
+; $RCSfile: uwinapi.dxp,v $
 ;
-;   last change: $Author: rt $ $Date: 2008-03-12 07:39:09 $
+; $Revision: 1.11 $
 ;
-;   The Contents of this file are made available subject to
-;   the terms of GNU Lesser General Public License Version 2.1.
+; This file is part of OpenOffice.org.
 ;
+; OpenOffice.org is free software: you can redistribute it and/or modify
+; it under the terms of the GNU Lesser General Public License version 3
+; only, as published by the Free Software Foundation.
 ;
-;     GNU Lesser General Public License Version 2.1
-;     =============================================
-;     Copyright 2005 by Sun Microsystems, Inc.
-;     901 San Antonio Road, Palo Alto, CA 94303, USA
+; OpenOffice.org 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 version 3 for more details
+; (a copy is included in the LICENSE file that accompanied this code).
 ;
-;     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
+; You should have received a copy of the GNU Lesser General Public License
+; version 3 along with OpenOffice.org.  If not, see
+; <http://www.openoffice.org/license.html>
+; for a copy of the LGPLv3 License.
 ;
 ;*************************************************************************