tdf#155875 UI cmds Writer/Table in Help(31)

+ refactoring
+ Table - Size menu (part 31)
+ Merges optimal row/height into shared file
+ delete obsolete help pages
+ delete pages with no HID (obsolete)
+ Some pages will be revisited

Change-Id: I06593f96f3953f0de43a290a956acab94af09b34
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156584
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

11 files changed, 116 insertions, 282 deletions

diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index 52a704c27b..b454198dd8 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -304,7 +304,24 @@
          <paragraph id="par_id3145656" role="paragraph">Open context menu in <emph>Navigator</emph> for tables.</paragraph>
       </section>
       <paragraph id="par_id3148716" role="paragraph"><variable id="zeile">In the context menu of a cell, choose <emph>Row</emph>.</variable></paragraph>
-      <paragraph id="par_id3155345" role="paragraph"><variable id="hoehez">In the context menu of a cell, choose <emph>Row - Height</emph>.</variable></paragraph>
+
+      <section id="tablerowheight">
+            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+            <paragraph role="paragraph" id="par_id821693922352366">Choose <menuitem>Table - Size - Row Height</menuitem>.</paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph id="par_id3155345" role="paragraph"><variable id="hoehez">Choose <menuitem>Size - Row Height</menuitem>.</variable></paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id751693922488102">On the <menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose <menuitem>Row Height</menuitem>.</paragraph>
+      </section>
+      <section id="tablecolumnwidth">
+            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+            <paragraph role="paragraph" id="par_id811693922871642">Choose <menuitem>Table - Size - Column Width</menuitem>.</paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph id="par_id471693922986317" role="paragraph"><variable id="hoehez">Choose <menuitem>Size - Column Width</menuitem>.</variable></paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id721693923030382">On the <menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose <menuitem>Column Width</menuitem>.</paragraph>
+      </section>
+
       <paragraph id="par_id3145095" role="paragraph"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>.</variable></paragraph>
 
       <section id="delete_row">
@@ -514,5 +531,22 @@
          <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
          <paragraph role="paragraph" id="par_id731693734262393">Choose <menuitem>Table - Select</menuitem>.</paragraph>
       </section>
+      <section id="table_size_menu">
+        <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+        <paragraph role="paragraph" id="par_id861693917583707">Choose <menuitem>Table - Size</menuitem>.</paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_context"/>
+        <paragraph role="paragraph" id="par_id1001693917623947">Choose <menuitem>Size</menuitem>.</paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+            <table id="tab_id81693917813685">
+                <tablerow>
+                    <tablecell>
+                        <paragraph id="par_id941693917813686" role="paragraph"><image src="cmd/lc_setoptimalrowheight.svg" id="img_id711693917813686" width="1cm"  height="1cm"><alt id="alt_id181693917813687">Icon Table Size</alt></image></paragraph>
+                    </tablecell>
+                    <tablecell>
+                        <paragraph id="par_id231693917813688" role="paragraph">Table Size</paragraph>
+                    </tablecell>
+                </tablerow>
+            </table>
+    </section>
    </body>
 </helpdocument>
diff --git a/source/text/swriter/01/05110000.xhp b/source/text/swriter/01/05110000.xhp
deleted file mode 100644
index b11dcfa315..0000000000
--- a/source/text/swriter/01/05110000.xhp
+++ /dev/null
@@ -1,46 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<meta>
-<topic id="textswriter0105110000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Row</title>
-<filename>/text/swriter/01/05110000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<h1 id="hd_id3149502" xml-lang="en-US"><link href="text/swriter/01/05110000.xhp">Row</link></h1>
-<paragraph role="paragraph" id="par_id3154652" xml-lang="en-US">Set the height of rows, or select, insert, and delete rows.</paragraph>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#zeile"/>
-</section>
-<h2 id="hd_id3083451" xml-lang="en-US"><link href="text/swriter/01/05110100.xhp">Row Height</link></h2>
-<embed href="text/swriter/01/05110100.xhp#row_height_text"/>
-<h2 id="hd_id3149349" xml-lang="en-US"><link href="text/swriter/01/05110200.xhp">Optimal Row Height</link></h2>
-<embed href="text/swriter/01/05110200.xhp#optimal_row_height_text"/>
-<embed href="text/shared/01/05110600m.xhp#distribute_rows_equally"/>
-<embed href="text/swriter/01/05110300.xhp#select"/>
-<h2 id="hd_id3149883" xml-lang="en-US"><link href="text/swriter/01/05120400.xhp">Insert...</link></h2>
-<embed href="text/swriter/01/05120400.xhp#einfuegentext"/>
-<embed href="text/swriter/01/05110500.xhp#delete"/>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/01/05110100.xhp b/source/text/swriter/01/05110100.xhp
index 3c95afe5ca..ab29a85649 100644
--- a/source/text/swriter/01/05110100.xhp
+++ b/source/text/swriter/01/05110100.xhp
@@ -20,7 +20,7 @@
 
 <meta>
 <topic id="textswriter0105110100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Row Height</title>
