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/TypeDetection/Filter.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/TypeDetection/Filter.xcs')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs index c92f93f79d6e..f87846f00c99 100644 --- a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs +++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs @@ -34,35 +34,35 @@ <templates> <group oor:name="Filter"> <info><desc>Lists filters that can import or export content.</desc></info> - <prop oor:name="FileFormatVersion" oor:type="xs:int"> + <prop oor:name="FileFormatVersion" oor:type="xs:int" oor:nillable="false"> <info><desc>An unique ID, which is used internal to differ between file formats of same type.</desc></info> <value>0</value> </prop> - <prop oor:name="Type" oor:type="xs:string"> + <prop oor:name="Type" oor:type="xs:string" oor:nillable="false"> <info><desc>Supported content type of this filter. Must be an internal type name.</desc></info> <value/> </prop> - <prop oor:name="DocumentService" oor:type="xs:string"> + <prop oor:name="DocumentService" oor:type="xs:string" oor:nillable="false"> <info><desc>The uno service name of the supported office document type.</desc></info> <value/> </prop> - <prop oor:name="UIComponent" oor:type="xs:string"> + <prop oor:name="UIComponent" oor:type="xs:string" oor:nillable="false"> <info><desc>The uno implementation name a dialog, which is used to ask an user for special filter parameter (e.g. for csv).</desc></info> <value/> </prop> - <prop oor:name="UserData" oor:type="oor:string-list"> + <prop oor:name="UserData" oor:type="oor:string-list" oor:nillable="false"> <info><desc>Filter specific data.</desc></info> <value/> </prop> - <prop oor:name="FilterService" oor:type="xs:string"> + <prop oor:name="FilterService" oor:type="xs:string" oor:nillable="false"> <info><desc>The uno implementation name of the filter service.</desc></info> <value/> </prop> - <prop oor:name="TemplateName" oor:type="xs:string"> + <prop oor:name="TemplateName" oor:type="xs:string" oor:nillable="false"> <info><desc>Name of a corresponding template, which is merged together with the style seets of the loaded document.</desc></info> <value/> </prop> - <prop oor:name="Flags" oor:type="oor:string-list"> + <prop oor:name="Flags" oor:type="oor:string-list" oor:nillable="false"> <info><desc>Specify the filter in some further properties (e.g. import/export/..).</desc></info> <value/> </prop> |