summaryrefslogtreecommitdiff
path: root/javaunohelper
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-11 09:44:26 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-11 09:44:26 +0000
commit93c51096f57d804085695f04f3b467e8d58f7e1b (patch)
treea0b3069d39e212827f7fd57e75656d4baf999bb0 /javaunohelper
parent3eb59417c58c465f788a57208ec596c783e65727 (diff)
INTEGRATION: CWS changefileheader (1.3.22); FILE MERGED
2008/03/31 07:24:04 rt 1.3.22.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'javaunohelper')
-rw-r--r--javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java41
-rw-r--r--javaunohelper/com/sun/star/comp/makefile.mk42
2 files changed, 37 insertions, 46 deletions
diff --git a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
index 8e923f0cdb80..010be69c0308 100644
--- a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
+++ b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
@@ -1,35 +1,30 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: JavaUNOHelperServices.java,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.3 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: kz $ $Date: 2006-12-14 15:07:50 $
+ * $RCSfile: JavaUNOHelperServices.java,v $
+ * $Revision: 1.4 $
*
- * 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.
*
************************************************************************/
package com.sun.star.comp;
diff --git a/javaunohelper/com/sun/star/comp/makefile.mk b/javaunohelper/com/sun/star/comp/makefile.mk
index c2fa6063a7b8..2f799f94f66b 100644
--- a/javaunohelper/com/sun/star/comp/makefile.mk
+++ b/javaunohelper/com/sun/star/comp/makefile.mk
@@ -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: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
#
-# $Revision: 1.3 $
+# $RCSfile: makefile.mk,v $
#
-# last change: $Author: kz $ $Date: 2006-12-14 15:02:34 $
+# $Revision: 1.4 $
#
-# 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.
#
#*************************************************************************