--- AllLangHelp_scalc.mk | 1 + source/text/scalc/01/05060000.xhp | 75 +++++++++++--------- source/text/scalc/01/MergeCellsMenu.xhp | 32 +++++++++ source/text/shared/01/05100100.xhp | 84 ++++++++++++----------- source/text/shared/01/05100200.xhp | 117 +++++++++++++++++++------------- 5 files changed, 189 insertions(+), 120 deletions(-) create mode 100644 source/text/scalc/01/MergeCellsMenu.xhp diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 9557466f22..6192819d40 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -285,6 +285,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_yearfrac \ helpcontent2/source/text/scalc/01/hide_sheet \ helpcontent2/source/text/scalc/01/live_data_stream \ + helpcontent2/source/text/scalc/01/MergeCellsMenu \ helpcontent2/source/text/scalc/01/recalculate_hard \ helpcontent2/source/text/scalc/01/shared_spreadsheet \ helpcontent2/source/text/scalc/01/sheet_tab_color \ diff --git a/source/text/scalc/01/05060000.xhp b/source/text/scalc/01/05060000.xhp index d3d67b0e0b..efc09896dc 100644 --- a/source/text/scalc/01/05060000.xhp +++ b/source/text/scalc/01/05060000.xhp @@ -19,7 +19,7 @@ -Merge and Center Cells +Merge and Center Cells /text/scalc/01/05060000.xhp @@ -27,62 +27,71 @@ - - toggle merge and center cells + +toggle merge and center cells - - - -

Merge and Center Cells

-This is a toggleable 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. -The control is shown toggled-on whenever there are merged cells in the selection, indicating that clicking the control will unmerge those cells. + + + + +

Merge and Center Cells

+ This is a toggleable 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. +

+ +The control is shown toggled-on whenever there are merged cells in the selection, indicating that clicking the control will unmerge those cells.

Merging cells can lead to calculation errors in formulas in the table.

-Do one of the following: -In the Formatting toolbar, click: - - - - -

Icon Merge and Center Cells - - -Merge and Center Cells - - -

-Or, choose Format - Merge and Unmerge Cells - Merge and Center Cells. +

+ Choose Format - Merge and Unmerge Cells - Merge and Center Cells. +

+ Choose Home - Merge and Center Cells. +

+ + + + +

Icon Merge and Center Cells + + + Merge and Center Cells + + +

-Cells cannot be merged again without first unmerging them. +Cells cannot be merged again without first unmerging them. Merging a cell selection that partially includes merged cells is generally possible with Unmerge Cells followed by Merge Cells, without altering the initial selection. The result will be largely depend on previous choices when merging cells made with the Merge Cells Dialog options described below. -Multiple selection is not supported, that is, the selection must be rectangular. +Multiple selection is not supported, that is, the selection must be rectangular. The merged cell receives the name and content of the first cell of the selection. If more than one cell to be merged has content the Merge Cells dialog opens. - - - + + +

Merge Cells Dialog Options

-Three options are available: +Three options are available: - Move the contents of the hidden cells into the first cell: The actual contents of the hidden cells are concatenated to the first cell, and hidden cells are emptied; the results of formulas referring to the hidden cells or the first cell will be updated. + Move the contents of the hidden cells into the first cell: The actual contents of the hidden cells are concatenated to the first cell, and hidden cells are emptied; the results of formulas referring to the hidden cells or the first cell will be updated. - Keep the contents of the hidden cells: The contents of the hidden cells are kept; the results of formulas referring to the hidden cells will not change. + Keep the contents of the hidden cells: The contents of the hidden cells are kept; the results of formulas referring to the hidden cells will not change. - Empty the contents of the hidden cells: The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated. + Empty the contents of the hidden cells: The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated.

diff --git a/source/text/scalc/01/MergeCellsMenu.xhp b/source/text/scalc/01/MergeCellsMenu.xhp new file mode 100644 index 0000000000..51d1e9f1b5 --- /dev/null +++ b/source/text/scalc/01/MergeCellsMenu.xhp @@ -0,0 +1,32 @@ + + + + + + + Merge Cells Menu + /text/scalc/01/MergeCellsMenu.xhp + + + + +

Merge and Unmerge Cells

+ Opens a submenu for merging and unmerging cells. +