+<title id="tit">Row Height</title>
 <filename>/text/swriter/01/05110100.xhp</filename>
 </topic>
 <history>
@@ -28,21 +28,28 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetRowHeight" id="bm_id3310623" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/rowheight/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/rowheight/RowHeightDialog" id="bm_id3154653" localize="false"/>
-<h1 id="hd_id3149871">Row Height</h1>
-<paragraph role="paragraph" id="par_id3149053" xml-lang="en-US"><variable id="row_height_text"><ahelp hid=".uno:SetRowHeight">Changes the height of the selected row(s).</ahelp>
-</variable></paragraph>
+<bookmark branch="hid/.uno:SetRowHeight" id="bm_id3310623" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/rowheight/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/rowheight/RowHeightDialog" id="bm_id3154653" localize="false"/>
+
+<section id="tablerowheight">
+<h1 id="hd_id3149871"><variable id="h1"><link href="text/swriter/01/05110100.xhp">Row Height</link></variable></h1>
+<paragraph role="paragraph" id="par_id3149053"><variable id="row_height_text"><ahelp hid=".uno:SetRowHeight">Changes the height of the selected row(s).</ahelp></variable></paragraph>
+</section>
+
 <section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#hoehez"/>
+  <embed href="text/swriter/00/00000405.xhp#tablerowheight"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/rowheight/heightmf" id="bm_id3145823" localize="false"/>
+
+<bookmark branch="hid/modules/swriter/ui/rowheight/heightmf" id="bm_id3145823" localize="false"/>
 <h2 id="hd_id3155625">Height</h2>
