diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-11 12:22:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-12 12:25:21 +0100 |
| commit | 431950e1eade91f8587d3ecffa73fd09136e16b6 (patch) | |
| tree | d402e05fef613f36992e68efce2359e7cff54304 /officecfg | |
| parent | f088d85f80c643378262a1f53bdea6f42abcf7d4 (diff) | |
tdf#121239 give writer, calc and draw/impress the same underline options
uno:Underline is the "real" deal, and has multiple underline options
uno:UnderlineSimple is "some underline on" vs no underline
calc and writer had UnderlineSingle, UnderlineDouble and UnderlineDotted
for that specific type of underline on vs not-on
add those to draw/impress too and then use UnderlineSingle instead of Underline
in the format menu so that when UnderlineDouble is applied, UnderlineSingle is
not show as applied, instead of using Underline ot UnderlineSimple which would
show as on if UnderlineDouble was applied
Change-Id: I6f9fcf37c2c90d215ea52b536e4fa84734754850
Reviewed-on: https://gerrit.libreoffice.org/82469
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 15 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 23 |
2 files changed, 23 insertions, 15 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index ff1e596abc1e..5fc352c50f8c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1233,16 +1233,6 @@ <value xml:lang="en-US">Collaborate...</value> </prop> </node> - <node oor:name=".uno:UnderlineNone" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Underline: Off</value> - </prop> - </node> - <node oor:name=".uno:UnderlineSingle" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Underline: Single</value> - </prop> - </node> <node oor:name=".uno:AcceptChanges" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">~Manage...</value> @@ -1265,11 +1255,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:UnderlineDotted" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Underline: Dotted</value> - </prop> - </node> <node oor:name=".uno:Delete" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Cle~ar Cells...</value> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 0d4cf4e199ae..34cdc64758af 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1563,6 +1563,7 @@ <value>9</value> </prop> </node> + <!-- selection of possible underlines --> <node oor:name=".uno:Underline" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Underline</value> @@ -1571,6 +1572,7 @@ <value>9</value> </prop> </node> + <!-- set single underline, state of any non-None underline --> <node oor:name=".uno:UnderlineSimple" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Underline</value> @@ -1582,6 +1584,22 @@ <value>.uno:Underline</value> </prop> </node> + <node oor:name=".uno:UnderlineNone" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Underline: Off</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> + <node oor:name=".uno:UnderlineSingle" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Single Underline</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:UnderlineDouble" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Double Underline</value> @@ -1590,6 +1608,11 @@ <value>9</value> </prop> </node> + <node oor:name=".uno:UnderlineDotted" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Dotted Underline</value> + </prop> + </node> <node oor:name=".uno:Overline" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Overline</value> |