diff options
| author | Ross Johnson <ross.johnson@homemail.com.au> | 2021-09-22 19:58:54 +1000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-10-14 12:33:11 +0200 |
| commit | 7f5379e040221435548d9be7c8c976378c04489a (patch) | |
| tree | f6144d497b40e3f3fc6f637d4ee2821017e31f61 /desktop | |
| parent | d296a0a271bcce56e15c4d8a577d4e0d368f7533 (diff) | |
tdf#33749 - revised merge and unmerge cells UI controls
Revert the two changes made under this issue tdf#33749:
1) Cell context menu back to 7.2
2) Format - Merge Cells menu back to 7.2
3) Help pages to reflect this
Moving forward with the following changes:
1) Rename "Split Cells" to "Unmerge Cells" (Calc only) which more accurately
describes it's function in Calc (and for consistency with alternative
office software).
2) Add "Merge Cells" and "Unmerge Cells" to Formatting toolbar alongside
"Merge and Center Cells", including other available user interface
schemes where possible.
3) Change the Format - Merge Cells menu icon to the "Merge Cells" icon
as less confusing than the current "Merge and Center Cells" icon.
Re-label the Format - Merge Cells menu to Format - Merge and Unmerge Cells.
4) Add TooltipLabel to .uno:ToggleMergeCells to clarify dual action.
5) Add Split Cells to Table context menu in Impress (as it is in Writer).
6) Help pages to reflect changes.
7) Remove two duplicate entries in the sUnoCommands array in init.cxx
(one was ".uno:MergeCells" related to this change). This is untested
but relates to status updates sent to the headless LOK clients. I assume
duplicate entries would generate duplicate updates, which may be
harmless but is probably not desirable.
Change-Id: I3063f871707a7286d95108d3a34a5287401baa6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122811
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 306b6d417d9d..8156b3b2b40f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2823,8 +2823,6 @@ static void doc_iniUnoCommands () OUString(".uno:Copy"), OUString(".uno:Paste"), OUString(".uno:SelectAll"), - OUString(".uno:InsertAnnotation"), - OUString(".uno:DeleteAnnotation"), OUString(".uno:ReplyComment"), OUString(".uno:ResolveComment"), OUString(".uno:ResolveCommentThread"), @@ -2832,7 +2830,6 @@ static void doc_iniUnoCommands () OUString(".uno:InsertRowsAfter"), OUString(".uno:InsertColumnsBefore"), OUString(".uno:InsertColumnsAfter"), - OUString(".uno:MergeCells"), OUString(".uno:DeleteRows"), OUString(".uno:DeleteColumns"), OUString(".uno:DeleteTable"), @@ -2885,6 +2882,7 @@ static void doc_iniUnoCommands () OUString(".uno:InsertObjectChart"), OUString(".uno:InsertSection"), OUString(".uno:InsertAnnotation"), + OUString(".uno:DeleteAnnotation"), OUString(".uno:InsertPagebreak"), OUString(".uno:InsertColumnBreak"), OUString(".uno:HyperlinkDialog"), |