Hello,
I realized there were still a few things left over from the testtool
removal so I created the attached patch. There seem to be some
logging-related things left in comphelper and officecfg that are used
all over the place but I'm not 100% sure about them yet. Would
somebody mind reviewing/pushing this? I was forced to upgrade and am
still waiting for my gpg key to be changed.
August Sodora
aug...@gmail.com
(201) 280-8138
From 9a660bb921402e6ef1f70101af7024f2b08529dc Mon Sep 17 00:00:00 2001
From: August Sodora <aug...@gmail.com>
Date: Thu, 15 Dec 2011 00:00:07 -0500
Subject: [PATCH 1/2] Remove OOoImprovement
---
officecfg/Configuration_officecfg.mk | 1 -
officecfg/qa/cppheader.cxx | 1 -
officecfg/registry/Makefile | 1 -
officecfg/registry/files.mk | 1 -
.../schema/org/openoffice/Office/Logging.xcs | 27 ------
.../openoffice/Office/OOoImprovement/Settings.xcs | 98 --------------------
postprocess/packregistry/makefile.mk | 1 -
scp2/source/ooo/common_brand.scp | 5 -
8 files changed, 0 insertions(+), 135 deletions(-)
delete mode 100644 officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 0b0a8b0..3d7f8d2 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/Office/UI/GlobalSettings.xcs \
org/openoffice/Office/UI/WindowContentFactories.xcs \
org/openoffice/Office/DataAccess/Drivers.xcs \
- org/openoffice/Office/OOoImprovement/Settings.xcs \
org/openoffice/TypeDetection/Types.xcs \
org/openoffice/TypeDetection/Filter.xcs \
org/openoffice/TypeDetection/GraphicFilter.xcs \
diff --git a/officecfg/qa/cppheader.cxx b/officecfg/qa/cppheader.cxx
index 12042ca..2dac76d 100644
--- a/officecfg/qa/cppheader.cxx
+++ b/officecfg/qa/cppheader.cxx
@@ -66,7 +66,6 @@
#include "officecfg/Office/Linguistic.hxx"
#include "officecfg/Office/Logging.hxx"
#include "officecfg/Office/Math.hxx"
-#include "officecfg/Office/OOoImprovement/Settings.hxx"
#include "officecfg/Office/OptionsDialog.hxx"
#include "officecfg/Office/Paths.hxx"
#include "officecfg/Office/ProtocolHandler.hxx"
diff --git a/officecfg/registry/Makefile b/officecfg/registry/Makefile
index edb80b0..0810755 100644
--- a/officecfg/registry/Makefile
+++ b/officecfg/registry/Makefile
@@ -52,7 +52,6 @@ endef
# appears to let % span sub-directories, so that the above rule would produce
# unexpected results; sorting this way seems to avoid the problem:
$(eval $(call my_target,Office,DataAccess))
-$(eval $(call my_target,Office,OOoImprovement))
$(eval $(call my_target,Office,UI))
$(eval $(call my_target,Office))
$(eval $(call my_target,TypeDetection))
diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
index f4c72d7..c6cebcf 100644
--- a/officecfg/registry/files.mk
+++ b/officecfg/registry/files.mk
@@ -28,7 +28,6 @@ FILES = \
Office/Linguistic \
Office/Logging \
Office/Math \
- Office/OOoImprovement/Settings \
Office/OptionsDialog \
Office/Paths \
Office/ProtocolHandler \
diff --git a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
index 2fda9ea..4e8426e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
@@ -79,33 +79,6 @@
</group>
</templates>
<component>
- <group oor:name="OOoImprovement">
- <info>
- <author>b_michaelsen</author>
- <desc>specifies settings for the logging of userinterface events.</desc>
- </info>
- <prop oor:name="EnablingAllowed" oor:type="xs:boolean">
- <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">
- <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">
- <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 a4339cc..0000000
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.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">
- <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">
- <info>
- <desc>true, if the user accepted the invitation.</desc>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="ShowedInvitation" oor:type="xs:boolean">
- <info>
- <desc>true, if the user was already invited.</desc>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="DeliveredPrebundled" oor:type="xs:boolean">
- <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">
- <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">
- <info>
- <desc>the number of reports uploaded.</desc>
- </info>
- <value>0</value>
- </prop>
- <prop oor:name="LoggedEvents" oor:type="xs:int">
- <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">
- <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">
- <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">
- <info>
- <desc>Additions to the SoapId for automated testing
- DO NOT SET THIS VALUE UNLESS YOU KNOW WHAT YOU ARE DOING!
- </desc>
- </info>
- <value></value>
- </prop>
- <prop oor:name="ReporterEmail" oor:type="xs:string">
- <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 assureance.
- </desc>
- </info>
- <value></value>
- </prop>
- </group>
- </component>
-</oor:component-schema>
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 84cbfa1..49ed27f 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -153,7 +153,6 @@ MY_FILES_main = \
$(MY_XCS)/Office/Linguistic.xcs \
$(MY_XCS)/Office/Logging.xcs \
$(MY_XCS)/Office/Math.xcs \
- $(MY_XCS)/Office/OOoImprovement/Settings.xcs \
$(MY_XCS)/Office/OptionsDialog.xcs \
$(MY_XCS)/Office/Paths.xcs \
$(MY_XCS)/Office/ProtocolHandler.xcs \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 04131ec..da12dc4 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -427,11 +427,6 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Zu
DosName = "dict-zu";
End
-Directory gid_Brand_Dir_Share_Extensions_Oooimprovement
- ParentID = gid_Brand_Dir_Share_Extensions;
- DosName = "OOoImprovement";
-End
-
Directory gid_Brand_Dir_Share_Uno_Packages
ParentID = gid_Brand_Dir_Share;
DosName = "uno_packages";
--
1.7.5.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
