summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-02 10:58:39 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-03-02 10:59:19 +0100
commitc6f8eb26c07264103a3e99f79b2dc78f9be6ef57 (patch)
treea9bb586111373304d8656c4af27f9c63afa65434 /officecfg
parent0f56302890e2f587dfc0230a0445199db97b4ffd (diff)
Clean up
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Setup.xcu16
-rw-r--r--officecfg/registry/schema/org/openoffice/Setup.xcs8
2 files changed, 5 insertions, 19 deletions
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 4163b1b3b8ef..4979ce748b91 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -58,12 +58,6 @@
</prop>
</node>
<node oor:name="Office">
- <prop oor:name="ooSetupInstCompleted">
- <value>false</value>
- </prop>
- <prop oor:name="ooSetupShowIntro">
- <value>true</value>
- </prop>
<node oor:name="Factories">
<node oor:name="com.sun.star.sheet.SpreadsheetDocument" oor:op="replace" install:module="calc">
<prop oor:name="ooSetupFactoryDocumentService" oor:finalized="true">
@@ -774,16 +768,6 @@
</node>
</node>
</node>
- <node oor:name="L10N">
- <prop oor:name="ooLocale" oor:type="xs:string">
- <value/>
- </prop>
- </node>
- <node oor:name="Configuration">
- <prop oor:name="TransferUserSettingsOnce" oor:type="xs:boolean">
- <value>true</value>
- </prop>
- </node>
<node oor:name="Migration">
<node oor:name="SupportedVersions">
<node oor:name="OpenOffice.org3+OpenOffice.org2+StarOffice8+StarSuite8+Libreoffice3" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 53ace015933e..2f14b7a81fd0 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -323,7 +323,7 @@
<value/>
<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
</prop>
- <prop oor:name="ooSetupInstCompleted" oor:type="xs:boolean">
+ <prop oor:name="ooSetupInstCompleted" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: Service User/[username] -->
<!-- OldLocation: userdb.ini -->
<info>
@@ -331,6 +331,7 @@
<author>IS/BEI</author>
<desc>Indicates if the user data is copied successfully.</desc>
</info>
+ <value>false</value>
</prop>
<prop oor:name="ooSetupLocales" oor:type="oor:string-list">
<!-- OldLocation: setup.inf-->
@@ -348,7 +349,7 @@
<desc>Enumerates the application languages that are installed, if a multilingual version is used.</desc>
</info>
</set>
- <prop oor:name="ooSetupShowIntro" oor:type="xs:boolean">
+ <prop oor:name="ooSetupShowIntro" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: Common/Show-Intro -->
<!-- OldLocation: soffice.ini -->
<!-- UIHints: Tools - Options - General - View -->
@@ -357,6 +358,7 @@
<author>CD</author>
<desc>Specifies whether the splash screen is displayed during startup.</desc>
</info>
+ <value>true</value>
</prop>
<prop oor:name="ooSetupConnectionURL" oor:type="xs:string" oor:nillable="false">
<!-- OldPath: Common-->
@@ -428,7 +430,6 @@
<label>Locale</label>
</info>
<value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
</prop>
<prop oor:name="ooSetupSystemLocale" oor:type="xs:string" oor:nillable="false">
<!-- UIHints: Tools - Options - Language Settings - Languages - Language of - Locale setting -->
@@ -468,6 +469,7 @@
<author>JB</author>
<desc>Deprecated</desc>
</info>
+ <value>true</value>
</prop>
</group>
<group oor:name="Migration">