[Libreoffice-commits] core.git: officecfg/files.mk officecfg/registry postprocess/CustomTarget_registry.mk
Gabor Kelemen
kelemeng at ubuntu.com
Tue Aug 8 06:58:25 UTC 2017
officecfg/files.mk | 1
officecfg/registry/schema/org/openoffice/Office/Logging.xcs | 26 --
officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs | 115 ----------
postprocess/CustomTarget_registry.mk | 1
4 files changed, 143 deletions(-)
New commits:
commit 05aa784ed9891a1299f8c2328faee9c62050851a
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date: Mon Aug 7 22:44:03 2017 +0200
Drop configuration remains of oooimprovement
It was dropped in 2011:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=bd7f8380113b0cbe706d131b33e7551b2c484205
Change-Id: Ibb9a0860ca9c256177987683ee33828c2c0bad1d
Reviewed-on: https://gerrit.libreoffice.org/40858
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/officecfg/files.mk b/officecfg/files.mk
index ef53818c427a..1e364ade8c98 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -37,7 +37,6 @@ officecfg_XCSFILES := \
Office/Linguistic \
Office/Logging \
Office/Math \
- Office/OOoImprovement/Settings \
Office/OptionsDialog \
Office/Paths \
Office/PresentationMinimizer \
diff --git a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
index 580135909f80..a5ec755ea256 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
@@ -81,32 +81,6 @@
</group>
</templates>
<component>
- <group oor:name="OOoImprovement">
- <info>
- <desc>specifies settings for the logging of userinterface events.</desc>
- </info>
- <prop oor:name="EnablingAllowed" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <desc>only if this is true, usage tracking is allowed and its options will be shown
- </desc>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="LogPath" oor:type="xs:string" oor:nillable="false">
- <info>
- <desc>directory where the logs will get saved
- </desc>
- </info>
- <value>$(user)/temp/Feedback</value>
- </prop>
- <prop oor:name="IdleTimeout" oor:type="xs:int" oor:nillable="false">
- <info>
- <desc>idle time in minutes. If two log event are separated by a longer
- time, the log will be rotated.</desc>
- </info>
- <value>180</value>
- </prop>
- </group>
<set oor:name="Settings" oor:node-type="LoggerSettings">
<info>
<desc>contains the settings for all known loggers in OpenOffice.org.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
deleted file mode 100644
index e328cada2ddd..000000000000
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
--->
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Settings" oor:package="org.openoffice.Office.OOoImprovement" xml:lang="en-US">
- <info>
- <desc>Contains preferences for the OpenOffice.org Improvement Program components.</desc>
- </info>
- <templates/>
- <component>
- <group oor:name="Participation">
- <info>
- <desc>invitations to usage tracking etc.</desc>
- </info>
- <prop oor:name="OfficeStartCounterdown" oor:type="xs:int" oor:nillable="false">
- <info>
- <desc>the number of starts that will be skipped before the user will get invited to the
- OpenOffice.org Improvement Program. If this is zero the user will get asked.
- </desc>
- </info>
- <value>1</value>
- </prop>
- <prop oor:name="InvitationAccepted" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <desc>true, if the user accepted the invitation.</desc>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="ShowedInvitation" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <desc>true, if the user was already invited.</desc>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="DeliveredPrebundled" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <desc>true, if the extension is prebundled - is set by an onFirstRunInitialization job.
- (currently not implemented)</desc>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="HelpUrl" oor:type="xs:string" oor:nillable="false">
- <info>
- <desc>the url where additional information can be found.</desc>
- </info>
- <value>http://wiki.documentfoundation.org/UX/LibreOffice_User_Feedback_Program</value>
- </prop>
- </group>
- <group oor:name="Counters">
- <info>
- <desc>counts of recorded events, uploaded reports etc.</desc>
- </info>
- <prop oor:name="UploadedReports" oor:type="xs:int" oor:nillable="false">
- <info>
- <desc>the number of reports uploaded.</desc>
- </info>
- <value>0</value>
- </prop>
- <prop oor:name="LoggedEvents" oor:type="xs:int" oor:nillable="false">
- <info>
- <desc>the number of events in zipped or already uploaded report.</desc>
- </info>
- <value>0</value>
- </prop>
- <prop oor:name="FailedAttempts" oor:type="xs:int" oor:nillable="false">
- <info>
- <desc>the number of failed upload tries.</desc>
- </info>
- <value>0</value>
- </prop>
- </group>
- <group oor:name="Upload">
- <info>
- <desc>settings on destination for uploading reports</desc>
- </info>
- <prop oor:name="SoapUrl" oor:type="xs:string" oor:nillable="false">
- <info>
- <desc>the url where reports get send to.</desc>
- </info>
- <value>http://report.libreoffice.org:80/soap/servlet/rpcrouter</value>
- </prop>
- <prop oor:name="SoapIdAdditions" oor:type="xs:string" oor:nillable="false">
- <info>
- <desc>Additions to the SoapId for automated testing
- DO NOT SET THIS VALUE UNLESS YOU KNOW WHAT YOU ARE DOING!
- </desc>
- </info>
- <value/>
- </prop>
- <prop oor:name="ReporterEmail" oor:type="xs:string" oor:nillable="false">
- <info>
- <desc>The Emailaddress to fill out in the reportmail.xml file.
- DO NOT SET THIS VALUE UNLESS YOU KNOW WHAT YOU ARE DOING!
- Its only purpose is testing and quality assurance.
- </desc>
- </info>
- <value/>
- </prop>
- </group>
- </component>
-</oor:component-schema>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 9ddb084a6ae7..125ce505c18e 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -152,7 +152,6 @@ postprocess_FILES_main := \
$(postprocess_XCS)/Office/Linguistic.xcs \
$(postprocess_XCS)/Office/Logging.xcs \
$(postprocess_XCS)/Office/Math.xcs \
- $(postprocess_XCS)/Office/OOoImprovement/Settings.xcs \
$(postprocess_XCS)/Office/OptionsDialog.xcs \
$(postprocess_XCS)/Office/Paths.xcs \
$(postprocess_XCS)/Office/ProtocolHandler.xcs \
More information about the Libreoffice-commits
mailing list