diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-11-24 18:50:17 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-11-24 18:50:17 +0100 |
commit | ba6b2ec01de3c54115ce4d0676e16dbf8373acbf (patch) | |
tree | a05208ea1eead65254f3d350940b3c1ef0f27e7f /officecfg | |
parent | a35b0360e76e7882abed19cc883fd0b6f6ff134e (diff) | |
parent | afd1b3a9ac844273b5c2c59016102c7eb594b5d0 (diff) |
merge with DEV300_m94
Diffstat (limited to 'officecfg')
4 files changed, 34 insertions, 1 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 2efbaaa703..a2c4898351 100755 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -5197,7 +5197,12 @@ <value xml:lang="en-US">Delete All Comments by This Author</value> </prop> </node> - <node oor:name=".uno:DeleteNote" oor:op="replace"> + <node oor:name=".uno:ReplyComment" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Reply Comment</value> + </prop> + </node> + <node oor:name=".uno:DeleteComment" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Delete Comment</value> </prop> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 4fa236666b..465c6b37c0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -166,6 +166,16 @@ <value xml:lang="en-US">~Protect Records...</value> </prop> </node> + <node oor:name=".uno:RejectTracedChange" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Reject Change</value> + </prop> + </node> + <node oor:name=".uno:AcceptTracedChange" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Accept Change</value> + </prop> + </node> <node oor:name=".uno:UpdateAllLinks" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Links</value> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 4a3c2c02c3..ea806e58f3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1512,6 +1512,15 @@ <info> <desc>Contains miscellaneous settings.</desc> </info> + <prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean"> + <!-- UIHints: none yet --> + <info> + <author>TL</author> + <desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc> + <label>Align Math objects</label> + </info> + <value>true</value> + </prop> <prop oor:name="MeasureUnit" oor:type="xs:int"> <!-- OldPath: Writer/Layout --> <!-- OldLocation: Soffice.cfg --> diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index 8738d9db21..b92e4684c8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -418,6 +418,15 @@ <info> <desc>Contains miscellaneous settings.</desc> </info> + <prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean"> + <!-- UIHints: none yet --> + <info> + <author>TL</author> + <desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc> + <label>Align Math objects</label> + </info> + <value>true</value> + </prop> <prop oor:name="MeasureUnit" oor:type="xs:int"> <!-- OldPath: HTML_Editor/Layout/Window --> <!-- OldLocation: Soffice.cfg --> |