diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-30 12:19:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-30 12:27:47 +0100 |
| commit | e8bb827571f540ac4af2247cb11239bb96876669 (patch) | |
| tree | 24a7ee39d336a476c88f76f533fb292d5fdd9332 /officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs | |
| parent | dc6953f932ffbddd5168f039e58075789b91b98b (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/Office/Compatibility.xcs')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs index 1e1c800a5095..d99d03303559 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,47 +41,47 @@ </enumeration> </constraints> </prop> - <prop oor:name="UsePrinterMetrics" oor:type="xs:boolean"> + <prop oor:name="UsePrinterMetrics" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Use printer metrics for document formatting</desc></info> <value>false</value> </prop> - <prop oor:name="AddSpacing" oor:type="xs:boolean"> + <prop oor:name="AddSpacing" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Add spacing between paragraphs and tables</desc></info> <value>true</value> </prop> - <prop oor:name="AddSpacingAtPages" oor:type="xs:boolean"> + <prop oor:name="AddSpacingAtPages" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Add paragraph and table spacing at tops of pages</desc></info> <value>true</value> </prop> - <prop oor:name="UseOurTabStopFormat" oor:type="xs:boolean"> + <prop oor:name="UseOurTabStopFormat" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Use OpenOffice.org 1.1 tabstop formatting</desc></info> <value>false</value> </prop> - <prop oor:name="NoExternalLeading" oor:type="xs:boolean"> + <prop oor:name="NoExternalLeading" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Do not add leading (extra space) between lines of text</desc></info> <value>false</value> </prop> - <prop oor:name="UseLineSpacing" oor:type="xs:boolean"> + <prop oor:name="UseLineSpacing" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Use OpenOffice.org 1.1 line spacing</desc></info> <value>false</value> </prop> - <prop oor:name="AddTableSpacing" oor:type="xs:boolean"> + <prop oor:name="AddTableSpacing" oor:type="xs:boolean" oor:nillable="false"> <info><desc>???</desc></info> <value>true</value> </prop> - <prop oor:name="UseObjectPositioning" oor:type="xs:boolean"> + <prop oor:name="UseObjectPositioning" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Use OpenOffice.org 1.1 object positioning</desc></info> <value>false</value> </prop> - <prop oor:name="UseOurTextWrapping" oor:type="xs:boolean"> + <prop oor:name="UseOurTextWrapping" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Use OpenOffice.org 1.1 text wrapping</desc></info> <value>false</value> </prop> - <prop oor:name="ConsiderWrappingStyle" oor:type="xs:boolean"> + <prop oor:name="ConsiderWrappingStyle" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Consider wrapping style when positioning objects</desc></info> <value>false</value> </prop> - <prop oor:name="ExpandWordSpace" oor:type="xs:boolean"> + <prop oor:name="ExpandWordSpace" oor:type="xs:boolean" oor:nillable="false"> <info><desc>Expand word space on lines with manual line breaks in justified paragraphs</desc></info> <value>true</value> </prop> @@ -98,7 +98,7 @@ <desc>Used by the writer compatibility flag as the last OOo version.</desc> </info> <!--The default must be written by the setup.--> - <prop oor:name="OOo11" oor:type="xs:string"> + <prop oor:name="OOo11" oor:type="xs:string" oor:nillable="false"> <!-- UIHints: Tools - Options - OOo Writer - Compatibility --> <!--The value should only be written by the setup.--> <info> |