AllLangHelp_scalc.mk                            |    2 
 AllLangHelp_shared.mk                           |    2 
 AllLangHelp_swriter.mk                          |    5 
 source/text/scalc/01/05030000.xhp               |    7 
 source/text/scalc/01/05030200.xhp               |   53 ----
 source/text/scalc/01/05040000.xhp               |    7 
 source/text/scalc/01/05040200.xhp               |   54 ----
 source/text/scalc/guide/row_height.xhp          |    6 
 source/text/shared/00/00040500.xhp              |  296 +++++++++++++++---------
 source/text/shared/01/05110600m.xhp             |   11 
 source/text/shared/01/05120600.xhp              |    3 
 source/text/shared/01/SetOptimalColumnWidth.xhp |   88 +++++++
 source/text/shared/01/SetOptimalRowHeight.xhp   |   85 ++++++
 source/text/shared/01/minimal_column_width.xhp  |   41 +--
 source/text/shared/01/minimal_row_height.xhp    |   17 -
 source/text/shared/02/04210000.xhp              |    8 
 source/text/swriter/00/00000405.xhp             |   36 ++
 source/text/swriter/01/05110000.xhp             |   46 ---
 source/text/swriter/01/05110100.xhp             |   31 +-
 source/text/swriter/01/05110200.xhp             |   50 ----
 source/text/swriter/01/05120000.xhp             |   45 ---
 source/text/swriter/01/05120100.xhp             |   32 +-
 source/text/swriter/01/05120200.xhp             |   81 ------
 source/text/swriter/01/05120500.xhp             |    4 
 source/text/swriter/01/TableAutoFitMenu.xhp     |   41 +++
 source/text/swriter/main0110.xhp                |   30 --
 source/text/swriter/main0204.xhp                |    2 
 27 files changed, 539 insertions(+), 544 deletions(-)

New commits:
commit cd6faa2767ad72d56c94259cf100cab49591b209
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue Sep 5 20:37:35 2023 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Wed Sep 6 01:39:14 2023 +0200

    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.hal...@libreoffice.org>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 9165ee3fbb..9557466f22 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -96,11 +96,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/05020000 \
     helpcontent2/source/text/scalc/01/05020600 \
     helpcontent2/source/text/scalc/01/05030000 \
-    helpcontent2/source/text/scalc/01/05030200 \
     helpcontent2/source/text/scalc/01/05030300 \
     helpcontent2/source/text/scalc/01/05030400 \
     helpcontent2/source/text/scalc/01/05040000 \
-    helpcontent2/source/text/scalc/01/05040200 \
     helpcontent2/source/text/scalc/01/05050000 \
     helpcontent2/source/text/scalc/01/05050100 \
     helpcontent2/source/text/scalc/01/05050300 \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index e77a7c92cf..c40c7c4209 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -401,6 +401,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/securitywarning \
     helpcontent2/source/text/shared/01/selectcertificate \
     helpcontent2/source/text/shared/01/SelectTable \
+    helpcontent2/source/text/shared/01/SetOptimalColumnWidth \
+    helpcontent2/source/text/shared/01/SetOptimalRowHeight \
     helpcontent2/source/text/shared/01/select_template_category \
     helpcontent2/source/text/shared/01/signexistingpdf \
     helpcontent2/source/text/shared/01/signsignatureline \
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index f39c1ca243..26ffea7b41 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -131,14 +131,10 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/01/05100000 \
     helpcontent2/source/text/swriter/01/05100300 \
     helpcontent2/source/text/swriter/01/05100400 \
-    helpcontent2/source/text/swriter/01/05110000 \
     helpcontent2/source/text/swriter/01/05110100 \
-    helpcontent2/source/text/swriter/01/05110200 \
     helpcontent2/source/text/swriter/01/05110300 \
     helpcontent2/source/text/swriter/01/05110500 \
-    helpcontent2/source/text/swriter/01/05120000 \
     helpcontent2/source/text/swriter/01/05120100 \
-    helpcontent2/source/text/swriter/01/05120200 \
     helpcontent2/source/text/swriter/01/05120300 \
     helpcontent2/source/text/swriter/01/05120400 \
     helpcontent2/source/text/swriter/01/05120500 \
@@ -211,6 +207,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/01/spotlight_styles \
     helpcontent2/source/text/swriter/01/spotlight_chars_df \
     helpcontent2/source/text/swriter/01/style_inspector \
+    helpcontent2/source/text/swriter/01/TableAutoFitMenu \
     helpcontent2/source/text/swriter/01/TableDeleteMenu \
     helpcontent2/source/text/swriter/01/TableInsertMenu \
     helpcontent2/source/text/swriter/01/TableSelectMenu \
diff --git a/source/text/scalc/01/05030000.xhp 
b/source/text/scalc/01/05030000.xhp
index 29e503b8b0..ca7efd70e3 100644
--- a/source/text/scalc/01/05030000.xhp
+++ b/source/text/scalc/01/05030000.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="textscalc0105030000xml" indexer="include" status="PUBLISH">
@@ -40,8 +40,9 @@
 </section>
 <h2 id="hd_id3155132"><link 
href="text/shared/01/05340100.xhp">Height</link></h2>
 <embed href="text/shared/01/05340100.xhp#zeilenhoehetext"/>
-<h2 id="hd_id3155854"><link href="text/scalc/01/05030200.xhp">Optimal 
Height</link></h2>
-<embed href="text/scalc/01/05030200.xhp#optitext"/>
+
+<embed href="text/shared/01/SetOptimalRowHeight.xhp#optimal_row_height"/>
+
 <embed href="text/scalc/01/05030300.xhp#hide"/>
 <embed href="text/scalc/01/05030400.xhp#show"/>
 </body>
