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/UserProfile.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/UserProfile.xcs')
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/UserProfile.xcs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/officecfg/registry/schema/org/openoffice/UserProfile.xcs b/officecfg/registry/schema/org/openoffice/UserProfile.xcs index 1ff7c0aa05ce..38075608cebd 100644 --- a/officecfg/registry/schema/org/openoffice/UserProfile.xcs +++ b/officecfg/registry/schema/org/openoffice/UserProfile.xcs @@ -35,7 +35,7 @@ <info> <desc>Contains user-related information, such as name and address.</desc> </info> - <prop oor:name="o" oor:type="xs:string"> + <prop oor:name="o" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -46,7 +46,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="givenname" oor:type="xs:string"> + <prop oor:name="givenname" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -57,7 +57,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="sn" oor:type="xs:string"> + <prop oor:name="sn" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -68,7 +68,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="initials" oor:type="xs:string"> + <prop oor:name="initials" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -79,7 +79,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="street" oor:type="xs:string"> + <prop oor:name="street" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -90,7 +90,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="l" oor:type="xs:string"> + <prop oor:name="l" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -101,7 +101,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="st" oor:type="xs:string"> + <prop oor:name="st" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -112,7 +112,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="postalcode" oor:type="xs:string"> + <prop oor:name="postalcode" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -123,7 +123,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="c" oor:type="xs:string"> + <prop oor:name="c" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -134,7 +134,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="title" oor:type="xs:string"> + <prop oor:name="title" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -145,7 +145,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="position" oor:type="xs:string"> + <prop oor:name="position" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -156,7 +156,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="homephone" oor:type="xs:string"> + <prop oor:name="homephone" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -167,7 +167,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="telephonenumber" oor:type="xs:string"> + <prop oor:name="telephonenumber" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -178,7 +178,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="facsimiletelephonenumber" oor:type="xs:string"> + <prop oor:name="facsimiletelephonenumber" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -189,7 +189,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="mail" oor:type="xs:string"> + <prop oor:name="mail" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -200,7 +200,7 @@ <value/> <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended --> </prop> - <prop oor:name="UserGroup" oor:type="xs:string"> + <prop oor:name="UserGroup" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: User --> <!-- OldLocation: soffice.ini --> <!-- UIHints: Tools - Options - General - User Data --> @@ -210,7 +210,7 @@ </info> <value>UserGroup</value> </prop> - <prop oor:name="fathersname" oor:type="xs:string"> + <prop oor:name="fathersname" oor:type="xs:string" oor:nillable="false"> <!-- UIHints: Tools - Options - General - User Data --> <info> <author>rail</author> @@ -218,7 +218,7 @@ </info> <value/> </prop> - <prop oor:name="apartment" oor:type="xs:string"> + <prop oor:name="apartment" oor:type="xs:string" oor:nillable="false"> <!-- UIHints: Tools - Options - General - User Data --> <info> <author>pb</author> |