diff options
| author | Ross Johnson <ross.johnson@homemail.com.au> | 2021-09-22 20:32:11 +1000 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2021-10-01 12:46:18 +0200 |
| commit | 0b9b6542a8432d8a7bb3fc8185c0937dff0329bd (patch) | |
| tree | 87d7d7c336b2239c6a1b8264ce321ca8fc788ad6 /source/text/scalc | |
| parent | 2d9ad5a39e416c967af625426572b68498d3c68b (diff) | |
tdf#33749 - revised help text for merge and split in Calc
The earlier change (reverted) overlooked the difference between
"Merge Cells" and "Merge and Center Cells", leaving users without
adequate means to merge cells while retaining text alignment. This
patch restores previous usability and moves forward to resolve the
issues raised in this bug report.
Reverted the two changes from earlier work on tdf#33749:
1) Cell context menu back to 7.2
2) Format - Merge Cells menu back to 7.2
3) Help pages to reflect that
Moving forward with the following changes:
1) Rename "Split Cells" to "Unmerge Cells" (Calc only)
2) Add "Merge Cells" and "Unmerge Cells" to the Formatting toolbar alongside
"Merge and Center Cells".
3) Re-label the Format - Merge Cells menu to Format - Merge and Unmerge Cells.
4) Help pages to reflect core including fixing the duplicate entry in the
built help/hid2file.js by consolidating the relevant Calc and Writer
help pages together to remove the duplicate bookmark hid branch value.
Removed the module specific version.
5) Removed duplicate entry from helpers/unocmds.txt.
Change-Id: Ica50f507eea74acd430bef3042fb9739d1cff7b2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122810
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source/text/scalc')
| -rw-r--r-- | source/text/scalc/01/05060000.xhp | 42 | ||||
| -rw-r--r-- | source/text/scalc/01/05100100.xhp | 28 | ||||
| -rw-r--r-- | source/text/scalc/01/05100200.xhp | 27 | ||||
| -rw-r--r-- | source/text/scalc/guide/table_cellmerge.xhp | 62 | ||||
| -rw-r--r-- | source/text/scalc/main0105.xhp | 2 |
5 files changed, 72 insertions, 89 deletions
diff --git a/source/text/scalc/01/05060000.xhp b/source/text/scalc/01/05060000.xhp index 01ca02e4f7..6c3fa74659 100644 --- a/source/text/scalc/01/05060000.xhp +++ b/source/text/scalc/01/05060000.xhp @@ -31,18 +31,44 @@ </meta> <body> <section id="zellenzusammenfassen"> +<bookmark xml-lang="en-US" branch="index" id="bm_id501632012952361"> + <bookmark_value>toggle merge and center cells</bookmark_value> +</bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:ToggleMergeCells" id="bm_id8030335" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/MergeCellsDialog" id="bm_id2745673" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/@@nowidget@@" id="bm_id2745673" localize="false"/> -<paragraph role="heading" id="hd_id3149785" xml-lang="en-US" level="1"><link href="text/scalc/01/05060000.xhp" name="Merge and Center Cells">Merge and Center Cells</link></paragraph> -<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US"><ahelp hid=".">Combines the selected cells into a single cell or splits merged cells. Aligns cell content centered.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3149785" xml-lang="en-US" level="1"><variable id="togglemergecells"><link href="text/scalc/01/05060000.xhp" name="Merge and Center Cells">Merge and Center Cells</link></variable></paragraph> +<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US"><ahelp hid=".">This is a togglable control that joins all cells in a rectangular selection into a single cell, or returns merged cells to the original individual cells. When merging it will format the merged cell as center aligned.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id541633057818950" xml-lang="en-US">The control is shown toggled-on whenever there are merged cells in the selection, indicating that clicking the control will unmerge those cells.</paragraph> +</section> +<section id="mergecells_warning"> +<paragraph role="warning" id="par_id3153718" xml-lang="en-US">Merging cells can lead to calculation errors in formulas in the table.</paragraph> </section> <section id="howtoget"> -<paragraph role="paragraph" id="par_id3154020" xml-lang="en-US">Choose <emph>Format - Merge Cells - Merge and Center Cells</emph></paragraph> +<paragraph role="paragraph" id="par_id441632808439621" xml-lang="en-US">Do one of the following:</paragraph> +<paragraph role="paragraph" id="par_id691632803588118" xml-lang="en-US">In the <emph>Formatting</emph> toolbar, click:</paragraph> + +<table id="tab_id451632804983642"> +<tablerow> +<tablecell> +<paragraph role="paragraph" id="par_id521632804983642" xml-lang="en-US"> +<image id="img_id811632804983642" src="cmd/sc_togglemergecells.png" width="0.2228in" height="0.2228in"><alt id="alt_id921632804983642" xml-lang="en-US">Icon</alt> + </image></paragraph> +</tablecell> +<tablecell> +<paragraph role="paragraph" id="par_id491632804983642" xml-lang="en-US">Merge and Center Cells</paragraph> +</tablecell> +</tablerow> +</table> +<paragraph role="paragraph" id="par_id3154020" xml-lang="en-US">Or, choose <variable id="format_mergecells_menu"><menuitem>Format - Merge and Unmerge Cells - </menuitem></variable><menuitem> Merge and Center Cells</menuitem>.</paragraph> </section> <section id="mergenotes"> -<paragraph role="paragraph" id="par_id3148552" xml-lang="en-US">The merged cell receives the name of the first cell of the original cell range. Merged cells cannot be merged a second time with other cells. The range must form a rectangle, multiple selection is not supported.</paragraph> -<paragraph role="note" id="par_id3149665" xml-lang="en-US">If the cells to be merged have any contents, a security dialog is shown.</paragraph> +<paragraph role="paragraph" id="par_id3149665" xml-lang="en-US">Cells cannot be merged again without first unmerging them.</paragraph> +<paragraph role="note" id="par_id581632979766784" xml-lang="en-US">Merging a cell selection that partially includes merged cells is generally possible with <emph>Unmerge Cells</emph> followed by <emph>Merge Cells</emph>, without altering the initial selection. The result will be largely depend on previous choices when merging cells made with the <emph>Merge Cells Dialog</emph> options described below.</paragraph> +<paragraph role="paragraph" id="par_id3148552" xml-lang="en-US">Multiple selection is not supported, that is, the selection must be rectangular.</paragraph> +<paragraph role="paragraph" id="par_id211632985508898">The merged cell receives the name and content of the first cell of the selection.</paragraph> +<paragraph role="paragraph" id="par_id271632985709781">If more than one cell to be merged has content the <emph>Merge Cells</emph> dialog opens.</paragraph> +<paragraph role="heading" id="par_id391632360383197" xml-lang="en-US" level="3">Merge Cells Dialog Options</paragraph> <paragraph role="paragraph" id="par_id1001240" xml-lang="en-US">Three options are available:</paragraph> <list type="unordered"> <listitem> @@ -58,7 +84,11 @@ <paragraph id="par_id3155877" role="listitem" xml-lang="en-US"><emph>Empty the contents of the hidden cells</emph>: <ahelp hid=".">The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated.</ahelp></paragraph> </listitem> </list> -<paragraph role="warning" id="par_id3153718" xml-lang="en-US">Merging cells can lead to calculation errors in formulas in the table.</paragraph> </section> +<embed href="text/shared/00/00000004.xhp#related"/> +<embed href="text/shared/01/05100100.xhp#mergecells"/> +<embed href="text/shared/01/05100200.xhp#unmergecells"/> +<embed href="text/scalc/guide/table_cellmerge.xhp#table_cellmerge"/> +<embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/> </body> </helpdocument> diff --git a/source/text/scalc/01/05100100.xhp b/source/text/scalc/01/05100100.xhp deleted file mode 100644 index d0ae8a3114..0000000000 --- a/source/text/scalc/01/05100100.xhp +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * ---> - -<meta> -<topic id="textscalc0105100100xhp" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Merge Cells</title> -<filename>/text/scalc/01/05100100.xhp</filename> -</topic> -</meta> -<body> -<bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id3149051" localize="false"/> -<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1">Merge Cells</paragraph> -<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US"><ahelp hid=".">Combines the contents of the selected cells into a single cell.</ahelp></paragraph> -<section id="howtoget"> -<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US">Choose <emph>Format - Merge Cells - Merge Cells</emph></paragraph> -</section> -<embed href="text/scalc/01/05060000.xhp#mergenotes"/> -</body> -</helpdocument> diff --git a/source/text/scalc/01/05100200.xhp b/source/text/scalc/01/05100200.xhp deleted file mode 100644 index 0987e1e26f..0000000000 --- a/source/text/scalc/01/05100200.xhp +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * ---> - -<meta> -<topic id="textscalc0105100200xhp" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Split Cells</title> -<filename>/text/scalc/01/05100200.xhp</filename> -</topic> -</meta> -<body> -<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3147403" localize="false"/> -<paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1">Split Cells</paragraph> -<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US"><ahelp hid=".">Splits previously merged cells.</ahelp></paragraph> -<section id="howtoget"> -<paragraph role="paragraph" id="par_id3154023" xml-lang="en-US">Choose <emph>Format - Merge Cells - Split Cells</emph></paragraph> -</section> -</body> -</helpdocument> diff --git a/source/text/scalc/guide/table_cellmerge.xhp b/source/text/scalc/guide/table_cellmerge.xhp index 3abdea93a3..d5f788f7f2 100644 --- a/source/text/scalc/guide/table_cellmerge.xhp +++ b/source/text/scalc/guide/table_cellmerge.xhp @@ -22,41 +22,49 @@ <meta> <topic id="textscalcguidetable_cellmergexml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">Merging and Splitting Cells</title> + <title xml-lang="en-US" id="tit">Merge and Unmerge Cells</title> <filename>/text/scalc/guide/table_cellmerge.xhp</filename> </topic> </meta> <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3147240"><bookmark_value>cells; merging/unmerging</bookmark_value> - <bookmark_value>tables; merging cells</bookmark_value> - <bookmark_value>cell merges</bookmark_value> - <bookmark_value>unmerging cells</bookmark_value> - <bookmark_value>splitting cells</bookmark_value> - <bookmark_value>merging;cells</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id501632012952361"> + <bookmark_value>merge/merging cells</bookmark_value> + <bookmark_value>unmerge/unmerging cells</bookmark_value> + <bookmark_value>split/splitting cells</bookmark_value> </bookmark> -<paragraph xml-lang="en-US" id="hd_id8005005" role="heading" level="1"><variable id="table_cellmerge"><link href="text/scalc/guide/table_cellmerge.xhp" name="Merging and Unmerging Cells">Merging and Unmerging Cells</link> +<section id="merge_unmerge_cells"> +<paragraph xml-lang="en-US" id="hd_id8005005" role="heading" level="1"><variable id="table_cellmerge"><link href="text/scalc/guide/table_cellmerge.xhp" name="Merging and Unmerging Cells">Merge and Unmerge Cells</link> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id8049867" role="paragraph">You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell that has been created by merging single cells, and divide it back into individual cells.</paragraph> + <paragraph xml-lang="en-US" id="par_id8049867" role="paragraph">You can select a range of cells, then merge them into a single cell. Conversely, you can take a previously merged cell and divide it back into individual cells.</paragraph> +</section> <paragraph xml-lang="en-US" id="par_id0509200913480176" role="note">When you copy cells into a target range containing merged cells, the target range gets unmerged first, then the copied cells are pasted in. If the copied cells are merged cells, they retain their merge state.</paragraph> - <paragraph xml-lang="en-US" id="hd_id235602" role="heading" level="2">Merging Cells</paragraph> - <list type="ordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id1272927" role="listitem">Select the adjacent cells.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id6424146" role="listitem">Choose <emph>Format - Merge Cells - Merge Cells</emph>. If you choose <emph>Format - Merge Cells - Merge and Center Cells</emph>, the cell content will be centered in the merged cell.</paragraph> - </listitem> - </list> - <paragraph xml-lang="en-US" id="hd_id451368" role="heading" level="2">Splitting Cells</paragraph> - <list type="ordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id7116611" role="listitem">Place the cursor in the cell to be split.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id9493087" role="listitem">Choose <emph>Format - Merge Cells - Split Cells</emph>.</paragraph> - </listitem> - </list> + <paragraph xml-lang="en-US" id="hd_id235602" role="heading" level="2">Merge Cells</paragraph> + <embed href="/text/scalc/01/05060000.xhp#mergecells_warning"/> + <section id="howtoget"> + <paragraph xml-lang="en-US" id="par_id1272927" role="paragraph">Click and drag to select the cells to be merged then do one of the following:</paragraph> + <paragraph role="paragraph" id="par_id221632803290526" xml-lang="en-US">In the Formatting toolbar click:</paragraph> + <embed href="text/swriter/00/00000405.xhp#symerge_cells"/> + <paragraph role="paragraph" id="par_id3154351" xml-lang="en-US">Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further.</paragraph> + <paragraph role="paragraph" id="par_id931632803442925" xml-lang="en-US">Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox.</paragraph> + <paragraph role="paragraph" id="par_id3154020" xml-lang="en-US">Or, choose <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Merge Cells</menuitem></paragraph> + <paragraph xml-lang="en-US" id="par_id6424146" role="listitem">Or, choose <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Merge and Center Cells</menuitem></paragraph> + <paragraph xml-lang="en-US" id="par_id961632012538771" role="listitem">The cells will be merged and the content will be centered in the merged cell.</paragraph> + </section> + <embed href="text/scalc/01/05060000.xhp#mergenotes"/> + <paragraph xml-lang="en-US" id="hd_id451368" role="heading" level="2">Unmerge Cells</paragraph> + <section id="howtoget"> + <paragraph xml-lang="en-US" id="par_id7116611" role="paragraph">Select the cell to be unmerged, or a selection that includes the cells to be unmerged then do one of the following:</paragraph> + <paragraph role="listitem" id="par_id581632820903635" xml-lang="en-US">In the Formatting toolbar, click:</paragraph> + <embed href="text/swriter/00/00000405.xhp#sysplit_cells"/> + <paragraph xml-lang="en-US" id="par_id431632277778130" role="paragraph">Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>.<br/>If <menuitem>Merge Cells</menuitem> is present instead then the selection does not contain any merged cells.</paragraph> + <paragraph xml-lang="en-US" id="par_id261632277824041" role="paragraph">Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox.</paragraph> + <paragraph xml-lang="en-US" id="par_id9493087" role="listitem">Or, choose <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Unmerge Cells</menuitem>.</paragraph> + <paragraph xml-lang="en-US" id="par_id561632820960500" role="paragraph">Or, toggle <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Merge and Center Cells</menuitem></paragraph> + </section> <embed href="text/shared/00/00000004.xhp#related"/> + <embed href="text/shared/01/05100100.xhp#mergecells"/> + <embed href="text/scalc/01/05060000.xhp#togglemergecells"/> + <embed href="text/shared/01/05100200.xhp#unmergecells"/> <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/> </body> </helpdocument>
\ No newline at end of file diff --git a/source/text/scalc/main0105.xhp b/source/text/scalc/main0105.xhp index 7148555935..2ba41d4714 100644 --- a/source/text/scalc/main0105.xhp +++ b/source/text/scalc/main0105.xhp @@ -42,7 +42,7 @@ <embed href="text/scalc/01/05030000.xhp#zeile"/> <embed href="text/scalc/01/05040000.xhp#spalte"/> <embed href="text/scalc/01/05050000.xhp#sheet"/> -<embed href="text/scalc/01/05060000.xhp#zellenzusammenfassen"/> +<embed href="/text/scalc/guide/table_cellmerge.xhp#merge_unmerge_cells"/> <h2 id="hd_id3155087"><link href="text/scalc/01/05070000.xhp" name="Page">Page</link></h2> <embed href="text/scalc/01/05070000.xhp#seitetext"/> |