diff --git a/source/text/scalc/01/05030200.xhp 
b/source/text/scalc/01/05030200.xhp
deleted file mode 100644
index 38875c41b9..0000000000
--- a/source/text/scalc/01/05030200.xhp
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * 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 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textscalc0105030200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Optimal Row Heights</title>
-<filename>/text/scalc/01/05030200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" 
id="bm_id3148491"><bookmark_value>sheets; optimal row heights</bookmark_value>
-<bookmark_value>rows; optimal heights</bookmark_value>
-<bookmark_value>optimal row heights</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalrowheightdialog/OptimalRowHeightDialog" 
id="bm_id1299843" localize="false"/>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalrowheightdialog/@@nowidget@@" 
id="bm_id1299843" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetOptimalRowHeight" 
id="bm_id3145673" localize="false"/>
-<h1 id="hd_id3148491">Optimal Row Heights</h1>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US"><variable 
id="optitext"><ahelp hid=".uno:SetOptimalRowHeight">Determines the optimal row 
height for the selected rows.</ahelp>
-</variable> The optimal row height depends on the font size of the largest 
character in the row. You can use various <link 
href="text/shared/00/00000003.xhp#measurement_units">units of 
measure</link>.</paragraph>
-<section id="howtoget">
-  <embed href="text/scalc/00/00000405.xhp#fozeiophoe"/>
-</section>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalrowheightdialog/value" id="bm_id3156280" 
localize="false"/>
-<h2 id="hd_id3154908">Add</h2>
-<paragraph role="paragraph" id="par_id3151044" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/optimalrowheightdialog/value">Sets additional spacing 
between the largest character in a row and the cell 
boundaries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalrowheightdialog/default" id="bm_id3145271" 
localize="false"/>
-<h2 id="hd_id3150439">Default value</h2>
-<paragraph role="paragraph" id="par_id3146984" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/optimalrowheightdialog/default">Restores the default 
value for the optimal row height.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/scalc/01/05040000.xhp 
b/source/text/scalc/01/05040000.xhp
index ffb9a63786..505e9ffa93 100644
--- a/source/text/scalc/01/05040000.xhp
+++ b/source/text/scalc/01/05040000.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="textscalc0105040000xml" indexer="include" status="PUBLISH">
@@ -40,8 +40,9 @@
 </section>
 <h2 id="hd_id3150398"><link 
href="text/shared/01/05340200.xhp">Width</link></h2>
 <embed href="text/shared/01/05340200.xhp#spaltetext"/>
-<h2 id="hd_id3145171"><link href="text/scalc/01/05040200.xhp">Optimal 
Width</link></h2>
-<embed href="text/scalc/01/05040200.xhp#optitext"/>
+
+<embed href="text/shared/01/SetOptimalColumnWidth.xhp#optimal_column_width"/>
+
 <embed href="text/scalc/01/05030300.xhp#hide"/>
 <embed href="text/scalc/01/05030400.xhp#show"/>
 </body>
diff --git a/source/text/scalc/01/05040200.xhp 
b/source/text/scalc/01/05040200.xhp
deleted file mode 100644
index d77f94cb8e..0000000000
--- a/source/text/scalc/01/05040200.xhp
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * 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 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textscalc0105040200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Optimal Column Width</title>
-<filename>/text/scalc/01/05040200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" 
id="bm_id3155628"><bookmark_value>spreadsheets; optimal column 
widths</bookmark_value>
-<bookmark_value>columns; optimal widths</bookmark_value>
-<bookmark_value>optimal column widths</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalcolwidthdialog/OptimalColWidthDialog" 
id="bm_id2742569" localize="false"/>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalcolwidthdialog/@@nowidget@@" 
id="bm_id2742569" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetOptimalColumnWidth" 
id="bm_id3156326" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetOptimalColumnWidthDirect" 
id="bm_id3153254" localize="false"/>
-<h1 id="hd_id3155628">Optimal Column Width</h1>
-<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US"><variable 
id="optitext"><ahelp hid=".uno:SetOptimalColumnWidthDi">Defines the optimal 
column width for selected columns.</ahelp>
-</variable> The optimal column width depends on the longest entry within a 
column. You can choose from the available <link 
href="text/shared/00/00000003.xhp#metrik">measurement units</link>.</paragraph>
-<section id="howtoget">
-  <embed href="text/scalc/00/00000405.xhp#optimal_column_width"/>
-</section>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalcolwidthdialog/value" id="bm_id3153192" 
localize="false"/>
-<h2 id="hd_id3150767">Add</h2>
-<paragraph role="paragraph" id="par_id3150449" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/optimalcolwidthdialog/value">Defines additional spacing 
between the longest entry in a column and the vertical column 
borders.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optimalcolwidthdialog/default" id="bm_id3155855" 
localize="false"/>
-<h2 id="hd_id3145785">Default value</h2>
-<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/optimalcolwidthdialog/default">Defines the optimal column 
width in order to display the entire contents of the column.</ahelp> The 
additional spacing for the optimal column width is preset to 2 mm.</paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/scalc/guide/row_height.xhp 
b/source/text/scalc/guide/row_height.xhp
index de38f9d38e..bea7902e47 100644
--- a/source/text/scalc/guide/row_height.xhp
+++ b/source/text/scalc/guide/row_height.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="textscalcguiderow_heightxml" indexer="include" status="PUBLISH">
@@ -65,9 +65,9 @@
 </list>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3154487" xml-lang="en-US"><link 
href="text/shared/01/05340100.xhp">Row height</link></paragraph>
-<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US"><link 
href="text/scalc/01/05030200.xhp">Optimal row height</link></paragraph>
+<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US"><link 
href="text/shared/01/SetOptimalRowHeight.xhp">Optimal row 
height</link></paragraph>
 <paragraph role="paragraph" id="par_id3153305" xml-lang="en-US"><link 
href="text/shared/01/05340200.xhp">Column width</link></paragraph>
-<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US"><link 
href="text/scalc/01/05040200.xhp">Optimal column width</link></paragraph>
+<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US"><link 
href="text/shared/01/SetOptimalColumnWidth.xhp">Optimal column 
width</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/00/00040500.xhp 
b/source/text/shared/00/00040500.xhp
index 668a340c13..d01b10edd9 100644
--- a/source/text/shared/00/00040500.xhp
+++ b/source/text/shared/00/00040500.xhp
@@ -47,157 +47,247 @@
 <section id="minimal_row_height">
   <switch select="appl">
     <case select="WRITER">
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
       <paragraph role="paragraph" id="par_id271654223353638">Choose 
