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 /sw/sdi | |
| 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 'sw/sdi')
| -rw-r--r-- | sw/sdi/_textsh.sdi | 20 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 58 |
2 files changed, 75 insertions, 3 deletions
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index 3d7bbd56b32e..bfd47719ca35 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -1450,7 +1450,25 @@ interface BaseText StateMethod = GetTextCtrlState; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] - FN_UNDERLINE_DOUBLE // status(final|play) + SID_ULINE_VAL_NONE // status(final|play) + [ + ExecMethod = ExecCharAttr ; + StateMethod = GetAttrState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + SID_ULINE_VAL_SINGLE // status(final|play) + [ + ExecMethod = ExecCharAttr ; + StateMethod = GetAttrState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + SID_ULINE_VAL_DOUBLE // status(final|play) + [ + ExecMethod = ExecCharAttr ; + StateMethod = GetAttrState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + SID_ULINE_VAL_DOTTED // status(final|play) [ ExecMethod = ExecCharAttr ; StateMethod = GetAttrState ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 481d25b66cc9..78dfda33e744 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -5980,13 +5980,67 @@ SfxVoidItem ToggleObjectLayer FN_TOOL_HIERARCHIE GroupId = SfxGroupId::Format; ] -SfxBoolItem UnderlineDouble FN_UNDERLINE_DOUBLE +SfxBoolItem UnderlineNone SID_ULINE_VAL_NONE [ AutoUpdate = TRUE, FastCall = FALSE, ReadOnlyDoc = FALSE, - Toggle = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Format; +] + +SfxBoolItem UnderlineSingle SID_ULINE_VAL_SINGLE + +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Format; +] + +SfxBoolItem UnderlineDouble SID_ULINE_VAL_DOUBLE + +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Format; +] + +SfxBoolItem UnderlineDotted SID_ULINE_VAL_DOTTED + +[ + AutoUpdate = TRUE, + FastCall = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, RecordPerSet; |