summaryrefslogtreecommitdiffstats
path: root/officecfg/registry/schema/org/openoffice/Office/UI
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/Office/UI
parentInitial support for quadratic beziers (diff)
downloadcore-e8bb827571f540ac4af2247cb11239bb96876669.tar.gz
core-e8bb827571f540ac4af2247cb11239bb96876669.zip
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/UI')
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs2
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs2
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs20
3 files changed, 12 insertions, 12 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
index 71efdab1b636..a9890dafb241 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
@@ -45,7 +45,7 @@
<desc>A localized text that describes the identifier of a command in a structured menu. </desc>
</info>
</prop>
- <prop oor:name="Properties" oor:type="xs:int">
+ <prop oor:name="Properties" oor:type="xs:int" oor:nillable="false">
<info>
<desc>
Additional information about a single command.
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
index 5d45bcce7ae1..c70a1752c6c1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
@@ -50,7 +50,7 @@
<desc>Specifies the UNO service to use for the specified tuple Command and Module</desc>
</info>
</prop>
- <prop oor:name="Value" oor:type="xs:string">
+ <prop oor:name="Value" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Specifies a controller specific value which is provided to every controller instance during initialization.</desc>
</info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
index b56629aca2eb..c093e75cabf5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
@@ -36,13 +36,13 @@
<info>
<desc>Provides a mapping between commands and their textual representation on the user interface.</desc>
</info>
- <prop oor:name="Locked" oor:type="xs:boolean">
+ <prop oor:name="Locked" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>A locked user interface element cannot be moved or undocked by the user. This property is only active when the user interface element is in a docked state.</desc>
</info>
<value>false</value>
</prop>
- <prop oor:name="Docked" oor:type="xs:boolean">
+ <prop oor:name="Docked" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies if the user interface element is currently docked.</desc>
</info>
@@ -53,13 +53,13 @@
<desc>Specifies if the user interface element is visible.</desc>
</info>
</prop>
- <prop oor:name="ContextSensitive" oor:type="xs:boolean">
+ <prop oor:name="ContextSensitive" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies if the user interface element is context sensitive. This controls if the Office shows the user interface element </desc>
</info>
<value>false</value>
</prop>
- <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+ <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies if a toolbar should not be shown inside the View - Toolbars menu.</desc>
</info>
@@ -95,14 +95,14 @@
<desc>Specifies the user interface element name. It is used for floating user interface elements to set the title and for the bubble help.</desc>
</info>
</prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
+ <prop oor:name="ImageURL" oor:type="xs:string" oor:nillable="false">
<info>
<desc>Specifies the URL of an image to associate with the user interface element. Any URL scheme supported by the com.sun.star.graphic.GraphicProvider service
is suitable here.</desc>
</info>
<value></value>
</prop>
- <prop oor:name="HelpURL" oor:type="xs:string">
+ <prop oor:name="HelpURL" oor:type="xs:string" oor:nillable="false">
<info>
<desc>
Specifies the help URL of the tool panel.
@@ -115,25 +115,25 @@
<desc>Specifies an internal state for the user interface element. Please don't change this value it describes an internal value.</desc>
</info>
</prop>
- <prop oor:name="Style" oor:type="xs:int">
+ <prop oor:name="Style" oor:type="xs:int" oor:nillable="false">
<info>
<desc>Specifies the style of a toolbar. This property is only used by toolbar user interface elements. 0 = symbol buttons, 1 = text buttons, 2 = symbols+text buttons</desc>
</info>
<value>0</value>
</prop>
- <prop oor:name="NoClose" oor:type="xs:boolean">
+ <prop oor:name="NoClose" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies that a user interface element shouldn't have a closer. This property is only used by toolbars or floating window user interface elements.</desc>
</info>
<value>false</value>
</prop>
- <prop oor:name="SoftClose" oor:type="xs:boolean">
+ <prop oor:name="SoftClose" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies that a user interface element shouldn't be closed forever. This is usefull for context sensitive ui elements which must be visible whenever their context is active. This property is only used by toolbars or floating window user interface elements.</desc>
</info>
<value>false</value>
</prop>
- <prop oor:name="ContextActive" oor:type="xs:boolean">
+ <prop oor:name="ContextActive" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies if a context sensitive user interface element is currently bound to its context. This property can be used to disable context sensitivity without losing the information that a user interface element is normally context sensitive.</desc>
</info>