<menuitem>Table - Size - Minimal Row Height</menuitem>.</paragraph>
     </case>
     <case select="CALC"/>
     <default>
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
       <paragraph role="paragraph" id="par_id151655731003155">Choose 
<menuitem>Format - Table - Minimal Row Height</menuitem>.</paragraph>
     </default>
   </switch>
-  <paragraph role="paragraph" id="par_id451655738489793">Select rows in table, 
right-click, choose <menuitem>Size - Minimal Row Height</menuitem>.</paragraph>
-  <embed href="text/shared/00/00040500.xhp#OpenOptimizeSize"/>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id451655738489793">Choose <menuitem>Size 
- Minimal Row Height</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id11693929230193">Choose <menuitem>Table 
- Optimize Size - Minimal Row Height</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id51693929384475">On the 
<menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose 
<menuitem>Minimal Row Height</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
   <section id="syminimal_row_height">
-      <table id="tab_id791654222949632">
-        <tablerow>
-          <tablecell>
-            <paragraph role="paragraph" id="par_id751654222949632"><image 
src="cmd/lc_setminimalrowheight.svg" id="img_id731654222949632" width="1cm" 
height="1cm"><alt id="alt_id541654222949632">Minimal Row Height 
Icon</alt></image></paragraph>
-          </tablecell>
-          <tablecell>
-            <paragraph id="par_id961654222949632" role="paragraph">Minimal Row 
Height</paragraph>
-          </tablecell>
-        </tablerow>
-      </table>
+    <table id="tab_id791654222949632">
+      <tablerow>
+        <tablecell>
+          <paragraph role="paragraph" id="par_id751654222949632"><image 
src="cmd/lc_setminimalrowheight.svg" id="img_id731654222949632" width="1cm" 
height="1cm"><alt id="alt_id541654222949632">Icon Minimal Row 
Height</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id961654222949632" role="paragraph">Minimal Row 
Height</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
   </section>
+  <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+  <paragraph role="paragraph" id="par_id611693929325585">Choose 
<menuitem>Properties - Table - Minimal Row Height</menuitem>.</paragraph>
 </section>
 
 <section id="optimal_row_height">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
   <switch select="appl">
     <case select="WRITER">
       <paragraph id="par_id3155536" role="paragraph">Choose <menuitem>Table - 
Size - Optimal Row Height</menuitem>.</paragraph>
-      </case>
-    <case select="CALC"/>
+    </case>
+    <case select="CALC">
+      <paragraph role="paragraph" id="par_id591693950959018">Choose 
<menuitem>Format - Rows - Optimal Height</menuitem>.</paragraph>
+    </case>
     <default>
       <paragraph role="paragraph" id="par_id621655731074115">Choose 
<menuitem>Format - Table - Optimal Row Height</menuitem>.</paragraph>
     </default>
   </switch>
-  <paragraph role="paragraph" id="par_id741655738425233">Select rows in table, 
right-click, choose <menuitem>Size - Optimal Row Height</menuitem>.</paragraph>
-  <embed href="text/shared/00/00040500.xhp#OpenOptimizeSize"/>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <switch select="appl">
+    <case select="WRITER">
+      <paragraph role="paragraph" id="par_id381693934159575">Choose 
<menuitem>Size - Optimal Row Height</menuitem>.</paragraph>
+    </case>
+    <case select="CALC">
+      <paragraph role="paragraph" id="par_id91693951086194">Select row, choose 
<menuitem>Optimal Height</menuitem>.</paragraph>
+    </case>
+  </switch>
+
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <switch select="appl">
+    <case select="WRITER">
+      <paragraph role="paragraph" id="par_id331693934199624">Choose 
<menuitem>Table - Optimize Size - Optimal Row Height</menuitem>.</paragraph>
+      <paragraph role="paragraph" id="par_id631693934202201">On the 
<menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose 
<menuitem>Optimal Row Height</menuitem>.</paragraph>
+    </case>
+    <case select="CALC">
+      <paragraph role="paragraph" id="par_id681693951206742">Choose 
<menuitem>Layout - Row - Optimal Height</menuitem>.</paragraph>
+      <paragraph role="paragraph" id="par_id781693951209917">Choose 
<menuitem>Home - Row - Optimal Height</menuitem>.</paragraph>
+    </case>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
   <section id="syoptimal_row_height">
-            <table id="tbl_id3150845">
-               <tablerow>
-                  <tablecell>
-                     <paragraph id="par_id3145222" role="paragraph"><image 
id="img_id3145228" src="cmd/lc_setoptimalrowheight.svg" width="1cm" 
height="1cm"><alt id="alt_id3145228">Icon Optimal Row 
Height</alt></image></paragraph>
-                  </tablecell>
-                  <tablecell>
-                     <paragraph id="par_id3153545" role="paragraph">Optimal 
Row Height</paragraph>
-                  </tablecell>
-               </tablerow>
-            </table>
+    <table id="tbl_id3150845">
+      <tablerow>
+        <tablecell>
+          <paragraph id="par_id3145222" role="paragraph"><image 
id="img_id3145228" src="cmd/lc_setoptimalrowheight.svg" width="1cm" 
height="1cm"><alt id="alt_id3145228">Icon Optimal Row 
Height</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id3153545" role="paragraph">Optimal Row 
Height</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
   </section>
+  <switch select="appl">
+    <case select="WRITER">
+      <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+      <paragraph role="paragraph" id="par_id231693934077822">Choose 
<menuitem>Properties - Table - Optimal Row Height</menuitem>.</paragraph>
+    </case>
+  </switch>
 </section>
 
 <section id="distribute_rows_evenly">
-   <switch select="appl">
-     <case select="WRITER">
-       <paragraph id="par_id3153569" role="paragraph">Choose <menuitem>Table - 
Size - Distribute Rows Evenly</menuitem>.</paragraph>
-     </case>
-     <case select="CALC"/>
-     <default>
+  <switch select="appl">
+    <case select="WRITER">
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+      <paragraph id="par_id3153569" role="paragraph">Choose <menuitem>Table - 
Size - Distribute Rows Evenly</menuitem>.</paragraph>
+    </case>
+    <case select="CALC"/>
+    <default>
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
       <paragraph role="paragraph" id="par_id701655731168178">Choose 
