source/text/scalc/01/05060000.xhp | 13 +++++++++++++
1 file changed, 13 insertions(+)
New commits:
commit ea4100df0c087e2439ae438cfa7a3d35efb6dd27
Author: Laurent Balland-Poirier <laurent.balland-poir...@laposte.net>
Date: Sat Jul 23 22:15:07 2016 +0200
tdf#30456 Add help to Merge Cells dialog
Describe the three options that will be introduced with commit:
https://gerrit.libreoffice.org/27463/
Change-Id: Iefe1b887d28d1845755e5beeadfa6d829c8d4acf
Reviewed-on: https://gerrit.libreoffice.org/27467
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/source/text/scalc/01/05060000.xhp
b/source/text/scalc/01/05060000.xhp
index 7103af4..567626e 100644
--- a/source/text/scalc/01/05060000.xhp
+++ b/source/text/scalc/01/05060000.xhp
@@ -32,6 +32,7 @@
<body>
<section id="zellenzusammenfassen">
<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"/>
<paragraph role="heading" id="hd_id3149785" xml-lang="en-US" level="1"
l10n="U" oldref="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" l10n="CHG"
oldref="2"><ahelp hid=".">Combines the selected cells into a single cell or
splits merged cells. Aligns cell content centered.</ahelp></paragraph>
</section>
@@ -41,6 +42,18 @@
<section id="mergenotes">
<paragraph role="paragraph" id="par_id3148552" xml-lang="en-US" l10n="U"
oldref="4">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" l10n="U"
oldref="3">If the cells to be merged have any contents, a security dialog is
shown.</paragraph>
+<paragraph role="paragraph" id="par_id1001240" xml-lang="en-US"><ahelp
hid="modules/scalc/ui/mergecellsdialog/MergeCellsDialog">Three options are
available:</ahelp></paragraph>
+<list type="unordered">
+ <listitem>
+ <paragraph id="par_id3155879" role="listitem" xml-lang="en-US"><emph>Move
the contents of the hidden cells into the first cell</emph>: 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.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id3155878" role="listitem" xml-lang="en-US"><emph>Keep
the contents of the hidden cells</emph>: the contents of the hidden cells are
kept; the results of formulas referring to the hidden cells will not
change.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id3155877" role="listitem" xml-lang="en-US"><emph>Empty
the contents of the hidden cells</emph>: the contents of the hidden cells are
removed; the results of formulas referring to the hidden cells will be
updated.</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>
</body>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
