AllLangHelp_scalc.mk | 2 help3xsl/README.txt | 9 +++ helpers/unocmds.txt | 4 - source/text/scalc/01/05060000.xhp | 42 ++++++++++++++-- source/text/scalc/01/05100100.xhp | 28 ----------- source/text/scalc/01/05100200.xhp | 27 ---------- source/text/scalc/guide/table_cellmerge.xhp | 62 +++++++++++++----------- source/text/scalc/main0105.xhp | 2 source/text/shared/01/05100100.xhp | 71 ++++++++++++++++------------ source/text/shared/01/05100200.xhp | 66 +++++++++++++++----------- source/text/shared/main0204.xhp | 5 - source/text/simpress/guide/table_insert.xhp | 4 - source/text/swriter/00/00000405.xhp | 2 source/text/swriter/main0204.xhp | 5 - 14 files changed, 170 insertions(+), 159 deletions(-)
New commits: commit 0b9b6542a8432d8a7bb3fc8185c0937dff0329bd Author: Ross Johnson <[email protected]> AuthorDate: Wed Sep 22 20:32:11 2021 +1000 Commit: Olivier Hallot <[email protected]> CommitDate: Fri Oct 1 12:46:18 2021 +0200 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 <[email protected]> diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 57f5aa446..f2e840a5a 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -112,8 +112,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/05080300 \ helpcontent2/source/text/scalc/01/05080400 \ helpcontent2/source/text/scalc/01/05100000 \ - helpcontent2/source/text/scalc/01/05100100 \ - helpcontent2/source/text/scalc/01/05100200 \ helpcontent2/source/text/scalc/01/05110000 \ helpcontent2/source/text/scalc/01/05120000 \ helpcontent2/source/text/scalc/01/06020000 \ diff --git a/help3xsl/README.txt b/help3xsl/README.txt index 0788c731a..ea5335a57 100644 --- a/help3xsl/README.txt +++ b/help3xsl/README.txt @@ -33,6 +33,13 @@ and make sure that symlinks are allowed in the webserver configuration. File descriptions ----------------- +index2.html: + +This is the starting point for help when F1 is pressed. The control 'target' is passed in +and then the javascript here does the lookup of the hid2file.js map. If the target is found then that +HTML file is given to the browser with the module and other parameters added, otherwise it substitutes +a default, which is the modules main page. + * default.css: the cascading style sheet for HTML formatting. @@ -41,7 +48,7 @@ File descriptions the XSL transform file. Transform XHP files into HTML files. - This file is a modification of xmlhelper/util/main_transform.xsl, which was designed for xmlhelp XSL processor. + This file is a modification of xmlhelp/util/main_transform.xsl, which was designed for xmlhelp XSL processor. * help.js diff --git a/helpers/unocmds.txt b/helpers/unocmds.txt index 0552d7f7c..66fda9a18 100644 --- a/helpers/unocmds.txt +++ b/helpers/unocmds.txt @@ -660,7 +660,7 @@ .uno:MeasureAttributes;simpress/01/05150000.xhp .uno:MeasureLine;simpress/02/10120000.xhp .uno:Merge;simpress/01/13180100.xhp -.uno:MergeCells;swriter/01/05100100.xhp +.uno:MergeCells;shared/01/05100100.xhp .uno:MergeDialog;swriter/01/01150000.xhp .uno:MergeDocuments;shared/01/02230500.xhp .uno:MergeTable;swriter/01/05200000.xhp @@ -946,7 +946,7 @@ .uno:Spelling;shared/01/06010000.xhp .uno:Sphere;simpress/02/10090000.xhp .uno:SpinButton;shared/02/01170000.xhp -.uno:SplitCell;swriter/01/05100200.xhp +.uno:SplitCell;shared/01/05100200.xhp .uno:SplitTable;swriter/01/05190000.xhp .uno:SplitWindow;scalc/01/07080000.xhp .uno:Square;simpress/02/10060000.xhp diff --git a/source/text/scalc/01/05060000.xhp b/source/text/scalc/01/05060000.xhp index 01ca02e4f..6c3fa7465 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 d0ae8a311..000000000 --- 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 0987e1e26..000000000 --- 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 3abdea93a..d5f788f7f 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 714855593..2ba41d471 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"/> diff --git a/source/text/shared/01/05100100.xhp b/source/text/shared/01/05100100.xhp index a8d358a81..30bdd8517 100644 --- a/source/text/shared/01/05100100.xhp +++ b/source/text/shared/01/05100100.xhp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- * This file is part of the LibreOffice project. * @@ -19,44 +19,59 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + <meta> <topic id="textshared0105100100xhp" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Merge</title> +<title id="tit" xml-lang="en-US">Merge Cells</title> <filename>/text/shared/01/05100100.xhp</filename> </topic> </meta> <body> -<section id="merge"> +<comment>moved from scalc/01/05100100.xhp and updated for tdf#33749</comment> +<section id="merge_cells"> +<bookmark xml-lang="en-US" branch="index" id="bm_id501632012952361"> + <bookmark_value>merge/merging cells</bookmark_value> +</bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id1766491" localize="false"/> -<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1"><link href="text/shared/01/05100100.xhp" name="Merge">Merge</link></paragraph> -<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US"><variable id="verbindentext"><ahelp hid=".">Combines the contents of the selected table cells into a single cell.</ahelp> -</variable><comment>moved from swriter/01/05100100.xhp, see i86644</comment></paragraph> +<paragraph role="heading" id="hd_id451632377983974" xml-lang="en-US" level="1"><variable id="mergecells"><link href="text/shared/01/05100100.xhp" name="Merging Cells without centering">Merge Cells</link></variable></paragraph> +<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US"><variable id="verbindentext"><ahelp hid=".">Combines the contents of the selected cells into a single cell, retaining the formatting of the first cell in the selection.</ahelp></variable><comment>moved from swriter/01/05100100.xhp, see i86644</comment></paragraph> +<embed href="text/scalc/01/05060000.xhp#mergecells_warning"/> +<switch select="appl"> +<case select="CALC"> +<section id="merge_cells_calc"> +<section id="howtoget"> +<paragraph xml-lang="en-US" id="par_id461632808376973" 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 <emph>Formatting</emph> 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> +</section> +<embed href="text/scalc/01/05060000.xhp#mergenotes"/> </section> +</case> +<default> +<section id="merge_cells_default"> <section id="howtoget"> +<paragraph role="paragraph" id="par_id321632377889618" xml-lang="en-US">Choose <emph>Table - Merge Cells</emph>.<br/></paragraph> +<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US">Or, on the <emph>Table</emph> toolbar click:</paragraph> +<embed href="text/swriter/00/00000405.xhp#symerge_cells"/> +</section> +</section> +</default> +</switch> +</section> +<embed href="text/shared/00/00000004.xhp#related"/> <switch select="appl"> -<case select="WRITER"> -<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US">Choose <emph>Table - Merge Cells</emph> -</paragraph> +<case select="CALC"> +<embed href="text/scalc/01/05060000.xhp#togglemergecells"/> +<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"/> </case> +<default> +<embed href="text/shared/01/05100200.xhp#splitcells"/> +</default> </switch> -<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US">On the <emph>Table</emph> Bar, click</paragraph> -<section id="symerge_cells"> -<table id="tbl_id3154636"> -<tablerow> -<tablecell> -<paragraph role="paragraph" id="par_id3153996" xml-lang="en-US"> -<image id="img_id3154002" src="cmd/sc_mergecells.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154002" xml-lang="en-US">icon</alt> - </image></paragraph> -</tablecell> -<tablecell> -<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US">Merge Cells</paragraph> -</tablecell> -</tablerow> -</table> - -</section> -</section> -<paragraph role="warning" id="par_id3153718" xml-lang="en-US">Merging cells can lead to calculation errors in formulas in the table.</paragraph> </body> </helpdocument> diff --git a/source/text/shared/01/05100200.xhp b/source/text/shared/01/05100200.xhp index 4b4e7465c..2c3dd7cc7 100644 --- a/source/text/shared/01/05100200.xhp +++ b/source/text/shared/01/05100200.xhp @@ -27,40 +27,43 @@ </topic> </meta> <body> -<section id="split_cells"> +<section id="split_cell"> +<bookmark xml-lang="en-US" branch="index" id="bm_id501632012952361"> + <bookmark_value>unmerge/unmerging cells</bookmark_value> + <bookmark_value>split/splitting cells</bookmark_value> +</bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3525727" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/splitcellsdialog/SplitCellsDialog" id="bm_id3147405" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/splitcellsdialog/@@nowidget@@" id="bm_id3147405" localize="false"/> -<paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1"><link href="text/shared/01/05100200.xhp" name="Split Cells">Split Cells</link></paragraph> -<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US"><variable id="teilentext"><ahelp hid=".">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp> -</variable></paragraph> +<switch select="appl"> +<case select="CALC"> +<section id="split_cell_calc"> +<comment>This section moved from /text/calc/01/05100200.xhp and updated for tdf#33749</comment> +<paragraph role="heading" id="hd_id621632385142590" xml-lang="en-US" level="1"><variable id="unmergecells"><link href="text/shared/01/05100200.xhp" name="Unmerging Cells">Unmerge Cells</link></variable></paragraph> +<paragraph role="paragraph" id="par_id871632385128307" xml-lang="en-US"><ahelp hid=".">Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged that content is restored.</ahelp></paragraph> </section> <section id="howtoget"> -<switch select="appl"> -<case select="WRITER"> -<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US">Choose <emph>Table - Split Cells</emph> -</paragraph> +<paragraph xml-lang="en-US" id="par_id1001632807096225" role="paragraph">Select the cells to be unmerged then do one of the following:</paragraph> +<paragraph role="paragraph" id="par_id961632804418168" xml-lang="en-US">In the <emph>Formatting</emph> toolbar click:</paragraph> +<embed href="text/swriter/00/00000405.xhp#sysplit_cells"/> +<paragraph role="paragraph" id="par_id161632275254217" xml-lang="en-US">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 cell selection does not contain any merged cells.</paragraph> +<paragraph role="paragraph" id="par_id901632804430738" xml-lang="en-US">Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox.</paragraph> +<paragraph role="paragraph" id="par_id381632805680565" xml-lang="en-US">Or, choose <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Unmerge Cells</menuitem></paragraph> +</section> </case> -</switch> -<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US">On the <emph>Table</emph> Bar, click</paragraph> -<section id="sysplit_cells"> -<table id="tbl_id3149972"> -<tablerow> -<tablecell> -<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US"> -<image id="img_id3147275" src="cmd/sc_splitcell.png" width="0.423cm" height="0.423cm"><alt id="alt_id3147275" xml-lang="en-US">Icon</alt> - </image></paragraph> -</tablecell> -<tablecell> -<paragraph role="paragraph" id="par_id3150616" xml-lang="en-US">Split Cells</paragraph> -</tablecell> -</tablerow> -</table> - +<default> +<section id="split_cell_default"> +<paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1"><variable id="splitcells"><link href="text/shared/01/05100200.xhp" name="Splitting Cells">Split Cells</link></variable></paragraph> +<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US"><variable id="teilentext"><ahelp hid=".">Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into.</ahelp> +</variable></paragraph> </section> +<section id="howtoget"> +<paragraph role="paragraph" id="par_id321632807186976" xml-lang="en-US">Do one of the following:<br/></paragraph> +<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US">Choose <emph>Table - Split Cells</emph>.<br/></paragraph> +<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US">Or, on the <emph>Table</emph> toolbar click:</paragraph> +<embed href="text/swriter/00/00000405.xhp#sysplit_cells"/> </section> - -<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2">Split cell into</paragraph> +<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2">Split Cells Dialog</paragraph> <paragraph role="paragraph" id="par_id3150021" xml-lang="en-US"><ahelp hid="cui/ui/splitcellsdialog/countnf">Enter the number of rows or columns that you want to split the selected cell(s) into.</ahelp></paragraph> <paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="2">Direction</paragraph> @@ -72,5 +75,16 @@ <paragraph role="heading" id="hd_id3150765" xml-lang="en-US" level="3">Vertically</paragraph> <paragraph role="paragraph" id="par_id3145410" xml-lang="en-US"><ahelp hid="cui/ui/splitcellsdialog/vert">Splits the selected cell(s) into the number of columns that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph> +</default> +</switch> +</section> +<embed href="text/shared/00/00000004.xhp#related"/> +<embed href="text/shared/01/05100100.xhp#mergecells"/> +<embed href="text/scalc/guide/table_cellmerge.xhp#table_cellmerge"/> +<switch select="appl"> +<case select="CALC"> +<embed href="text/scalc/01/05060000.xhp#togglemergecells"/> +</case> +</switch> </body> </helpdocument> diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp index aa625e11c..9bc345f92 100644 --- a/source/text/shared/main0204.xhp +++ b/source/text/shared/main0204.xhp @@ -44,9 +44,8 @@ <embed href="text/shared/01/05210100.xhp#sytext"/> <paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2"><link href="text/shared/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph> <embed href="text/shared/01/05100100.xhp#verbindentext"/> -<embed href="text/shared/01/05100100.xhp#symerge_cells"/> -<embed href="text/shared/01/05100200.xhp#split_cells"/> -<embed href="text/shared/01/05100200.xhp#sysplit_cells"/> +<embed href="text/swriter/00/00000405.xhp#symerge_cells"/> +<embed href="text/swriter/00/00000405.xhp#sysplit_cells"/> <embed href="text/shared/02/04210000.xhp#optimize"/> <embed href="text/shared/02/04210000.xhp#syoptimize"/> <embed href="text/shared/01/05100500.xhp#top"/> diff --git a/source/text/simpress/guide/table_insert.xhp b/source/text/simpress/guide/table_insert.xhp index 0a8540a6f..b61242de3 100644 --- a/source/text/simpress/guide/table_insert.xhp +++ b/source/text/simpress/guide/table_insert.xhp @@ -50,10 +50,6 @@ <paragraph role="paragraph" id="par_id8626667" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the number of rows for the new table.</ahelp></paragraph><comment>Contextmenu of a table in Impress and Draw</comment><comment>Cell</comment> <bookmark xml-lang="en-US" branch="hid/.uno:CellMenu" id="bm_id0916200803192795" localize="false"/> <paragraph role="paragraph" id="par_id0916200803551581" xml-lang="en-US"><ahelp hid="." visibility="hidden">Define the vertical alignment of selected or all cell contents. Split or merge cells.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id0916200803370158" localize="false"/> -<paragraph role="paragraph" id="par_id0916200803551553" xml-lang="en-US"><ahelp hid="." visibility="hidden">All selected cells are merged into one cell.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id0916200803375165" localize="false"/> -<paragraph role="paragraph" id="par_id0916200803551535" xml-lang="en-US"><ahelp hid="." visibility="hidden">The selected cell is split into several cells. You see the Split Cells dialog box.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id0916200803224438" localize="false"/> <paragraph role="paragraph" id="par_id0916200803551651" xml-lang="en-US"><ahelp hid="." visibility="hidden">The cell contents are align at the top of the cells.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id091620080323379" localize="false"/> diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp index e4773b6c9..33f2f8cc8 100644 --- a/source/text/swriter/00/00000405.xhp +++ b/source/text/swriter/00/00000405.xhp @@ -199,7 +199,7 @@ <paragraph xml-lang="en-US" id="par_id3147270" role="paragraph"><image id="img_id3147275" src="cmd/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3147275">Icon</alt></image></paragraph> </tablecell> <tablecell> - <paragraph xml-lang="en-US" id="par_id3150616" role="paragraph">Split Cells</paragraph> + <paragraph xml-lang="en-US" id="par_id3150616" role="paragraph"><switchinline select="appl"><caseinline select="CALC">Unmerge Cells</caseinline><defaultinline>Split Cells</defaultinline></switchinline></paragraph> </tablecell> </tablerow> </table> diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp index 01384e855..9138b4b2c 100644 --- a/source/text/swriter/main0204.xhp +++ b/source/text/swriter/main0204.xhp @@ -44,9 +44,8 @@ <embed href="text/shared/02/02170000.xhp#sybackground_color"/> <paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2"><link href="text/shared/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph> <embed href="text/shared/01/05100100.xhp#verbindentext"/> -<embed href="text/shared/01/05100100.xhp#symerge_cells"/> -<embed href="text/shared/01/05100200.xhp#split_cells"/> -<embed href="text/shared/01/05100200.xhp#sysplit_cells"/> +<embed href="text/swriter/00/00000405.xhp#symerge_cells"/> +<embed href="text/swriter/00/00000405.xhp#sysplit_cells"/> <embed href="text/shared/02/04210000.xhp#optimize"/> <embed href="text/shared/02/04210000.xhp#syoptimize"/> <embed href="text/shared/01/05100500.xhp#top"/>
