From 6eb0014e1a20df12ab0e6ed4928a81da0cb9e647 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 19 Jun 2012 23:30:23 +0200 Subject: fdo#33746 fixed help for Merge/Split Cells Change-Id: I270b0fec7d48267761d24da43b8862e045d3024c --- helpcontent2/source/text/scalc/00/00000405.xhp | 2 -- helpcontent2/source/text/scalc/01/05060000.xhp | 12 ++++++---- helpcontent2/source/text/scalc/01/05100100.xhp | 28 ++++++++++++++++++++++ helpcontent2/source/text/scalc/01/05100200.xhp | 27 +++++++++++++++++++++ helpcontent2/source/text/scalc/01/makefile.mk | 2 ++ .../source/text/scalc/guide/table_cellmerge.xhp | 11 +++++---- helpcontent2/util/scalc/makefile.mk | 4 ++-- 7 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 helpcontent2/source/text/scalc/01/05100100.xhp create mode 100644 helpcontent2/source/text/scalc/01/05100200.xhp diff --git a/helpcontent2/source/text/scalc/00/00000405.xhp b/helpcontent2/source/text/scalc/00/00000405.xhp index ad0c5e26d5..a830371df3 100644 --- a/helpcontent2/source/text/scalc/00/00000405.xhp +++ b/helpcontent2/source/text/scalc/00/00000405.xhp @@ -78,8 +78,6 @@ Choose Format - Sheet - Show -Choose Format - Merge Cells -UFI: removed two lines, see #59899 Choose Format - Page Choose Format - Page - Sheet tab diff --git a/helpcontent2/source/text/scalc/01/05060000.xhp b/helpcontent2/source/text/scalc/01/05060000.xhp index 8ee5beaf90..265f014da3 100644 --- a/helpcontent2/source/text/scalc/01/05060000.xhp +++ b/helpcontent2/source/text/scalc/01/05060000.xhp @@ -31,7 +31,7 @@ -Merge Cells +Merge and Center Cells /text/scalc/01/05060000.xhp @@ -42,15 +42,17 @@ dedr: reviewed
- -Merge Cells -Combines the selected cells into a single cell or splits merged cells. +Merge and Center Cells +Combines the selected cells into a single cell or splits merged cells. Aligns cell content centered.
- +Choose Format - Merge Cells - Merge and Center Cells
+
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. If the cells to be merged have any contents, a security dialog is shown. +Merging cells can lead to calculation errors in formulas in the table. +
 diff --git a/helpcontent2/source/text/scalc/01/05100100.xhp b/helpcontent2/source/text/scalc/01/05100100.xhp new file mode 100644 index 0000000000..d0ae8a3114 --- /dev/null +++ b/helpcontent2/source/text/scalc/01/05100100.xhp @@ -0,0 +1,28 @@ + + + + + + + +Merge Cells +/text/scalc/01/05100100.xhp + + + + +Merge Cells +Combines the contents of the selected cells into a single cell. +
+Choose Format - Merge Cells - Merge Cells +
+ + + diff --git a/helpcontent2/source/text/scalc/01/05100200.xhp b/helpcontent2/source/text/scalc/01/05100200.xhp new file mode 100644 index 0000000000..0987e1e26f --- /dev/null +++ b/helpcontent2/source/text/scalc/01/05100200.xhp @@ -0,0 +1,27 @@ + + + + + + + +Split Cells +/text/scalc/01/05100200.xhp + + + + +Split Cells +Splits previously merged cells. +
+Choose Format - Merge Cells - Split Cells +
+ + diff --git a/helpcontent2/source/text/scalc/01/makefile.mk b/helpcontent2/source/text/scalc/01/makefile.mk index 403d6968bd..6a0889d1ad 100644 --- a/helpcontent2/source/text/scalc/01/makefile.mk +++ b/helpcontent2/source/text/scalc/01/makefile.mk @@ -128,6 +128,8 @@ XHPFILES = \ 05080300.xhp \ 05080400.xhp \ 05100000.xhp \ + 05100100.xhp \ + 05100200.xhp \ 05110000.xhp \ 05120000.xhp \ 06020000.xhp \ diff --git a/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp b/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp index dccab8dd4f..263ca58556 100644 --- a/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp +++ b/helpcontent2/source/text/scalc/guide/table_cellmerge.xhp @@ -42,10 +42,11 @@ tables; merging cells cell merges unmerging cells + splitting cells merging;cells -MW made "cell merges;..." a one level entry + Merging and Unmerging Cells -mw created this file out of the shared guide "table_cellmerge.xhp", see also bug #63021 + 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. 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. Merging Cells @@ -54,16 +55,16 @@ Select the adjacent cells. - Choose Format - Merge Cells. + Choose Format - Merge Cells - Merge Cells. If you choose Format - Merge Cells - Merge and Center Cells, the cell content will be centered in the merged cell. - Canceling the merging of cells + Splitting Cells Place the cursor in the cell to be split. - Choose Format - Merge Cells. + Choose Format - Merge Cells - Split Cells. diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index d1a3a43cac..0467b9f8c0 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -153,6 +153,8 @@ LINKLINKFILES= \ text$/scalc$/01$/05080300.xhp \ text$/scalc$/01$/05080400.xhp \ text$/scalc$/01$/05100000.xhp \ + text$/scalc$/01$/05100100.xhp \ + text$/scalc$/01$/05100200.xhp \ text$/scalc$/01$/05110000.xhp \ text$/scalc$/01$/05120000.xhp \ text$/scalc$/01$/06020000.xhp \ @@ -545,8 +547,6 @@ LINKLINKFILES= \ text$/shared$/01$/05080400.xhp \ text$/shared$/01$/05090000.xhp \ text$/shared$/01$/05100000.xhp \ - text$/shared$/01$/05100100.xhp \ - text$/shared$/01$/05100200.xhp \ text$/shared$/01$/05100500.xhp \ text$/shared$/01$/05100600.xhp \ text$/shared$/01$/05100700.xhp \ -- cgit