diff options
| -rw-r--r-- | officecfg/prj/build.lst | 3 | ||||
| -rw-r--r-- | officecfg/prj/d.lst | 3 | ||||
| -rwxr-xr-x | officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs | 98 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk | 46 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/makefile.mk | 5 | ||||
| -rw-r--r-- | svx/source/dialog/optimprove.cxx | 5 | ||||
| -rw-r--r-- | svx/source/dialog/optimprove2.cxx | 5 |
7 files changed, 162 insertions, 3 deletions
diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst index b9aca0719882..88495a6e722b 100644 --- a/officecfg/prj/build.lst +++ b/officecfg/prj/build.lst @@ -6,6 +6,7 @@ oc officecfg\registry nmake - all oc_reg NULL oc officecfg\registry\schema\org\openoffice nmake - all oc_reg_schema_ooo NULL oc officecfg\registry\schema\org\openoffice\Office nmake - all oc_reg_schema_ooo_office NULL oc officecfg\registry\schema\org\openoffice\Office\UI nmake - all oc_reg_schema_ooo_office_ui NULL +oc officecfg\registry\schema\org\openoffice\Office\OOoImprovement nmake - all oc_reg_schema_ooo_office_oooimprovement NULL oc officecfg\registry\schema\org\openoffice\TypeDetection nmake - all oc_reg_schema_ooo_td NULL oc officecfg\registry\schema\org\openoffice\ucb nmake - all oc_reg_schema_ooo_ucb NULL oc officecfg\registry\data\org\openoffice nmake - all oc_reg_data_ooo oc_reg NULL @@ -13,4 +14,4 @@ oc officecfg\registry\data\org\openoffice\Office nmake - all oc_reg_data_ oc officecfg\registry\data\org\openoffice\Office\UI nmake - all oc_reg_data_ooo_office_ui oc_reg NULL oc officecfg\registry\data\org\openoffice\TypeDetection nmake - all oc_reg_data_ooo_td oc_reg NULL oc officecfg\registry\data\org\openoffice\ucb nmake - all oc_reg_data_ooo_ucb oc_reg NULL -oc officecfg\util nmake - all oc_util oc_reg_schema oc_reg_schema_ooo oc_reg_schema_ooo_office oc_reg_schema_ooo_office_ui oc_reg_schema_ooo_td oc_reg_schema_ooo_ucb oc_reg_data_ooo oc_reg_data_ooo_office oc_reg_data_ooo_office_ui oc_reg_data_ooo_td oc_reg_data_ooo_ucb NULL +oc officecfg\util nmake - all oc_util oc_reg_schema oc_reg_schema_ooo oc_reg_schema_ooo_office oc_reg_schema_ooo_office_ui oc_reg_schema_ooo_office_oooimprovement oc_reg_schema_ooo_td oc_reg_schema_ooo_ucb oc_reg_data_ooo oc_reg_data_ooo_office oc_reg_data_ooo_office_ui oc_reg_data_ooo_td oc_reg_data_ooo_ucb NULL diff --git a/officecfg/prj/d.lst b/officecfg/prj/d.lst index 106501f96cf2..d36f18660611 100644 --- a/officecfg/prj/d.lst +++ b/officecfg/prj/d.lst @@ -4,12 +4,14 @@ mkdir: %_DEST%\xml%_EXT%\registry\schema\org mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI +mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection ..\%__SRC%\misc\registry\schema\org\openoffice\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice ..\%__SRC%\misc\registry\schema\org\openoffice\Office\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office ..\%__SRC%\misc\registry\schema\org\openoffice\Office\UI\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI +..\%__SRC%\misc\registry\schema\org\openoffice\Office\OOoImprovement\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement ..\%__SRC%\misc\registry\schema\org\openoffice\ucb\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb ..\%__SRC%\misc\registry\schema\org\openoffice\TypeDetection\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection @@ -18,6 +20,7 @@ mkdir: %_DEST%\xml%_EXT%\registry\data\org mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\UI +mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\OOoImprovement mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs new file mode 100755 index 000000000000..7ff91464727d --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs @@ -0,0 +1,98 @@ +<?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 infomation can be found.</desc> + </info> + <value>http://wiki.services.openoffice.org/wiki/User_Experience/OpenOffice.org_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.services.openoffice.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/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk new file mode 100644 index 000000000000..1504d979b5eb --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk @@ -0,0 +1,46 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: $ +# +# $Revision: $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org 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 version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* +PRJ=..$/..$/..$/..$/..$/.. + +PRJNAME=officecfg +TARGET=schema_ooOImprovement +PACKAGE=org.openoffice.Office.OOoImprovement + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk + +# --- Targets ------------------------------------------------------ + +XCSFILES= \ + Settings.xcs + +.INCLUDE : target.mk + diff --git a/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/makefile.mk index 4d21f778ec1f..320ec8eed2ce 100644 --- a/officecfg/registry/schema/org/openoffice/Office/makefile.mk +++ b/officecfg/registry/schema/org/openoffice/Office/makefile.mk @@ -78,8 +78,9 @@ XCSFILES= \ ExtendedColorScheme.xcs \ TypeDetection.xcs \ TabBrowse.xcs \ - Paths.xcs \ - Histories.xcs + Paths.xcs \ + Histories.xcs \ + OOoImprovement.xcs .INCLUDE : target.mk diff --git a/svx/source/dialog/optimprove.cxx b/svx/source/dialog/optimprove.cxx index ae67f627aed6..c50abdf026b0 100644 --- a/svx/source/dialog/optimprove.cxx +++ b/svx/source/dialog/optimprove.cxx @@ -50,6 +50,8 @@ #include <com/sun/star/oooimprovement/XCoreController.hpp> #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/uieventslogger.hxx> +#include <tools/testtoolloader.hxx> namespace lang = ::com::sun::star::lang; namespace uno = ::com::sun::star::uno; @@ -191,6 +193,9 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG ) ::rtl::OUString::createFromAscii("InvitationAccepted"), uno::makeAny( m_pPage->IsYesChecked() ), ::comphelper::ConfigurationHelper::E_STANDARD ); + // TODO: refactor + ::comphelper::UiEventsLogger::reinit(); + ::tools::InitTestToolLib(); } EndDialog( RET_OK ); return 0; diff --git a/svx/source/dialog/optimprove2.cxx b/svx/source/dialog/optimprove2.cxx index 843bf8ae920e..81bf4be47584 100644 --- a/svx/source/dialog/optimprove2.cxx +++ b/svx/source/dialog/optimprove2.cxx @@ -57,6 +57,8 @@ #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/synchronousdispatch.hxx> +#include <comphelper/uieventslogger.hxx> +#include <tools/testtoolloader.hxx> #define C2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) @@ -183,6 +185,9 @@ sal_Bool SvxImprovementOptionsPage::FillItemSet( SfxItemSet& /*rSet*/ ) ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, C2S("Participation"), C2S("InvitationAccepted"), uno::makeAny( m_aYesRB.IsChecked() != FALSE ) ); ::comphelper::ConfigurationHelper::flush( xConfig ); + // TODO: refactor + ::comphelper::UiEventsLogger::reinit(); + ::tools::InitTestToolLib(); } catch( uno::Exception& ) { |