-<paragraph role="paragraph" id="par_id3154554" xml-lang="en-US"><ahelp hid="modules/swriter/ui/rowheight/heightmf">Enter the height that you want for the selected row(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/rowheight/fit" id="bm_id3150019" localize="false"/>
+<paragraph role="paragraph" id="par_id3154554"><ahelp hid="modules/swriter/ui/rowheight/heightmf">Enter the height that you want for the selected row(s).</ahelp></paragraph>
+<bookmark branch="hid/modules/swriter/ui/rowheight/fit" id="bm_id3150019" localize="false"/>
 <h3 id="hd_id3149878">Fit to size</h3>
-<paragraph role="paragraph" id="par_id3145244" xml-lang="en-US"><ahelp hid="modules/swriter/ui/rowheight/fit">Automatically adjusts the row height to match the contents of the cells.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145244"><ahelp hid="modules/swriter/ui/rowheight/fit">Automatically adjusts the row height to match the contents of the cells.</ahelp></paragraph>
 <note id="par_id3154646">You can also right-click in a cell, and then choose <link href="text/shared/01/minimal_row_height.xhp"><menuitem>Size - Minimal Row Height</menuitem></link>.</note>
+<section id="relatedtopics">
+  <paragraph role="paragraph" id="par_id681693927087020" localize="false"><embedvar href="text/swriter/01/TableAutoFitMenu.xhp#h1" markup="ignore"/></paragraph>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/01/05110200.xhp b/source/text/swriter/01/05110200.xhp
deleted file mode 100644
index 626a6fbb11..0000000000
--- a/source/text/swriter/01/05110200.xhp
+++ /dev/null
@@ -1,50 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<meta>
-<topic id="textswriter0105110200xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Optimal Row Height</title>
-<filename>/text/swriter/01/05110200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="optimal_row_height">
-<bookmark branch="hid/.uno:SetOptimalRowHeight" xml-lang="en-US" id="bm_id3153728" localize="false"/>
-<h1 id="hd_id3150010" xml-lang="en-US"><variable id="optimal_row_height_h1"><link href="text/swriter/01/05110200.xhp">Optimal Row Height</link></variable></h1>
-  <paragraph role="paragraph" id="par_id3147436" xml-lang="en-US"><variable id="optimal_row_height_text"><ahelp hid=".uno:SetOptimalRowHeight" visibility="visible">Set row height for selected table rows so that each row has the same height as the row with the tallest content.</ahelp></variable></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#optimal_row_height"/>
-</section>
-<paragraph role="paragraph" id="par_id741656209290506">Row height can increase with this option, with the table always growing downward. The total table height is never reduced by this option.</paragraph>
-<paragraph role="paragraph" id="par_id801656117723975">This option is similar to first minimizing row height for selected rows by using <link href="text/shared/01/minimal_row_height.xhp"><menuitem>Minimal Row Height</menuitem></link> and then distributing those rows by using <link href="text/shared/01/05110600m.xhp"><menuitem>Distribute Rows Evenly</menuitem></link>, except that additional height is added to each row if necessary to prevent the total table height from reducing.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/02/04210000.xhp#optimizeh1"/>
-<switch select="appl">
-<case select="WRITER">
-<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
-</case>
-</switch>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/01/05120000.xhp b/source/text/swriter/01/05120000.xhp
deleted file mode 100644
index bf67e7f7a8..0000000000
--- a/source/text/swriter/01/05120000.xhp
+++ /dev/null
@@ -1,45 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<meta>
-<topic id="textswriter0105120000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Column</title>
-<filename>/text/swriter/01/05120000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<h1 id="hd_id3154762"><link href="text/swriter/01/05120000.xhp">Column</link></h1>
-<paragraph role="paragraph" id="par_id3149052" xml-lang="en-US">Set the width of columns, or select, insert, and delete columns.</paragraph>
-<section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#spalte"/>
-</section>
-<h2 id="hd_id3146322"><link href="text/swriter/01/05120100.xhp">Width...</link></h2>
-<embed href="text/swriter/01/05120100.xhp#breitetext"/>
-<embed href="text/swriter/01/05120200.xhp#optimal_column_width"/>
-<embed href="text/shared/01/05120600.xhp#distribute_columns_equally"/>
-<embed href="text/swriter/01/05120300.xhp#select"/>
-<h2 id="hd_id3150564"><link href="text/swriter/01/05120400.xhp">Insert...</link></h2>
-<embed href="text/swriter/01/05120400.xhp#einfuegentext"/>
-<embed href="text/swriter/01/05120500.xhp#delete"/>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/01/05120100.xhp b/source/text/swriter/01/05120100.xhp
index 0efbaefd62..5826f27eb9 100644
--- a/source/text/swriter/01/05120100.xhp
+++ b/source/text/swriter/01/05120100.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,11 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0105120100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Column Width</title>
+<title id="tit">Column Width</title>
 <filename>/text/swriter/01/05120100.xhp</filename>
 </topic>
 <history>
@@ -30,21 +27,26 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetColumnWidth" id="bm_id7860324" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/columnwidth/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/columnwidth/ColumnWidthDialog" id="bm_id3149875" localize="false"/>
-<h1 id="hd_id3150345">Column Width</h1>
-<paragraph role="paragraph" id="par_id3149503" xml-lang="en-US"><variable id="breitetext"><ahelp hid=".uno:SetColumnWidth">Changes the width of the selected column(s).</ahelp>
-</variable></paragraph>
+<bookmark branch="hid/.uno:SetColumnWidth" id="bm_id7860324" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/columnwidth/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/columnwidth/ColumnWidthDialog" id="bm_id3149875" localize="false"/>
+
+<section id="tablecolumnwidth">
+  <h1 id="hd_id3150345"><variable id="h1"><link href="text/swriter/01/05120100.xhp">Column Width</link></variable></h1>
+<paragraph role="paragraph" id="par_id3149503"><variable id="breitetext"><ahelp hid=".uno:SetColumnWidth">Changes the width of the selected column(s).</ahelp></variable></paragraph>
+</section>
 <section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#breites"/>
+  <embed href="text/swriter/00/00000405.xhp#tablecolumnwidth"/>
 </section>
 <h2 id="hd_id3083452">Width</h2>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/columnwidth/column" id="bm_id3149350" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/columnwidth/column" id="bm_id3149350" localize="false"/>
 <h3 id="hd_id3146323">Columns</h3>
-<paragraph role="paragraph" id="par_id3145822" xml-lang="en-US"><ahelp hid="modules/swriter/ui/columnwidth/column">Enter the column number of the column you want to change the width of.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/columnwidth/width" id="bm_id3150019" localize="false"/>
+<paragraph role="paragraph" id="par_id3145822"><ahelp hid="modules/swriter/ui/columnwidth/column">Enter the column number of the column you want to change the width of.</ahelp></paragraph>
+<bookmark branch="hid/modules/swriter/ui/columnwidth/width" id="bm_id3150019" localize="false"/>
 <h3 id="hd_id3154502">Width</h3>
-<paragraph role="paragraph" id="par_id3149880" xml-lang="en-US"><ahelp hid="modules/swriter/ui/columnwidth/width">Enter the width that you want for the selected column(s).</ahelp><comment>removed 2 sentences, see #i64155</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149880"><ahelp hid="modules/swriter/ui/columnwidth/width">Enter the width that you want for the selected column(s).</ahelp><comment>removed 2 sentences, see #i64155</comment></paragraph>
+<section id="relatedtopics">
+  <paragraph role="paragraph" id="par_id681693927087020" localize="false"><embedvar href="text/swriter/01/TableAutoFitMenu.xhp#h1" markup="ignore"/></paragraph>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/01/05120200.xhp b/source/text/swriter/01/05120200.xhp
deleted file mode 100644
index d5cdad6ca0..0000000000
--- a/source/text/swriter/01/05120200.xhp
+++ /dev/null
@@ -1,81 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<meta>
-<topic id="textswriter0105120200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Optimal Column Width</title>
-<filename>/text/swriter/01/05120200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="optimal_column_width">
-<bookmark xml-lang="en-US" branch="hid/.uno:SetOptimalColumnWidth" id="bm_id8687648" localize="false"/>
-  <h1 id="hd_id3149500" xml-lang="en-US"><variable id="optimal_column_width_h1"><link href="text/swriter/01/05120200.xhp">Optimal Column Width</link></variable></h1>
-<switch select="appl">
-  <case select="WRITER">
-    <paragraph role="paragraph" id="par_id3149050" xml-lang="en-US"><variable id="column_width_text"><ahelp hid=".uno:SetOptimalColumnWidth">Adjust column widths among columns with selected cells, according to the paragraph length in each selected cell. Widen the table, up to page width, if necessary.</ahelp></variable></paragraph>
-  </case>
-  <case select="CALC"></case>
-  <default>
-    <paragraph role="paragraph" id="par_id811655764710135"><ahelp hid=".uno:SetOptimalColumnWidth">Adjust column width for selected columns to fit the column’s content, without changing the width of the table or the unselected columns.</ahelp>
-    </paragraph>
-  </default>
-</switch>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040500.xhp#optimal_column_width"/>
-</section>
-<switch select="appl">
-  <case select="WRITER">
-    <paragraph role="paragraph" id="par_id611656069528584"><menuitem>Optimal Column Width</menuitem> attempts to give a column width for the selected cells so that the longest paragraph in each cell can, as a minimum, <emph>fit</emph> exactly on a single line, though it is possible and common for columns to be wider than an exact fit.</paragraph>
-    <paragraph role="paragraph" id="par_id601656102623025">The final distribution of column widths depends on several factors, such as the paragraph length of selected cells, the initial width of the columns with selected cells, and whether the table can be widened. Space is also included for any horizontal cell padding, paragraph padding, and paragraph indents. The width of the table is never reduced, and unselected columns are not changed.</paragraph>
-    <paragraph role="paragraph" id="par_id651656105163827">The following list indicates how column widths are distributed for the selected cells. If the first step succeeds in distributing column widths for the selected cells so that all paragraphs in the cell are on a single line, then the process stops, otherwise the second step is attempted, if possible. The third step describes how column widths are distributed when it is not possible to fit all the selected cells after the second step.</paragraph>
-    <list type="ordered">
-      <listitem>
-        <paragraph id="par_id221656101892491" role="listitem">Distribute column widths proportionally according to the longest paragraph in each cell, but remaining within the total column width for cell selection.</paragraph>
-      </listitem>
-      <listitem>
-        <paragraph id="par_id641656101994507" role="listitem">If some cells cannot fit exactly in the total width of the selection, and the table can be expanded (up to the page width), then expand the table width until all cells are fit exactly.</paragraph>
-      </listitem>
-      <listitem>
-        <paragraph id="par_id511656102101362" role="listitem">If the table width is at the page margin, and more than one selected cell does not fit exactly, then give as much width as possible to the first cell that cannot be fit exactly, and an equal (smaller) column width to the other cells that cannot be fit.</paragraph>
-      </listitem>
-    </list>
-    <paragraph role="paragraph" id="par_id471656104869532">Step 1 is often sufficient for tables whose cells are primarily short paragraphs, while Step 3 is usually needed if many columns or rows are selected and/or selected cells have longer paragraphs.</paragraph>
-  </case>
-  <case select="CALC"><comment>Not in CALC</comment></case>
-  <default>
-    <paragraph role="paragraph" id="par_id601656069480524"><menuitem>Optimal Column Width</menuitem> attempts to give a column width for the selected columns so that the longest paragraph in each column can, as a minimum, <emph>fit</emph> exactly on a single line, though it is possible and common for columns to be wider than an exact fit.</paragraph>
-    <paragraph role="paragraph" id="par_id721655819449619">The final distribution of column widths depends on several factors, such as the paragraph length and initial width of the selected columns. Space is also included for any horizontal cell padding, paragraph padding, and paragraph indents. The width of the table is never reduced, and unselected columns are not changed.</paragraph>
-    <paragraph role="paragraph" id="par_id581656107648277">The option distributes column widths proportionally according to the longest paragraph in each column, but remaining within the total column width for the selected columns. When selected columns cannot be fit exactly,  then the first column that cannot be fit exactly gets as much width as possible, while any additional columns that cannot be fit exactly get a smaller column width, which is equal for each of these additional columns.</paragraph>
-  </default>
-</switch>
-<section id="relatedtopics">
-<embed href="text/shared/02/04210000.xhp#optimizeh1"/>
-<switch select="appl">
-<case select="WRITER">
-<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
-</case>
-</switch>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/swriter/01/05120500.xhp b/source/text/swriter/01/05120500.xhp
index 77d99f9744..52128eb499 100644
--- a/source/text/swriter/01/05120500.xhp
+++ b/source/text/swriter/01/05120500.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0105120500xml" indexer="include" status="PUBLISH">
@@ -38,7 +38,7 @@
 </section>
 <paragraph role="paragraph" id="par_id3156385" xml-lang="en-US">This command is only available if the cursor is in a table.</paragraph>
 <section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#delete_columns"/>
+  <embed href="text/swriter/00/00000405.xhp#delete_column"/>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/01/TableAutoFitMenu.xhp b/source/text/swriter/01/TableAutoFitMenu.xhp
new file mode 100644
index 0000000000..3f03777207
--- /dev/null
+++ b/source/text/swriter/01/TableAutoFitMenu.xhp
@@ -0,0 +1,41 @@
+<?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="textswriter01TableAutoFitMenuxhp" indexer="include" status="PUBLISH">
+            <title id="tit">Table Size Menu</title>
+            <filename>/text/swriter/01/TableAutoFitMenu.xhp</filename>
+        </topic>
+    </meta>
+<body>
+<bookmark id="bm_id481693917285073" branch="hid/.uno:TableAutoFitMenu" localize="false"/>
+    <section id="table_size_menu">
+        <h1 id="hd_id591693917285075"><variable id="h1"><link href="text/swriter/01/TableAutoFitMenu.xhp">Size</link></variable></h1>
+        <paragraph id="par_id291693917285077" role="paragraph">Opens a submenu to resize columns and rows.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/swriter/00/00000405.xhp#table_size_menu"/>
+    </section>
+    <embed href="text/swriter/01/05110100.xhp#tablerowheight"/>
+    <embed href="text/shared/01/minimal_row_height.xhp#minimal_row_height"/>
+    <embed href="text/shared/01/SetOptimalRowHeight.xhp#optimal_row_height"/>
+    <embed href="text/shared/01/05110600m.xhp#distribute_rows_equally"/>
+
+    <embed href="text/swriter/01/05120100.xhp#tablecolumnwidth"/>
+    <embed href="text/shared/01/minimal_column_width.xhp#minimal_column_width"/>
+    <embed href="text/shared/01/SetOptimalColumnWidth.xhp#optimal_column_width"/>
+    <embed href="text/shared/01/05120600.xhp#distribute_columns_equally"/>
+
+    <section id="relatedtopics">
+        <embed href="text/swriter/main0110.xhp#h1"/>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/main0110.xhp b/source/text/swriter/main0110.xhp
index 6fcf4ae354..5fcf403f8b 100644
--- a/source/text/swriter/main0110.xhp
+++ b/source/text/swriter/main0110.xhp
@@ -43,35 +43,7 @@
 <embed href="text/swriter/01/TableInsertMenu.xhp#insertmenu"/>
 <embed href="text/swriter/01/TableDeleteMenu.xhp#deletemenu"/>
 <embed href="text/swriter/01/TableSelectMenu.xhp#selectmenu"/>
-
-
-<bookmark branch="hid/.uno:TableAutoFitMenu" id="bm_id481690375592477" localize="false"/>
-<h2 id="par_idN105FB">Size</h2>
-<paragraph role="paragraph" id="par_id41605977320372" localize="false"><embedvar href="text/swriter/main0110.xhp#submenu"/></paragraph>
-
-<h3 id="par_idN106E9">Row Height</h3>
-<paragraph id="par_idN106EC" role="paragraph">Opens the Row Height dialog where you can change the height of a row.</paragraph>
-
-<h3 id="hd_id451605990864684"><link href="text/shared/01/minimal_row_height.xhp">Minimal Row Height</link></h3>
-<embed href="text/shared/01/minimal_row_height.xhp#minimal_row_height_text"/>
-
-<h3 id="par_idN106EF"><link href="text/swriter/01/05110200.xhp">Optimal Row Height</link></h3>
-<embed href="text/swriter/01/05110200.xhp#optimal_row_height_text"/>
-
-<h3 id="par_idN10706"><link href="text/shared/01/05110600m.xhp">Distribute Rows Evenly</link></h3>
-<embed href="text/shared/01/05110600m.xhp#distribute_rows_text"/>
-
-<h3 id="par_idN106B5">Column Width</h3>
-<paragraph id="par_idN106B8" role="paragraph">Opens the Column Width dialog where you can change the width of a column.</paragraph>
-
-<h3 id="hd_id671605991381461"><link href="text/shared/01/minimal_column_width.xhp">Minimal Column Width</link></h3>
-<embed href="text/shared/01/minimal_column_width.xhp#minimal_column_width_text"/>
-
-<h3 id="par_idN106BB"><link href="text/swriter/01/05120200.xhp">Optimal Column Width</link></h3>
-<embed href="text/swriter/01/05120200.xhp#column_width_text"/>
-
-<h3 id="par_idN106D2"><link href="text/shared/01/05120600.xhp">Distribute Columns Evenly</link></h3>
-<embed href="text/shared/01/05120600.xhp#distribute_columns_text"/>
+<embed href="text/swriter/01/TableAutoFitMenu.xhp#table_size_menu"/>
 
 <h2 id="par_idN105B7"><link href="text/shared/01/05100100.xhp">Merge Cells</link></h2>
 <embed href="text/shared/01/05100100.xhp#verbindentext"/>
diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp
index 545e0ec98d..9819cdf9d6 100644
--- a/source/text/swriter/main0204.xhp
+++ b/source/text/swriter/main0204.xhp
@@ -41,7 +41,7 @@
 <embed href="text/swriter/00/00000405.xhp#sydelete_row"/>
 <h2 id="hd_id3147231"><link href="text/swriter/01/05120500.xhp">Delete Column</link></h2>
 <embed href="text/swriter/01/05120500.xhp#loeschentext"/>
-<embed href="text/swriter/00/00000405.xhp#sydelete_columns"/>
+<embed href="text/swriter/00/00000405.xhp#sydelete_column"/>
 <comment>following only optional, ext.help is available: Select Table Select Column Select Row</comment>
 <h2 id="hd_id3147592"><link href="text/shared/01/05100100.xhp">Merge Cells</link></h2>
 <embed href="text/shared/01/05100100.xhp#verbindentext"/>