From 92d67985baf4d6f834190f2ed8d8c09bf56a8a57 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Wed, 15 Sep 2010 14:06:36 +0200
Subject: remove useless license prompt for extensions

---
 sdext/source/minimizer/description.xml        |  6 ------
 sdext/source/pdfimport/config/description.xml |  6 ------
 sdext/source/presenter/description.xml        |  6 ------
 sdext/source/presenter/makefile.mk            | 17 -----------------
 4 files changed, 35 deletions(-)

(limited to 'sdext')

diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 64a67a05b343..455c92a8a392 100755
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -11,12 +11,6 @@
         <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
     </dependencies>
 
-    <registration>
-        <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-        </simple-license>
-    </registration>
-
     <version value="1.0.2"/>
 
     <platform value="UPDATED_SUPPORTED_PLATFORM"/>
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index b22b81587fc7..0b4031a5a63f 100755
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -10,12 +10,6 @@
         <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
     </dependencies>
 
-    <registration>
-        <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-        <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-        </simple-license>
-    </registration>
-
     <version value="1.0.3" />
 
     <platform value="UPDATED_SUPPORTED_PLATFORM" />
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index ede52f0bf1bb..cbe292c04152 100755
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -11,12 +11,6 @@
     <OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/>
   </dependencies>
 
-  <registration>
-    <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-      <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-    </simple-license>
-  </registration>
-
   <version value="1.1.0" />
 
   <platform value="UPDATED_PLATFORM" />
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 08a3470fc24d..17bc1ed2cf59 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -115,12 +115,6 @@ ZIP1LIST=		*
 
 DESCRIPTION:=$(ZIP1DIR)$/description.xml
 
-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i)
-.ELSE
-PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
-.ENDIF
-
 .IF "$(WITH_LANG)"==""
 FIND_XCU=registry/data
 .ELSE			# "$(WITH_LANG)"==""
@@ -254,7 +248,6 @@ COMPONENT_HELP= 								\
 #	$(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
 
 ZIP1DEPS=					\
-    $(PACKLICS) 			\
     $(DESCRIPTION)			\
     $(COMPONENT_MANIFEST)	\
     $(COMPONENT_FILES)		\
@@ -343,16 +336,6 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
 .ENDIF
 
 
-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
-    @@-$(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $< $@
-.ELSE
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
-    @@-$(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $< $@
-.ENDIF
-
 
 $(ZIP1DIR)/%.xcu : %.xcu
     @@-$(MKDIRHIER) $(@:d)
-- 
cgit