INTEGRATION: CWS ooo19126 (1.7.430); FILE MERGED

2005/09/05 19:32:56 mh 1.7.430.3: still need OOO_LICENSE as long as new strings are not in localize.sdf, #i10000#
2005/09/05 14:51:53 mh 1.7.430.2: update license text, #i54228#
2005/09/05 14:25:29 rt 1.7.430.1: #i54170# Change license header: remove SISSL

1 files changed, 23 insertions, 50 deletions

diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk
index 51c4e6a147..8c51e47e9f 100644
--- a/svx/source/intro/makefile.mk
+++ b/svx/source/intro/makefile.mk
@@ -1,62 +1,35 @@
 #*************************************************************************
 #
-#   $RCSfile: makefile.mk,v $
-#
-#   $Revision: 1.7 $
-#
-#   last change: $Author: kz $ $Date: 2005-01-21 16:57:43 $
-#
-#   The Contents of this file are made available subject to the terms of
-#   either of the following licenses
-#
-#          - 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
+#   OpenOffice.org - a multi-platform office productivity suite
 #
+#   $RCSfile: makefile.mk,v $
 #
-#   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.
+#   $Revision: 1.8 $
 #
-#   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.
+#   last change: $Author: rt $ $Date: 2005-09-08 23:31:48 $
 #
-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
 #
-#   Copyright: 2000 by Sun Microsystems, Inc.
 #
-#   All Rights Reserved.
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
 #
-#   Contributor(s): _______________________________________
+#     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
 #
 #*************************************************************************
 PRJ=..$/..$
@@ -75,9 +48,9 @@ RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES
 # setting the compiled by $user$ using $license$ string in the about box
 
 .IF "$(BUILD_SPECIAL)"==""
-RSCDEFS+=-DOOO_VENDOR="$(USER)$(USERNAME)" -DOOO_LICENSE="LGPL"
+RSCDEFS+=-DOOO_VENDOR="$(USER)$(USERNAME)"  -DOOO_LICENSE="LGPL"
 .ELSE
-RSCDEFS+=-DBUILD_SPECIAL=True
+RSCDEFS+=-DBUILD_SPECIAL=True -DOOO_LICENSE="LGPL"
 .ENDIF
 
 # --- Allgemein -----------------------------------------------------------