+ Choose Format - Merge and Unmerge Cells. +

+ + diff --git a/source/text/shared/01/05100100.xhp b/source/text/shared/01/05100100.xhp index 8c6c7a9336..385851a173 100644 --- a/source/text/shared/01/05100100.xhp +++ b/source/text/shared/01/05100100.xhp @@ -22,57 +22,65 @@ -Merge Cells +Merge Cells /text/shared/01/05100100.xhp moved from scalc/01/05100100.xhp and updated for tdf#33749 -

- - merge/merging cells + +merge/merging cells - + +

Merge Cells

-Combines the contents of the selected cells into a single cell, retaining the formatting of the first cell in the selection.moved from swriter/01/05100100.xhp, see i86644 +Combines the contents of the selected cells into a single cell, retaining the formatting of the first cell in the selection.moved from swriter/01/05100100.xhp, see i86644

- - -

-Select the cells to be merged then do one of the following: -In the Formatting toolbar, click: -

-Or, right click the selection to open the context menu and choose Merge Cells. If Unmerge Cells is present instead then the cell selection contains merged cells and cannot be merged further. -Or, in the Properties sidebar mark the Merge Cells checkbox. -Or, choose Format - Merge and Unmerge Cells - Merge Cells. -

- - -

-Choose Table - Merge Cells.
-Or, on the Table toolbar click: -

+ + +

+ Choose Format - Merge and Unmerge Cells - Merge Cells. +

+ In the Alignment deck of the Properties panel, mark Merge Cells checkbox. + + +

+ Choose Table - Merge Cells. +

+ In the Table deck of the Properties panel, choose Merge Cells. + + +

+ Choose Merge Cells. +

- - -

+ - -

- - -

- + +

+ + +

+ + + +

+ +

diff --git a/source/text/shared/01/05100200.xhp b/source/text/shared/01/05100200.xhp index 1129691588..482a0b3d7f 100644 --- a/source/text/shared/01/05100200.xhp +++ b/source/text/shared/01/05100200.xhp @@ -22,68 +22,87 @@ -Split Cells +Split Cells /text/shared/01/05100200.xhp -

- + unmerge/unmerging cells split/splitting cells - - - - - -

-This section moved from /text/calc/01/05100200.xhp and updated for tdf#33749 -

Unmerge Cells

-Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged that content is restored. -

-Select the cells to be unmerged then do one of the following: -In the Formatting toolbar click: -

-Or, right click the selection to open the context menu and choose Unmerge Cells. If Merge Cells is present instead then the cell selection does not contain any merged cells. -Or, in the Properties sidebar clear the Merge Cells checkbox. -Or, choose Format - Merge and Unmerge Cells - Unmerge Cells -

- - -

Split Cells

-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. -

+ + + + + + + This section moved from /text/calc/01/05100200.xhp and updated for tdf#33749 +

Unmerge Cells

+ Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged that content is restored. +

+ + +

Split Cells

+ 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. + +

-Do one of the following: -Choose Table - Split Cells. -Or, on the Table toolbar click: -

+ + +

+ Choose Format - Merge and Unmerge Cells - Unmerge Cells. +

+ Choose Unmerge Cells. +

+ In the Alignment deck of the Properties panel, clear Merge Cells checkbox. + + + Do one of the following: +

+ Choose Table - Split Cells. +

+ Choose Split Cells. +

+ Choose Table - Split Cells. +

+ On the Table deck of the Properties panel, choose Split Cells. + +

Split Cells Dialog

-Enter the number of rows or columns that you want to split the selected cell(s) into. -

Direction

Horizontally

-Splits the selected cell(s) into the number of rows that you specify in the Split cell into box. -

Into equal proportions

-Splits cells into rows of equal height. + + + + +

Split Cells Dialog

+ Enter the number of rows or columns that you want to split the selected cell(s) into. +

Direction

Horizontally

+ Splits the selected cell(s) into the number of rows that you specify in the Split cell into box. + +

Into equal proportions

+ Splits cells into rows of equal height. -

Vertically

-Splits the selected cell(s) into the number of columns that you specify in the Split cell into box. - +

Vertically

+ Splits the selected cell(s) into the number of columns that you specify in the Split cell into box. + -

- - -

- - +

+ + +

-- cgit