<menuitem>Format - Table - Distribute Rows Evenly</menuitem>.</paragraph>
-     </default>
-   </switch>
-   <paragraph role="paragraph" id="par_id801655738379330">Select rows in 
table, right-click, choose <menuitem>Size - Distribute Rows 
Evenly</menuitem>.</paragraph>
-   <embed href="text/shared/00/00040500.xhp#OpenOptimizeSize"/>
-   <section id="sydistribute_rows_evenly">
-            <table id="tbl_id3154064">
-               <tablerow>
-                  <tablecell>
-                     <paragraph id="par_id3145297" role="paragraph"><image 
id="img_id3155994" src="cmd/lc_distributerows.svg" width="1cm" 
height="1cm"><alt id="alt_id3155994">Icon Distribute Rows 
Evenly</alt></image></paragraph>
-                  </tablecell>
-                  <tablecell>
-                     <paragraph id="par_id3153206" role="paragraph">Distribute 
Rows Evenly</paragraph>
-                  </tablecell>
-               </tablerow>
-            </table>
-   </section>
+    </default>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id801655738379330">Select rows in table, 
right-click, choose <menuitem>Size - Distribute Rows 
Evenly</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id871693934883186">Choose 
<menuitem>Table - Optimize Size - Distribute Rows Evenly</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id71693934886355">On the 
<menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose 
<menuitem>Distribute Rows Evenly</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <section id="sydistribute_rows_evenly">
+    <table id="tbl_id3154064">
+      <tablerow>
+        <tablecell>
+          <paragraph id="par_id3145297" role="paragraph"><image 
id="img_id3155994" src="cmd/lc_distributerows.svg" width="1cm" 
height="1cm"><alt id="alt_id3155994">Icon Distribute Rows 
Evenly</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id3153206" role="paragraph">Distribute Rows 
Evenly</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
+  </section>
+  <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+  <paragraph role="paragraph" id="par_id601693934906521">Choose 
<menuitem>Properties - Table - Distribute Rows Evenly</menuitem>.</paragraph>
 </section>
 
- <section id="minimal_column_width">
-   <switch select="appl">
-     <case select="WRITER">
-        <paragraph role="paragraph" id="par_id51654220677297">Choose 
<menuitem>Table - Size - Minimal Column Width</menuitem>.</paragraph>
-       </case>
-     <case select="CALC"/>
-     <default>
-     <paragraph role="paragraph" id="par_id691655731247050">Choose 
<menuitem>Format - Table - Minimal Column Width</menuitem>.</paragraph>
-     </default>
-   </switch>
-   <paragraph role="paragraph" id="par_id941655738180090">Select columns in 
table, right-click, choose <menuitem>Size - Minimal Column 
Width</menuitem>.</paragraph>
-   <embed href="text/shared/00/00040500.xhp#OpenOptimizeSize"/>
-   <section id="syminimal_column_width">
-        <table id="tab_id711654222599271">
-          <tablerow>
-            <tablecell>
-              <paragraph role="paragraph" id="par_id11654222599271"><image 
src="cmd/lc_setminimalcolumnwidth.svg" id="img_id541654222599271" width="1cm" 
height="1cm"><alt id="alt_id451654222599271">Minimal Column Width 
Icon</alt></image></paragraph>
-            </tablecell>
-            <tablecell>
-              <paragraph id="par_id161654222599272" role="paragraph">Minimal 
Column Width</paragraph>
-            </tablecell>
-          </tablerow>
-        </table>
-   </section>
+<section id="minimal_column_width">
+  <switch select="appl">
+    <case select="WRITER">
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+      <paragraph role="paragraph" id="par_id51654220677297">Choose 
<menuitem>Table - Size - Minimal Column Width</menuitem>.</paragraph>
+    </case>
+    <case select="CALC"/>
+    <default>
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+      <paragraph role="paragraph" id="par_id691655731247050">Choose 
<menuitem>Format - Table - Minimal Column Width</menuitem>.</paragraph>
+    </default>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id941655738180090">Choose <menuitem>Size 
- Minimal Column Width</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id951693929823714">Choose 
<menuitem>Table - Optimize Size - Minimal Column Width</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id401693929850221">On the 
<menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose 
<menuitem>Minimal Column Width</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <section id="syminimal_column_width">
+    <table id="tab_id711654222599271">
+      <tablerow>
+        <tablecell>
+          <paragraph role="paragraph" id="par_id11654222599271"><image 
src="cmd/lc_setminimalcolumnwidth.svg" id="img_id541654222599271" width="1cm" 
height="1cm"><alt id="alt_id451654222599271">Icon Minimal Column 
Width</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id161654222599272" role="paragraph">Minimal 
Column Width</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
+  </section>
+  <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+  <paragraph role="paragraph" id="par_id621693929897206">Choose 
<menuitem>Properties - Table - Minimal Column Width</menuitem>.</paragraph>
 </section>
 
 <section id="optimal_column_width">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
   <switch select="appl">
     <case select="WRITER">
       <paragraph id="par_id3154752" role="paragraph">Choose <menuitem>Table - 
Size - Optimal Column Width</menuitem>.</paragraph>
     </case>
-    <case select="CALC"/>
+    <case select="CALC">
+      <paragraph role="paragraph" id="par_id3145252" xml-lang="en-US">Choose 
<emph>Format - Columns - Optimal Width</emph>.</paragraph>
+    </case>
     <default>
       <paragraph role="paragraph" id="par_id471655731343905">Choose 
<menuitem>Format - Table - Optimal Column Width</menuitem>.</paragraph>
     </default>
