diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-09-07 09:33:02 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-09-07 09:33:02 +0200 |
| commit | 40906e58d26a7536aa2dfff586c3aac787b29638 (patch) | |
| tree | 86890ece58ea09d03bcb62ca9e81527a5ca52c23 /officecfg | |
| parent | 27828d6293f0840d563b45f1eda0b730c72ea58f (diff) | |
| parent | 926a7b29e05856d8ed567e3e4ff8640340d1ebfc (diff) | |
Merge commit 'ooo/OOO330_m6'
Diffstat (limited to 'officecfg')
| -rwxr-xr-x | officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs | 2 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Setup.xcs | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs index 7b0b221f15a9..7ff91464727d 100755 --- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs @@ -15,7 +15,7 @@ OpenOffice.org Improvement Program. If this is zero the user will get asked. </desc> </info> - <value>2</value> + <value>1</value> </prop> <prop oor:name="InvitationAccepted" oor:type="xs:boolean"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs index 76c4bb17782b..62d3fdcce85d 100644 --- a/officecfg/registry/schema/org/openoffice/Setup.xcs +++ b/officecfg/registry/schema/org/openoffice/Setup.xcs @@ -395,7 +395,14 @@ <author>AS</author> <desc>Contains all of the document factories that were installed during setup.</desc> </info> - </set> + </set> + <prop oor:name="OfficeRestartInProgress" oor:type="xs:boolean"> + <info> + <author>MAV</author> + <desc>The entry specifies that we are in restart process</desc> + </info> + <value>false</value> + </prop> </group> <group oor:name="L10N"> <info> |