[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source

Samuel Mehrbrodt s.mehrbrodt at gmail.com
Fri Jan 13 09:51:01 UTC 2017


 instsetoo_native/CustomTarget_setup.mk |    5 +----
 scp2/source/ooo/common_brand.scp       |   18 ------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 53a3e0cd48075011e3c29070e8ff8585c02779c6
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date:   Thu Jan 12 14:43:35 2017 +0000

    Remove unused ini properties
    
    Change-Id: Iea95f5975968f73e2e4aea34246c83f384341592
    Reviewed-on: https://gerrit.libreoffice.org/33000
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 2b9429c..3226cd6 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -34,10 +34,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
-		echo '[ErrorReport]' \
-		&& echo 'ErrorReportPort=80' \
-		&& echo 'ErrorReportServer=report.libreoffice.org' \
-		&& echo '[Bootstrap]' \
+		echo '[Bootstrap]' \
 		&& echo 'InstallMode=<installmode>' \
 		&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
 		$(if $(ENABLE_RELEASE_BUILD),\
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1f88ada..7eb4e0e 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -644,15 +644,6 @@ End
 
 // ProfileItems
 
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "ErrorReport";
-    Order = 8;
-    Key = "ErrorReportServer";
-    Value = "report.libreoffice.org";
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -662,15 +653,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
     Value = "<productkey>";
 End
 
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Port
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "ErrorReport";
-    Order = 7;
-    Key = "ErrorReportPort";
-    Value = "80";
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Installmode
     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
     ModuleID = gid_Module_Root_Brand;


More information about the Libreoffice-commits mailing list