-    </switch>
-    <paragraph role="paragraph" id="par_id701655738103242">Select columns in 
table, right-click, choose <menuitem>Size - Optimal Column 
Width</menuitem>.</paragraph>
-    <embed href="text/shared/00/00040500.xhp#OpenOptimizeSize"/>
-    <section id="syoptimal_column_width">
-            <table id="tbl_id3156030">
-               <tablerow>
-                  <tablecell>
-                     <paragraph id="par_id3157881" role="paragraph"><image 
id="img_id3157888" src="cmd/lc_setoptimalcolumnwidth.svg" width="1cm" 
height="1cm"><alt id="alt_id3157888">Icon Optimal Column 
Width</alt></image></paragraph>
-                  </tablecell>
-                  <tablecell>
-                     <paragraph id="par_id3150524" role="paragraph">Optimal 
Column Width</paragraph>
-                  </tablecell>
-               </tablerow>
-            </table>
-    </section>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <switch select="appl">
+    <case select="WRITER">
+      <paragraph role="paragraph" id="par_id701655738103242">Choose 
<menuitem>Size - Optimal Column Width</menuitem>.</paragraph>
+    </case>
+    <case select="CALC">
+      <paragraph role="paragraph" id="par_id701693944048858">Select column, 
choose <menuitem>Optimal Width</menuitem>.</paragraph>
+      <paragraph role="paragraph" id="par_id3146971" 
xml-lang="en-US">Double-click right column separator in column 
headers.</paragraph>
+    </case>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <switch select="appl">
+    <case select="WRITER">
+      <paragraph role="paragraph" id="par_id811693933748238">Choose 
<menuitem>Table - Optimize Size - Optimal Column Width</menuitem>.</paragraph>
+      <paragraph role="paragraph" id="par_id21693933751244">On the 
<menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose 
<menuitem>Optimal Column Width</menuitem>.</paragraph>
+    </case>
+    <case select="CALC">
+      <paragraph role="paragraph" id="par_id181693944353293">Choose 
<menuitem>Layout - Column - Optimal Width</menuitem>.</paragraph>
+      <paragraph role="paragraph" id="par_id161693944357133">Choose 
<menuitem>Home - Column - Optimal Width</menuitem>.</paragraph>
+    </case>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <section id="syoptimal_column_width">
+    <table id="tbl_id3156030">
+      <tablerow>
+        <tablecell>
+          <paragraph id="par_id3157881" role="paragraph"><image 
id="img_id3157888" src="cmd/lc_setoptimalcolumnwidth.svg" width="1cm" 
height="1cm"><alt id="alt_id3157888">Icon Optimal Column 
Width</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id3150524" role="paragraph">Optimal Column 
Width</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
+  </section>
+  <switch select="appl">
+    <case select="WRITER">
+      <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+      <paragraph role="paragraph" id="par_id191693933756189">Choose 
<menuitem>Properties - Table - Optimal Column Width</menuitem>.</paragraph>
+    </case>
+  </switch>
 </section>
 
 <section id="distribute_columns_evenly">
   <switch select="appl">
     <case select="WRITER">
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
       <paragraph id="par_id3159219" role="paragraph">Choose <menuitem>Table - 
Size - Distribute Columns Evenly</menuitem>.</paragraph>
     </case>
     <case select="CALC"/>
     <default>
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
       <paragraph role="paragraph" id="par_id991655731434331">Choose 
<menuitem>Format - Table - Distribute Columns Evenly</menuitem>.</paragraph>
     </default>
-    </switch>
-    <paragraph role="paragraph" id="par_id151654212978990"><variable 
id="RightClickSize">Select columns in table, right-click, choose <menuitem>Size 
- Distribute Columns Evenly</menuitem>.</variable></paragraph>
-    <embed href="text/shared/00/00040500.xhp#OpenOptimizeSize"/>
-    <section id="sydistribute_columns_evenly">
-            <table id="tbl_id3148462">
-               <tablerow>
-                  <tablecell>
-                     <paragraph id="par_id3145179" role="paragraph"><image 
id="img_id3145186" src="cmd/lc_distributecolumns.svg" width="1cm" 
height="1cm"><alt id="alt_id3145186">Icon Distribute Columns 
Evenly</alt></image></paragraph>
-                  </tablecell>
-                  <tablecell>
-                     <paragraph id="par_id3151364" role="paragraph">Distribute 
Columns Evenly</paragraph>
-                  </tablecell>
-               </tablerow>
-            </table>
-    </section>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id151654212978990"><variable 
id="RightClickSize">Select columns in table, right-click, choose <menuitem>Size 
- Distribute Columns Evenly</menuitem>.</variable></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id251693935084102">Choose 
<menuitem>Table - Optimize Size - Distribute Columns 
Evenly</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id71693935087159">On the 
<menuitem>Table</menuitem> menu of the <menuitem>Table</menuitem> tab, choose 
<menuitem>Distribute Columns Evenly</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <section id="sydistribute_columns_evenly">
+    <table id="tbl_id3148462">
+      <tablerow>
+        <tablecell>
+          <paragraph id="par_id3145179" role="paragraph"><image 
id="img_id3145186" src="cmd/lc_distributecolumns.svg" width="1cm" 
height="1cm"><alt id="alt_id3145186">Icon Distribute Columns 
Evenly</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id3151364" role="paragraph">Distribute Columns 
Evenly</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
+  </section>
+  <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+  <paragraph role="paragraph" id="par_id191693935125855">Choose 
<menuitem>Properties - Table - Distribute Columns Evenly</menuitem>.</paragraph>
 </section>
 
 <section id="standard">
diff --git a/source/text/shared/01/05110600m.xhp 
b/source/text/shared/01/05110600m.xhp
index 01a34760e7..1e959b9782 100644
--- a/source/text/shared/01/05110600m.xhp
+++ b/source/text/shared/01/05110600m.xhp
@@ -20,25 +20,26 @@
 
 <meta>
 <topic id="textshared0105110600mxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Distribute Rows Evenly</title>
+<title id="tit">Distribute Rows Evenly</title>
 <filename>/text/shared/01/05110600m.xhp</filename>
 </topic>
 </meta>
 <body>
-<section id="distribute_rows_equally">
-<bookmark xml-lang="en-US" branch="hid/.uno:DistributeRows" id="bm_id2550261" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id431513359599959">
+<bookmark branch="hid/.uno:DistributeRows" id="bm_id2550261" localize="false"/>
+<bookmark branch="index" id="bm_id431513359599959">
     <bookmark_value>table rows;distribute height equally</bookmark_value>
     <bookmark_value>row height;distribute equally</bookmark_value>
 </bookmark>
