INTEGRATION: CWS changefileheader (1.2.8); FILE MERGED

2008/03/31 16:15:11 rt 1.2.8.1: #i87441# Change license header to LPGL v3.

2 files changed, 50 insertions, 58 deletions

diff --git a/oovbaapi/genconstidl/ApiSymbols.dtd b/oovbaapi/genconstidl/ApiSymbols.dtd
index b5c256c567..596d27dcf6 100644
--- a/oovbaapi/genconstidl/ApiSymbols.dtd
+++ b/oovbaapi/genconstidl/ApiSymbols.dtd
@@ -1,36 +1,32 @@
 <!-- =====================================================================
 
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  
+  Copyright 2008 by Sun Microsystems, Inc.
+ 
   OpenOffice.org - a multi-platform office productivity suite
-
+ 
   $RCSfile: ApiSymbols.dtd,v $
-
-  $Revision: 1.2 $
-
-  last change: $Author: vg $ $Date: 2007-12-07 11:16:20 $
-
-  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
-
+ 
+  $Revision: 1.3 $
+ 
+  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.
+ 
+  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).
+ 
+  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.
+ 
 ====================================================================== -->
 
 <!ELEMENT api (element)+>
diff --git a/oovbaapi/genconstidl/access.api b/oovbaapi/genconstidl/access.api
index 1de82d1aa9..07de65e57d 100644
--- a/oovbaapi/genconstidl/access.api
+++ b/oovbaapi/genconstidl/access.api
@@ -1,37 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- =====================================================================
 
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  
+  Copyright 2008 by Sun Microsystems, Inc.
+ 
   OpenOffice.org - a multi-platform office productivity suite
-
+ 
   $RCSfile: access.api,v $
-
-  $Revision: 1.2 $
-
-  last change: $Author: vg $ $Date: 2007-12-07 11:16: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
-
+ 
+  $Revision: 1.3 $
+ 
+  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.
+ 
+  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).
+ 
+  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.
+ 
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->