merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0150-calc-formula-variable-separators-officecfg.diff
blobc30b86e1bfa7410530d913635caeae6e1071111d
1 diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
2 index 6a6a533..ef0bd3d 100644
3 --- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
4 +++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
5 @@ -1204,6 +1204,31 @@
6 </info>
7 <value>true</value>
8 </prop>
9 + <prop oor:name="FormulaSyntax" oor:type="xs:int">
10 + <!-- UIHints: Tools - Options Spreadsheet Calculate -->
11 + <!-- This node is deprecated, but we still need to keep it for migration purposes. -->
12 + <info>
13 + <author>kyoshida</author>
14 + <desc>Specifies what formula syntax type to use.</desc>
15 + </info>
16 + <constraints>
17 + <enumeration oor:value="0">
18 + <info>
19 + <desc>Calc A1</desc>
20 + </info>
21 + </enumeration>
22 + <enumeration oor:value="1">
23 + <info>
24 + <desc>Excel A1</desc>
25 + </info>
26 + </enumeration>
27 + <enumeration oor:value="2">
28 + <info>
29 + <desc>Excel R1C1</desc>
30 + </info>
31 + </enumeration>
32 + </constraints>
33 + </prop>
34 <node-ref oor:name="Date" oor:node-type="Date">
35 <info>
36 <desc>Specifies the date that is represented by the number 0.</desc>
37 @@ -1211,6 +1236,64 @@
38 </node-ref>
39 </group>
40 </group>
41 + <group oor:name="Formula">
42 + <info>
43 + <desc>Contains settings that affect formula handling.</desc>
44 + </info>
45 + <group oor:name="Syntax">
46 + <info>
47 + <desc>Contains settings for formula syntax.</desc>
48 + </info>
49 + <prop oor:name="Grammar" oor:type="xs:int">
50 + <!-- UIHints: Tools - Options Spreadsheet Formula -->
51 + <info>
52 + <author>kyoshida</author>
53 + <desc>Specifies what formula syntax type to use.</desc>
54 + </info>
55 + <constraints>
56 + <enumeration oor:value="0">
57 + <info>
58 + <desc>Calc A1</desc>
59 + </info>
60 + </enumeration>
61 + <enumeration oor:value="1">
62 + <info>
63 + <desc>Excel A1</desc>
64 + </info>
65 + </enumeration>
66 + <enumeration oor:value="2">
67 + <info>
68 + <desc>Excel R1C1</desc>
69 + </info>
70 + </enumeration>
71 + </constraints>
72 + </prop>
73 + <prop oor:name="SeparatorArg" oor:type="xs:string">
74 + <!-- UIHints: Tools - Options Spreadsheet Formula -->
75 + <info>
76 + <author>kyoshida</author>
77 + <desc>Argument separator in worksheet function</desc>
78 + </info>
79 + <value></value>
80 + </prop>
81 + <prop oor:name="SeparatorArrayRow" oor:type="xs:string">
82 + <!-- UIHints: Tools - Options Spreadsheet Formula -->
83 + <info>
84 + <author>kyoshida</author>
85 + <desc>Row separator in array constant</desc>
86 + </info>
87 + <value></value>
88 + </prop>
89 + <prop oor:name="SeparatorArrayCol" oor:type="xs:string">
90 + <!-- UIHints: Tools - Options Spreadsheet Formula -->
91 + <info>
92 + <author>kyoshida</author>
93 + <desc>Column separator in array constant</desc>
94 + </info>
95 + <value></value>
96 + </prop>
97 + </group>
98 + </group>
99 <group oor:name="Revision">
100 <info>
101 <desc>Contains settings that affect revision marking.</desc>