+<section id="distribute_rows_equally">
 <h1 id="hd_id3149871"><link href="text/shared/01/05110600m.xhp">Distribute 
Rows Evenly</link></h1>
-<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US"><variable 
id="distribute_rows_text"><ahelp hid=".uno:DistributeRows">Adjust the height of 
the selected rows to match the height of the tallest row in the 
selection.</ahelp></variable></paragraph>
+<paragraph role="paragraph" id="par_id3154766"><variable 
id="distribute_rows_text"><ahelp hid=".uno:DistributeRows">Adjust the height of 
the selected rows to match the height of the tallest row in the 
selection.</ahelp></variable></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00040500.xhp#distribute_rows_evenly"/>
 </section>
 <paragraph role="paragraph" id="par_id421655891095753">It is necessary to 
select at least two rows for this command to be available, and sufficient to 
select only one cell from each row.</paragraph>
 <section id="relatedtopics">
+<paragraph role="paragraph" id="par_id681693927087020" 
localize="false"><embedvar href="text/swriter/01/TableAutoFitMenu.xhp#h1" 
markup="ignore"/></paragraph>
 <embed href="text/shared/02/04210000.xhp#optimizeh1"/>
 <switch select="appl">
 <case select="WRITER">
diff --git a/source/text/shared/01/05120600.xhp 
b/source/text/shared/01/05120600.xhp
index 02000b0ec2..c5e90db242 100644
--- a/source/text/shared/01/05120600.xhp
+++ b/source/text/shared/01/05120600.xhp
@@ -24,12 +24,12 @@
 </topic>
 </meta>
 <body>
-<section id="distribute_columns_equally">
 <bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" 
id="bm_id2213069" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id431513359599959">
     <bookmark_value>table columns;distribute columns evenly</bookmark_value>
     <bookmark_value>column width;distribute evenly</bookmark_value>
 </bookmark>
+<section id="distribute_columns_equally">
 <h1 id="hd_id3153811"><link href="text/shared/01/05120600.xhp">Distribute 
Columns Evenly</link></h1>
 <paragraph role="paragraph" id="par_id3151389" xml-lang="en-US"><variable 
id="distribute_columns_text"><ahelp hid=".uno:DistributeColumns">Adjust the 
width of selected table columns so that each column has the same width.</ahelp> 
The table width and unselected columns remain unchanged.</variable></paragraph>
 </section>
@@ -38,6 +38,7 @@
 </section>
 <paragraph role="paragraph" id="par_id711654213522157">It is necessary to 
select at least two columns for this command to be available, and sufficient to 
select only one cell from each column.</paragraph>
 <section id="relatedtopics">
+<paragraph role="paragraph" id="par_id681693927087020" 
localize="false"><embedvar href="text/swriter/01/TableAutoFitMenu.xhp#h1" 
markup="ignore"/></paragraph>
 <embed href="text/shared/02/04210000.xhp#optimizeh1"/>
 <switch select="appl">
 <case select="WRITER">
