summaryrefslogtreecommitdiff
path: root/officecfg/registry/schema/org/openoffice/System.xcs
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-01-30 12:19:11 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-01-30 12:27:47 +0100
commite8bb827571f540ac4af2247cb11239bb96876669 (patch)
tree24a7ee39d336a476c88f76f533fb292d5fdd9332 /officecfg/registry/schema/org/openoffice/System.xcs
parentdc6953f932ffbddd5168f039e58075789b91b98b (diff)
Fixed cppheader.xsl nillable treatment.
* cppheader.xsl had initially been written under the false assumption that a missing oor:nillable attribute defaults to "false" instead of "true". That has been fixed. * As a result, many places that use the new simplified officecfg/*.hxx headers broke as they did not expect value types to be wrapped boost::optional. To keep the code simple, I decided to change all occurrences in officecfg/registry/schema/ of properties that specify a default <value> and do not explicitly specify oor:nillable="true" to oor:nillable="false". Strictly speaking, this is an incompatible change, but in many cases it should be what was intended, anyway. * Some places that use the new simplified officecfg/*.hxx headers still had to be adapted to boost::optional wrapping. * This showed that unotools/configuration.hxx did not yet work for those wrapped properties and needed fixing, too.
Diffstat (limited to 'officecfg/registry/schema/org/openoffice/System.xcs')
-rw-r--r--officecfg/registry/schema/org/openoffice/System.xcs6
1 files changed, 3 insertions, 3 deletions
diff --git a/officecfg/registry/schema/org/openoffice/System.xcs b/officecfg/registry/schema/org/openoffice/System.xcs
index 4d432659d5f8..e78f3153ab79 100644
--- a/officecfg/registry/schema/org/openoffice/System.xcs
+++ b/officecfg/registry/schema/org/openoffice/System.xcs
@@ -37,21 +37,21 @@
<author>OBR</author>
<desc>Contains localization settings</desc>
</info>
- <prop oor:name="Locale" oor:type="xs:string">
+ <prop oor:name="Locale" oor:type="xs:string" oor:nillable="false">
<info>
<author>OBR</author>
<desc>Contains the user's desktop locale setting if available.</desc>
</info>
<value/>
</prop>
- <prop oor:name="UILocale" oor:type="xs:string">
+ <prop oor:name="UILocale" oor:type="xs:string" oor:nillable="false">
<info>
<author>OBR</author>
<desc>Contains the user's desktop UI language setting if available.</desc>
</info>
<value/>
</prop>
- <prop oor:name="SystemLocale" oor:type="xs:string">
+ <prop oor:name="SystemLocale" oor:type="xs:string" oor:nillable="false">
<info>
<author>OBR</author>
<desc>Contains the system's default locale setting if available.</desc>