fdo#33746 fixed help for Merge/Split Cells

Change-Id: I270b0fec7d48267761d24da43b8862e045d3024c
author: Andras Timar <atimar@suse.com> 2012-06-19 23:30:23 +0200
committer: Andras Timar <atimar@suse.com> 2012-06-19 23:36:38 +0200
commit: 6eb0014e1a20df12ab0e6ed4928a81da0cb9e647 (patch)
tree: dd1fa841c9d343db6a4294fb0f1bdd08cfabcc5d
parent: e035c07fc3048a30bc8a34d9f87b44a17baca352 (diff)
7 files changed, 72 insertions, 14 deletions
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 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="U" oldref="17"><variable id="fotenb">Choose <emph>Format - Sheet - Show</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154020" xml-lang="en-US" l10n="U" oldref="18"><variable id="fozelzus">Choose <emph>Format - Merge Cells</emph>
-</variable><comment>UFI: removed two lines, see #59899</comment></paragraph>
 <paragraph role="paragraph" id="par_idN1077A" xml-lang="en-US" l10n="NEW"><variable id="foste">Choose <emph>Format - Page</emph>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3155508" xml-lang="en-US" l10n="U" oldref="25"><variable id="fostel">Choose <emph>Format - Page - Sheet</emph> 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 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0105060000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Merge Cells</title>
+<title id="tit" xml-lang="en-US">Merge and Center Cells</title>
 <filename>/text/scalc/01/05060000.xhp</filename>
 </topic>
 <history>
@@ -42,15 +42,17 @@ dedr: reviewed</lastedited>
 </meta>
 <body>
 <section id="zellenzusammenfassen">
-<bookmark xml-lang="en-US" branch="hid/.uno:ToggleMergeCells" id="bm_id9469567" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:ToggleMergeCells" id="bm_id8030335" 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 Cells">Merge 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.</ahelp></paragraph>
+<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>
 <section id="howtoget">
-  <embed href="text/scalc/00/00000405.xhp#fozelzus"/>
+<paragraph role="paragraph" id="par_id3154020" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Format - Merge Cells - Merge and Center Cells</emph></paragraph>
 </section>
+<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="warning" id="par_id3153718" xml-lang="en-US">Merging cells can lead to calculation errors in formulas in the table.</paragraph>
+</section>
 </body>
 </helpdocument>
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 @@
+<?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/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 @@
+<?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/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 @@
       <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><comment>MW made "cell merges;..." a one level entry</comment>
+</bookmark>
 <paragraph xml-lang="en-US" id="hd_id8005005" role="heading" level="1" l10n="NEW"><variable id="table_cellmerge"><link href="text/scalc/guide/table_cellmerge.xhp" name="Merging and Unmerging Cells">Merging and Unmerging Cells</link>
-</variable><comment>mw created this file out of the shared guide "table_cellmerge.xhp", see also bug #63021</comment></paragraph>
+</variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id8049867" role="paragraph" l10n="NEW">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_id0509200913480176" role="note" l10n="NEW">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" l10n="NEW">Merging Cells</paragraph>
@@ -54,16 +55,16 @@
             <paragraph xml-lang="en-US" id="par_id1272927" role="listitem" l10n="NEW">Select the adjacent cells.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id6424146" role="listitem" l10n="NEW">Choose <emph>Format - Merge Cells</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6424146" role="listitem" l10n="NEW">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" l10n="NEW">Canceling the merging of cells</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id451368" role="heading" level="2" l10n="NEW">Splitting Cells</paragraph>
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id7116611" role="listitem" l10n="NEW">Place the cursor in the cell to be split.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id9493087" role="listitem" l10n="NEW">Choose <emph>Format - Merge Cells</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id9493087" role="listitem" l10n="NEW">Choose <emph>Format - Merge Cells - Split Cells</emph>.</paragraph>
          </listitem>
       </list>
       <embed href="text/shared/00/00000004.xhp#related"/>
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 \
author	Andras Timar <atimar@suse.com>	2012-06-19 23:30:23 +0200
committer	Andras Timar <atimar@suse.com>	2012-06-19 23:36:38 +0200
commit	6eb0014e1a20df12ab0e6ed4928a81da0cb9e647 (patch)
tree	dd1fa841c9d343db6a4294fb0f1bdd08cfabcc5d
parent	e035c07fc3048a30bc8a34d9f87b44a17baca352 (diff)