diff --git a/source/text/shared/01/SetOptimalColumnWidth.xhp 
b/source/text/shared/01/SetOptimalColumnWidth.xhp
new file mode 100644
index 0000000000..0a37727902
--- /dev/null
+++ b/source/text/shared/01/SetOptimalColumnWidth.xhp
@@ -0,0 +1,88 @@
+<?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="textshared01SetOptimalColumnWidthxhp" indexer="include" 
status="PUBLISH">
+            <title id="tit">Optimal Column Width</title>
+            <filename>/text/shared/01/SetOptimalColumnWidth.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+<bookmark branch="hid/.uno:SetOptimalColumnWidth" id="bm_id8687648" 
localize="false"/>
+<bookmark  branch="index" id="bm_id3155628">
+<bookmark_value>spreadsheets; optimal column widths</bookmark_value>
+<bookmark_value>columns; optimal widths</bookmark_value>
+<bookmark_value>optimal column widths</bookmark_value>
+<bookmark_value>optimal column widths;text table</bookmark_value>
+<bookmark_value>text table;optimal column widths</bookmark_value>
+</bookmark>
+<bookmark  
branch="hid/modules/scalc/ui/optimalcolwidthdialog/OptimalColWidthDialog" 
id="bm_id2742569" localize="false"/>
+<bookmark  branch="hid/modules/scalc/ui/optimalcolwidthdialog/@@nowidget@@" 
id="bm_id2742569" localize="false"/>
+<bookmark  branch="hid/.uno:SetOptimalColumnWidthDirect" id="bm_id3153254" 
localize="false"/>
+    <section id="optimal_column_width">
+        <h1 id="hd_id3149500"><variable id="optimal_column_width_h1"><link 
href="text/shared/01/SetOptimalColumnWidth.xhp">Optimal Column 
Width</link></variable></h1>
+        <switch select="appl">
+            <case select="WRITER">
+                <paragraph role="paragraph" id="par_id3149050"><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"/>
+            <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">
+            <bookmark  
branch="hid/modules/scalc/ui/optimalcolwidthdialog/value" id="bm_id3153192" 
localize="false"/>
+            <h2 id="hd_id3150767">Add</h2>
+            <paragraph role="paragraph" id="par_id3150449" ><ahelp 
hid="modules/scalc/ui/optimalcolwidthdialog/value">Defines additional spacing 
between the longest entry in a column and the vertical column 
borders.</ahelp></paragraph>
+            <bookmark  
branch="hid/modules/scalc/ui/optimalcolwidthdialog/default" id="bm_id3155855" 
localize="false"/>
+            <h2 id="hd_id3145785">Default value</h2>
+            <paragraph role="paragraph" id="par_id3146120" ><ahelp 
hid="modules/scalc/ui/optimalcolwidthdialog/default">Defines the optimal column 
width in order to display the entire contents of the column.</ahelp> The 
additional spacing for the optimal column width is preset to 2 mm.</paragraph>
+        </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">
+                  <paragraph role="paragraph" id="par_id681693927087020" 
localize="false"><embedvar href="text/swriter/01/TableAutoFitMenu.xhp#h1" 
markup="ignore"/></paragraph>
+                <embed 
href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+            </case>
+        </switch>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/01/SetOptimalRowHeight.xhp 
b/source/text/shared/01/SetOptimalRowHeight.xhp
new file mode 100644
index 0000000000..e5f6b85d47
--- /dev/null
+++ b/source/text/shared/01/SetOptimalRowHeight.xhp
@@ -0,0 +1,85 @@
+<?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="textshared01SetOptimalRowHeightxhp" indexer="include" 
status="PUBLISH">
+            <title id="tit">Optimal Row Height</title>
+            <filename>/text/shared/01/SetOptimalRowHeight.xhp</filename>
+        </topic>
+    </meta>
+<body>
+<bookmark  branch="hid/.uno:SetOptimalRowHeight" id="bm_id3145673" 
localize="false"/>
+<bookmark  
branch="hid/modules/scalc/ui/optimalrowheightdialog/OptimalRowHeightDialog" 
id="bm_id1299843" localize="false"/>
+<bookmark  branch="hid/modules/scalc/ui/optimalrowheightdialog/@@nowidget@@" 
id="bm_id1299843" localize="false"/>
+<bookmark  branch="index" id="bm_id3148491">
+<bookmark_value>sheets; optimal row heights</bookmark_value>
+<bookmark_value>rows; optimal heights</bookmark_value>
+<bookmark_value>optimal row heights</bookmark_value>
+<bookmark_value>optimal row heights;text table</bookmark_value>
+<bookmark_value>optimal row heights;text table;optimal row 
heights</bookmark_value>
+</bookmark>
+    <section id="optimal_row_height">
+        <h1 id="hd_id3150010"><variable id="h1"><link 
href="text/shared/01/SetOptimalRowHeight.xhp">Optimal Row 
Height</link></variable></h1>
+        <switch select="appl">
+            <case select="WRITER">
+                <paragraph role="paragraph" id="par_id3147436"><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>
+            </case>
+            <case select="CALC">
+                <paragraph role="paragraph" id="par_id3154758" ><variable 
id="optitext"><ahelp hid=".uno:SetOptimalRowHeight">Determines the optimal row 
height for the selected rows.</ahelp></variable> The optimal row height depends 
on the font size of the largest character in the row. You can use various <link 
href="text/shared/00/00000003.xhp#measurement_units">units of 
measure</link>.</paragraph>
+            </case>
+            <case select="IMPRESS">
+            </case>
+            <case select="DRAW">
+            </case>
+            <default>
+            </default>
+        </switch>
+    </section>
+
+    <section id="howtoget">
+        <embed href="text/shared/00/00040500.xhp#optimal_row_height"/>
+    </section>
+
+    <switch select="appl">
+        <case select="WRITER">
+            <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>
+        </case>
+        <case select="CALC">
+            <bookmark  
branch="hid/modules/scalc/ui/optimalrowheightdialog/value" id="bm_id3156280" 
localize="false"/>
+            <h2 id="hd_id3154908">Add</h2>
+            <paragraph role="paragraph" id="par_id3151044" ><ahelp 
hid="modules/scalc/ui/optimalrowheightdialog/value">Sets additional spacing 
between the largest character in a row and the cell 
boundaries.</ahelp></paragraph>
+            <bookmark  
branch="hid/modules/scalc/ui/optimalrowheightdialog/default" id="bm_id3145271" 
localize="false"/>
+            <h2 id="hd_id3150439">Default value</h2>
+            <paragraph role="paragraph" id="par_id3146984" ><ahelp 
hid="modules/scalc/ui/optimalrowheightdialog/default">Restores the default 
value for the optimal row height.</ahelp></paragraph>
+        </case>
+        <case select="IMPRESS">
+        </case>
+        <case select="DRAW">
+        </case>
+        <default>
+        </default>
+    </switch>
+
+    <section id="relatedtopics">
+        <embed href="text/shared/02/04210000.xhp#optimizeh1"/>
+        <switch select="appl">
+            <case select="WRITER">
+                <paragraph role="paragraph" id="par_id21693926558521" 
localize="false"><embedvar 
href="text/swriter/01/TableAutoFitMenu.xhp#h1"/></paragraph>
+                <embed 
href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+            </case>
+        </switch>
+    </section>
+
+</body>
+</helpdocument>
+
+
diff --git a/source/text/shared/01/minimal_column_width.xhp 
b/source/text/shared/01/minimal_column_width.xhp
index 690500c884..c7eee23e2b 100644
--- a/source/text/shared/01/minimal_column_width.xhp
+++ b/source/text/shared/01/minimal_column_width.xhp
@@ -11,30 +11,32 @@
 
 <meta>
   <topic id="shared01minimalcolumnwidth" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Minimal Column Width</title>
+    <title id="tit">Minimal Column Width</title>
     <filename>/text/shared/01/minimal_column_width.xhp</filename>
   </topic>
 </meta>
 <body>
 <section id="minimal_column_width">
-<bookmark xml-lang="en-US" branch="hid/.uno:SetMinimalColumnWidth" 
id="bm_id171654218330763" localize="false"/>
+<bookmark branch="hid/.uno:SetMinimalColumnWidth" id="bm_id171654218330763" 
localize="false"/>
 <h1 id="hd_id421654218230011"><variable id="minimalcolh1"><link 
href="text/shared/01/minimal_column_width.xhp">Minimal Column 
Width</link></variable></h1>
 <section id="minimal_column_width_text">
-<switch select="appl">
-<case select="WRITER">
-<paragraph role="paragraph" id="par_id581605991965966">Adjust the column width 
for selected cells so that the longest paragraph in each cell can be on a 
single line.</paragraph>
-</case>
-<case select="CALC"><comment>Not in CALC</comment>
-</case>
-<default>
-<paragraph role="paragraph" id="par_id801654217365035">Adjust the column width 
for the selected columns so that the longest paragraph in each column can fit 
exactly on a single line, without increasing the table width.</paragraph>
-</default>
-</switch>
+  <switch select="appl">
+    <case select="WRITER">
+      <paragraph role="paragraph" id="par_id581605991965966">Adjust the column 
width for selected cells so that the longest paragraph in each cell can be on a 
single line.</paragraph>
+    </case>
+    <case select="CALC"><comment>Not in CALC</comment>
+    </case>
+    <default>
+      <paragraph role="paragraph" id="par_id801654217365035">Adjust the column 
width for the selected columns so that the longest paragraph in each column can 
fit exactly on a single line, without increasing the table width.</paragraph>
+    </default>
+  </switch>
 </section>
 </section>
-  <section id="howtoget">
+
+<section id="howtoget">
   <embed href="text/shared/00/00040500.xhp#minimal_column_width"/>
   </section>
+
 <switch select="appl">
   <case select="WRITER">
     <paragraph role="paragraph" id="par_id501655941966365"><menuitem>Minimal 
Column Width</menuitem> seeks to find a column width that allows each paragraph 
in the selected cells to <emph>fit exactly</emph> as a single line in the cell. 
This means that column widths are adjusted in relation to the length of the 
longest paragraph in each of the selected cells. The final result depends on 
which cells are selected.</paragraph>
@@ -53,12 +55,13 @@
   </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>
+  <embed href="text/shared/02/04210000.xhp#optimizeh1"/>
+  <switch select="appl">
+    <case select="WRITER">
+      <paragraph role="paragraph" id="par_id681693927087020" 
localize="false"><embedvar href="text/swriter/01/TableAutoFitMenu.xhp#h1" 
markup="ignore"/></paragraph>
+      <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+    </case>
+  </switch>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/minimal_row_height.xhp 
b/source/text/shared/01/minimal_row_height.xhp
index fbcca0391f..1791f6c978 100644
--- a/source/text/shared/01/minimal_row_height.xhp
+++ b/source/text/shared/01/minimal_row_height.xhp
@@ -11,13 +11,13 @@
 
 <meta>
   <topic id="shared01minimalrowheight" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Minimal Row Height</title>
+    <title id="tit">Minimal Row Height</title>
     <filename>/text/shared/01/minimal_row_height.xhp</filename>
   </topic>
 </meta>
 <body>
 <section id="minimal_row_height">
-<bookmark xml-lang="en-US" branch="hid/.uno:SetMinimalRowHeight" 
id="bm_id451654218902796" localize="false"/>
+<bookmark branch="hid/.uno:SetMinimalRowHeight" id="bm_id451654218902796" 
localize="false"/>
 <h1 id="hd_id421654218230011"><variable id="minimalrowh1"><link 
href="text/shared/01/minimal_row_height.xhp">Minimal Row 
Height</link></variable></h1>
 <section id="minimal_row_height_text">
 <paragraph role="paragraph" id="par_id581605991965966">Adjust the row height 
for selected row(s) so that the tallest content in each selected row fits 
exactly.</paragraph>
@@ -34,12 +34,13 @@
 <paragraph role="paragraph" id="par_id971654479023479">To minimize a single 
row, it is sufficient to place the cursor in a cell in the row.</paragraph>
 <paragraph role="paragraph" id="par_id1001653629678905">To minimize multiple 
rows, it is sufficient to select one cell from each row to be 
minimized.</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>
+  <embed href="text/shared/02/04210000.xhp#optimizeh1"/>
+  <switch select="appl">
+    <case select="WRITER">
+      <paragraph role="paragraph" id="par_id681693927087020" 
localize="false"><embedvar href="text/swriter/01/TableAutoFitMenu.xhp#h1" 
markup="ignore"/></paragraph>
+      <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+    </case>
+  </switch>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/04210000.xhp 
b/source/text/shared/02/04210000.xhp
index aba508714d..cdb96bb778 100644
--- a/source/text/shared/02/04210000.xhp
+++ b/source/text/shared/02/04210000.xhp
@@ -47,13 +47,13 @@
 <case select="WRITER">
 <embed href="text/shared/01/minimal_row_height.xhp#minimal_row_height"/>
 <embed href="text/shared/00/00040500.xhp#syminimal_row_height"/>
-<embed href="text/swriter/01/05110200.xhp#optimal_row_height"/>
+<embed href="text/shared/01/SetOptimalRowHeight.xhp#optimal_row_height"/>
 <embed href="text/shared/00/00040500.xhp#syoptimal_row_height"/>
 <embed href="text/shared/01/05110600m.xhp#distribute_rows_equally"/>
 <embed href="text/shared/00/00040500.xhp#sydistribute_rows_evenly"/>
 <embed href="text/shared/01/minimal_column_width.xhp#minimal_column_width"/>
 <embed href="text/shared/00/00040500.xhp#syminimal_column_width"/>
-<embed href="text/swriter/01/05120200.xhp#optimal_column_width"/>
+<embed href="text/shared/01/SetOptimalColumnWidth.xhp#optimal_column_width"/>
 <embed href="text/shared/00/00040500.xhp#syoptimal_column_width"/>
 <embed href="text/shared/01/05120600.xhp#distribute_columns_equally"/>
 <embed href="text/shared/00/00040500.xhp#sydistribute_columns_evenly"/>
@@ -62,13 +62,13 @@
 <default>
 <embed href="text/shared/01/minimal_row_height.xhp#minimal_row_height"/>
 <embed href="text/shared/00/00040500.xhp#syminimal_row_height"/>
-<embed href="text/swriter/01/05110200.xhp#optimal_row_height"/>
+<embed href="text/shared/01/SetOptimalRowHeight.xhp#optimal_row_height"/>
 <embed href="text/shared/00/00040500.xhp#syoptimal_row_height"/>
 <embed href="text/shared/01/05110600m.xhp#distribute_rows_equally"/>
 <embed href="text/shared/00/00040500.xhp#sydistribute_rows_evenly"/>
 <embed href="text/shared/01/minimal_column_width.xhp#minimal_column_width"/>
 <embed href="text/shared/00/00040500.xhp#syminimal_column_width"/>
-<embed href="text/swriter/01/05120200.xhp#optimal_column_width"/>
+<embed href="text/shared/01/SetOptimalColumnWidth.xhp#optimal_column_width"/>
 <embed href="text/shared/00/00040500.xhp#syoptimal_column_width"/>
 <embed href="text/shared/01/05120600.xhp#distribute_columns_equally"/>
 <embed href="text/shared/00/00040500.xhp#sydistribute_columns_evenly"/>
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"/>

Reply via email to