summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Chaiklin <sdc.blanco@youmail.dk>2022-05-26 15:01:15 +0200
committerOlivier Hallot <olivier.hallot@libreoffice.org>2022-06-29 14:46:05 +0200
commitb6a8105c3ceb14f1216a12dbbe4b191acc0b99f3 (patch)
tree45a10d932086adc7fb9befb242e6dde352c57692
parentImprove description a bit (diff)
downloadhelp-b6a8105c3ceb14f1216a12dbbe4b191acc0b99f3.tar.gz
help-b6a8105c3ceb14f1216a12dbbe4b191acc0b99f3.zip
tdf#120550,tdf#121367 update row and column resizing in tables
This patch is a general review and update of commands to optimize the size of tables in Writer, Draw, and Impress. Thanks to Justin Luth for essential help in making accurate descriptions of these commands. It also started to improve the maintenance by moving the access commands and icon tables from diverse places to a shared/00 folder, introducing variables and sections that would allow reusing relevant sequences. shared/02/04210000.xhp (Optimize Size menu) * add two missing controls as embeds from swriter/main0110.xhp * add icon tables for the two controls * correction to control name * modify switch to include Draw and Impress * put controls in same order as dropdown menu + add variable to h1, so page can be embedded in related topics * update to renamed ids * change image size to 1cm * refactor to <h1>,<h2> shared/00/00040500.xhp + add <section> to "Open Optimize Size..." (i.e., for opening dropdown menu in Table bar), so it can be embedded into each page for the individual controls. * use access controls from swriter/00/00000405.xhp, plus add appl-switch * update access for Table menu swriter/00/00000405.xhp (Access commands for Size) * move all relevant access commands to shared/00/00040500.xhp swriter/01/05110000.xhp (Row) * correction to two command names * update to renamed id * refactor to <h1>,<h2> swriter/01/05120200.xhp (Optimal Column Width) * update command name + add <relatedtopics> with two links * rename German id * refactor to <h1> swriter/01/05110200.xhp (Optimal Row Height) * update command name * rename German id + add <relatedtopics> with two links * refactor to <h1>,<note> shared/01/05120600.xhp (Distribute Columns Equally) * corrections to description of the command operation + additional information about how to select + add "right-click" instructions to "howtoget" + add link to "Optimize Size" menu and "Table" bar + add <relatedtopics> with two links * rename German id * refactor to <h1>, changed paragraphs to <menuitem> * image size to 1cm shared/01/05110600m.xhp (Distribute Rows Equally) + add link to "Optimize Size" menu + add <relatedtopics> with two links * rename German id * refactor to <h1>, changed paragraphs to <menuitem> * image size to 1cm swriter/main0110.xhp (Table menu page) * update renamed ids + add sections to text in Minimal Row Height and Minimal Column Width, so that they can be embedded into "Optimize Size" menu page. swriter/guide/table_sizing.xhp + add links to "Optimize Size" and "Table" bar in text. + add "Optimize Size" to Related Topics * refactor to <note>,<tip>,<relatedtopics> Change-Id: I9b84ccb2cd4d9b4e221f82ee4654e95553f3d188 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135002 Tested-by: Jenkins Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org> Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--AllLangHelp_shared.mk2
-rw-r--r--source/text/shared/00/00040500.xhp173
-rw-r--r--source/text/shared/01/05110600m.xhp27
-rw-r--r--source/text/shared/01/05120600.xhp32
-rw-r--r--source/text/shared/01/minimal_column_width.xhp66
-rw-r--r--source/text/shared/01/minimal_row_height.xhp45
-rw-r--r--source/text/shared/02/04210000.xhp29
-rw-r--r--source/text/swriter/00/00000405.xhp75
-rw-r--r--source/text/swriter/01/05110000.xhp18
-rw-r--r--source/text/swriter/01/05110100.xhp14
-rw-r--r--source/text/swriter/01/05110200.xhp29
-rw-r--r--source/text/swriter/01/05120000.xhp13
-rw-r--r--source/text/swriter/01/05120200.xhp56
-rw-r--r--source/text/swriter/guide/table_sizing.xhp30
-rw-r--r--source/text/swriter/main0110.xhp16
15 files changed, 429 insertions, 196 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index d430f20329..d98cfdec16 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -351,6 +351,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/01/mediaplayer \
helpcontent2/source/text/shared/01/menu_edit_find \
helpcontent2/source/text/shared/01/menu_view_sidebar \
+ helpcontent2/source/text/shared/01/minimal_column_width \
+ helpcontent2/source/text/shared/01/minimal_row_height \
helpcontent2/source/text/shared/01/moviesound \
helpcontent2/source/text/shared/01/nav_rename \
helpcontent2/source/text/shared/01/notebook_bar \
diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp
index 21fba358db..ab1ac1d4d2 100644
--- a/source/text/shared/00/00040500.xhp
+++ b/source/text/shared/00/00040500.xhp
@@ -27,6 +27,179 @@
<body>
<comment>This listing is split over the files 00040500, 00040501, 00040502 and 00040503.</comment>
<h1 id="hd_id3150347">Format Menu</h1>
+
+<comment>The next seven sections are commands to optimize table row width and column height.
+ Writer has special "Table" menu. Draw/Impress use "Format", so all the command and icons
+ are collected here.</comment>
+
+<section id="OpenOptimizeSize">
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US">Open <link href="text/shared/02/04210000.xhp" name="Link to Optimize Size"><menuitem>Optimize Size</menuitem></link> dropdown menu from <link href="text/swriter/main0204.xhp" name="Link to Table Bar"><menuitem>Table</menuitem></link> bar, click</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <paragraph role="paragraph" id="par_id481655731478873" xml-lang="en-US">Open <link href="text/shared/02/04210000.xhp" name="Link to Optimize Size"><menuitem>Optimize Size</menuitem></link> dropdown menu from <menuitem>Table</menuitem> bar, click</paragraph>
+ </default>
+ </switch>
+</section>
+
+<section id="minimal_row_height">
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph role="paragraph" id="par_id271654223353638">Choose <menuitem>Table - Size - Minimal Row Height</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <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"/>
+ <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>
+ </section>
+</section>
+
+<section id="optimal_row_height">
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph xml-lang="en-US" id="par_id3155536" role="paragraph">Choose <menuitem>Table - Size - Optimal Row Height</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></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"/>
+ <section id="syoptimal_row_height">
+ <table id="tbl_id3150845">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145222" role="paragraph"><image id="img_id3145228" src="cmd/lc_setoptimalrowheight.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3145228">Icon Optimal Row Height</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153545" role="paragraph">Optimal Row Height</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+</section>
+
+<section id="distribute_rows_evenly">
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph xml-lang="en-US" id="par_id3153569" role="paragraph">Choose <menuitem>Table - Size - Distribute Rows Evenly</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <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 xml-lang="en-US" id="par_id3145297" role="paragraph"><image id="img_id3155994" src="cmd/lc_distributerows.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155994">Icon Distribute Rows Evenly</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153206" role="paragraph">Distribute Rows Evenly</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+</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"></case>
+ <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>
+
+<section id="optimal_column_width">
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph xml-lang="en-US" id="par_id3154752" role="paragraph">Choose <menuitem>Table - Size - Optimal Column Width</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></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 xml-lang="en-US" id="par_id3157881" role="paragraph"><image id="img_id3157888" src="cmd/lc_setoptimalcolumnwidth.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3157888">Icon Optimal Column Width</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150524" role="paragraph">Optimal Column Width</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+</section>
+
+<section id="distribute_columns_evenly">
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph">Choose <menuitem>Table - Size - Distribute Columns Evenly</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <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 xml-lang="en-US" id="par_id3145179" role="paragraph"><image id="img_id3145186" src="cmd/lc_distributecolumns.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3145186">Icon Distribute Columns Evenly</alt></image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151364" role="paragraph">Distribute Columns Evenly</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+</section>
+
<paragraph id="par_id3145356" role="paragraph"><variable id="standard">Choose <emph>Format - Clear Direct Formatting</emph>.</variable></paragraph>
<section id="character">
<paragraph id="par_id3153244" role="paragraph">Choose <emph>Format - Character</emph>.</paragraph>
diff --git a/source/text/shared/01/05110600m.xhp b/source/text/shared/01/05110600m.xhp
index fbc9a731c5..66b9592134 100644
--- a/source/text/shared/01/05110600m.xhp
+++ b/source/text/shared/01/05110600m.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,7 +18,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<meta>
<topic id="textshared0105110600mxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Distribute Rows Evenly</title>
@@ -34,30 +32,19 @@
<bookmark_value>row height;distribute equally</bookmark_value>
</bookmark>
<h1 id="hd_id3149871"><link href="text/shared/01/05110600m.xhp" name="Distribute Evenly">Distribute Rows Evenly</link></h1>
-<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US"><variable id="verteilentext"><ahelp hid=".uno:DistributeRows">Adjusts 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" 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>
</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">
+<embed href="text/shared/02/04210000.xhp#optimizeh1"/>
<switch select="appl">
<case select="WRITER">
-<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US">Choose <emph>Table - Size - Distribute Rows Evenly</emph>
-</paragraph>
+<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3153755" xml-lang="en-US">Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="sydistribute_rows_equally">
-<table id="tbl_id3154064">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US">
-<image id="img_id3155994" src="cmd/lc_distributerows.svg" width="1cm" height="1cm"><alt id="alt_id3155994" xml-lang="en-US">Icon Distribute Rows Evenly</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153206" xml-lang="en-US">Distribute Rows Evenly</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
</section>
</body>
</helpdocument>
diff --git a/source/text/shared/01/05120600.xhp b/source/text/shared/01/05120600.xhp
index 86cb31572f..ebe6ed16e4 100644
--- a/source/text/shared/01/05120600.xhp
+++ b/source/text/shared/01/05120600.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +17,6 @@
* 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="textshared0105120600xhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Distribute Columns Evenly</title>
@@ -30,34 +27,23 @@
<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 equally</bookmark_value>
- <bookmark_value>column width;distribute equally</bookmark_value>
+ <bookmark_value>table columns;distribute columns evenly</bookmark_value>
+ <bookmark_value>column width;distribute evenly</bookmark_value>
</bookmark>
<h1 id="hd_id3153811"><link href="text/shared/01/05120600.xhp" name="Distribute Evenly">Distribute Columns Evenly</link></h1>
-<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US"><variable id="verteilentext"><ahelp hid=".uno:DistributeColumns">Adjusts the width of the selected columns to match the width of the widest column in the selection.</ahelp> The total width of the table cannot exceed the width of the page.
-</variable></paragraph>
+<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>
<section id="howtoget">
+<embed href="text/shared/00/00040500.xhp#distribute_columns_evenly"/>
+</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">
+<embed href="text/shared/02/04210000.xhp#optimizeh1"/>
<switch select="appl">
<case select="WRITER">
-<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US">Choose <emph>Table - Size - Distribute Columns Evenly</emph>
-</paragraph>
+<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US">Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="sydistribute_columns_equally">
-<table id="tbl_id3148462">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US">
-<image id="img_id3145186" src="cmd/sc_distributecolumns.svg" width="1cm" height="1cm"><alt id="alt_id3145186" xml-lang="en-US">Icon Distribute Columns Evenly</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US">Distribute Columns Evenly</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
</section>
</body>
</helpdocument>
diff --git a/source/text/shared/01/minimal_column_width.xhp b/source/text/shared/01/minimal_column_width.xhp
new file mode 100644
index 0000000000..5188827f93
--- /dev/null
+++ b/source/text/shared/01/minimal_column_width.xhp
@@ -0,0 +1,66 @@
+<?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 https://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<meta>
+ <topic id="shared01minimalcolumnwidth" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">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"/>
+<h1 id="hd_id421654218230011"><variable id="minimalcolh1"><link href="text/shared/01/minimal_column_width.xhp" name="Minimal Column Width">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>
+</section>
+</section>
+ <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>
+ <note id="par_id741655770095042">Column width includes space for any horizontal cell padding, paragraph padding, and paragraph indents.</note>
+ <paragraph role="paragraph" id="par_id291655943042163">If the table width is less than the page width, then under some circumstances the width of the table may be increased in an attempt to fit a cell paragraph onto a single line. Otherwise the command can be useful for reducing the width of tables.</paragraph>
+ <section id="fit_single_column">
+ <tip id="par_id421655893243524">Select a single cell to adjust the entire column width to fit the content of that cell.</tip>
+ </section>
+ </case>
+ <case select="CALC"><comment>Not in CALC</comment>
+ </case>
+ <default>
+ <paragraph role="paragraph" id="par_id201655811553407"><menuitem>Minimal Column Width</menuitem> seeks to find a column width that allows each paragraph in the selected column(s) to fit exactly on a single line. This means that column widths are adjusted in relation to the length of the longest paragraph in each of the selected columns. The final result depends on the paragraph length in the selected columns.</paragraph>
+ <paragraph role="paragraph" id="par_id721655811560679"></paragraph>
+ <paragraph role="paragraph" id="par_id971654218805882">To minimize a single column, it is sufficient to place the cursor in a cell in the column to be minimized. To minimize multiple columns, it is sufficient to select one cell from each column to be minimized.</paragraph>
+ <paragraph role="paragraph" id="par_id1001654218953554"></paragraph>
+ <paragraph role="paragraph" id="par_id91656110781159">The command can be useful for reducing the width of tables.</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/shared/01/minimal_row_height.xhp b/source/text/shared/01/minimal_row_height.xhp
new file mode 100644
index 0000000000..e1f86069a6
--- /dev/null
+++ b/source/text/shared/01/minimal_row_height.xhp
@@ -0,0 +1,45 @@
+<?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 https://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<meta>
+ <topic id="shared01minimalrowheight" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">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"/>
+<h1 id="hd_id421654218230011"><variable id="minimalrowh1"><link href="text/shared/01/minimal_row_height.xhp" name="Minimal Row Height">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>
+</section>
+</section>
+<section id="howtoget">
+<embed href="text/shared/00/00040500.xhp#minimal_row_height"/>
+</section>
+<switch select="appl">
+ <case select="WRITER">
+ <note id="par_id211656116102899">This option is only available if the selection contains a row with a fixed height. The command has the same effect as selecting the <menuitem>Fit to size</menuitem> option for <link href="text/swriter/01/05110100.xhp" name="Row Height">Row Height</link>.</note>
+ </case>
+</switch>
+<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>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/02/04210000.xhp b/source/text/shared/02/04210000.xhp
index 2d0ec16542..e7b030f1c5 100644
--- a/source/text/shared/02/04210000.xhp
+++ b/source/text/shared/02/04210000.xhp
@@ -27,8 +27,7 @@
<body>
<section id="optimize">
<bookmark xml-lang="en-US" branch="hid/.uno:OptimizeTable" id="bm_id6810577" localize="false"/>
-
-<h1 id="hd_id3151185"><link href="text/shared/02/04210000.xhp" name="Optimize Size">Optimize Size</link></h1>
+<h1 id="hd_id3151185" xml-lang="en-US"><variable id="optimizeh1"><link href="text/shared/02/04210000.xhp" name="Optimize Size">Optimize Size</link></variable></h1>
<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US"><ahelp hid=".uno:OptimizeTable">Opens a toolbar that contains functions for optimizing the rows and columns in a table.</ahelp></paragraph>
</section>
<section id="syoptimize">
@@ -44,19 +43,23 @@
</table>
</section>
<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US">You can select from the following functions:</paragraph>
-<embed href="text/shared/01/05120600.xhp#distribute_columns_equally"/>
-<embed href="text/shared/01/05120600.xhp#sydistribute_columns_equally"/>
-<embed href="text/shared/01/05110600m.xhp#distribute_rows_equally"/>
-<embed href="text/shared/01/05110600m.xhp#sydistribute_rows_equally"/>
<switch select="appl">
-<case select="WRITER">
-<h2 id="hd_id3153631"><link href="text/swriter/01/05110200.xhp" name="Optimal Height">Optimal Height</link></h2>
-<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
-<embed href="text/swriter/00/00000405.xhp#syoptimal_row_height"/>
-<h2 id="hd_id3145772"><link href="text/swriter/01/05120200.xhp" name="Optimal Column Width">Optimal Column Width</link></h2>
-<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
-<embed href="text/swriter/00/00000405.xhp#syoptimal_column_width"/>
+<case select="CALC">
</case>
+<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/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/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"/>
+</default>
</switch>
</body>
</helpdocument>
diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index 5ed9cc14b1..033f36f0ef 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -126,7 +126,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<section id="graphics_type">
@@ -183,7 +182,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<section id="split_cells">
@@ -200,7 +198,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<paragraph xml-lang="en-US" id="par_id3149617" role="paragraph"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>.</variable></paragraph>
@@ -210,39 +207,6 @@
</section>
<paragraph xml-lang="en-US" id="par_id3148716" role="paragraph"><variable id="zeile">In the context menu of a cell, choose <emph>Row</emph>.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3155345" role="paragraph"><variable id="hoehez">In the context menu of a cell, choose <emph>Row - Height</emph>.</variable></paragraph>
- <section id="optimal_row_height">
- <paragraph xml-lang="en-US" id="par_id3155536" role="paragraph">Choose <emph>Table - Autofit - Optimal Row Height</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph">Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click</paragraph>
- <section id="syoptimal_row_height">
- <table id="tbl_id3150845">
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145222" role="paragraph"><image id="img_id3145228" src="cmd/lc_setoptimalrowheight.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3145228">Icon Optimal Row Height</alt></image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153545" role="paragraph">Optimal Row Height</paragraph>
- </tablecell>
- </tablerow>
- </table>
- </section>
- </section>
- <section id="distribute_rows_equally">
- <paragraph xml-lang="en-US" id="par_id3153569" role="paragraph">Choose <emph>Table - Autofit - Distribute Rows Evenly</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153755" role="paragraph">Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click</paragraph>
- <section id="sydistribute_rows_equally">
- <table id="tbl_id3154064">
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145297" role="paragraph"><image id="img_id3155994" src="cmd/sc_distributerows.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155994">Icon Distribute Rows Evenly</alt></image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153206" role="paragraph">Distribute Rows Evenly</paragraph>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
- </section>
<paragraph xml-lang="en-US" id="par_id3145095" role="paragraph"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>.</variable></paragraph>
<section id="delete_row">
<paragraph xml-lang="en-US" id="par_id3149573" role="paragraph">Choose <emph>Table - Delete - Rows</emph>.</paragraph>
@@ -258,45 +222,10 @@
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<paragraph xml-lang="en-US" id="par_id3149383" role="paragraph"><variable id="spalte">In the context menu of a cell, choose <emph>Column</emph>.</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3149406" role="paragraph"><variable id="breites">In the context menu of a cell, choose <emph>Column - Width</emph>.</variable></paragraph>
- <section id="optimal_column_width">
- <paragraph xml-lang="en-US" id="par_id3154752" role="paragraph">Choose <emph>Table - Autofit - Optimal Column Width</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148932" role="paragraph">Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click</paragraph>
- <section id="syoptimal_column_width">
- <table id="tbl_id3156030">
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3157881" role="paragraph"><image id="img_id3157888" src="cmd/lc_setoptimalcolumnwidth.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3157888">Icon Optimal Column Width</alt></image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150524" role="paragraph">Optimal Column Width</paragraph>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
- </section>
- <section id="distribute_columns_equally">
- <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156426" role="paragraph">Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click</paragraph>
- <section id="sydistribute_columns_equally">
- <table id="tbl_id3148462">
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145179" role="paragraph"><image id="img_id3145186" src="cmd/sc_distributecolumns.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3145186">Icon Distribute Columns Evenly</alt></image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3151364" role="paragraph">Space Columns Equally</paragraph>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
- </section>
<paragraph xml-lang="en-US" id="par_id3153172" role="paragraph"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>.</variable></paragraph>
<section id="insert_columns_rows">
<paragraph xml-lang="en-US" id="par_id3156296" role="paragraph">Choose <emph>Table - Insert - Columns</emph>.</paragraph>
@@ -320,7 +249,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
<section id="delete_columns">
<paragraph xml-lang="en-US" id="par_id3155310" role="paragraph">Choose <emph>Table - Delete - Columns</emph>.</paragraph>
@@ -336,7 +264,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<section id="object_properties">
@@ -352,7 +279,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<section id="syframe_properties">
@@ -366,7 +292,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
<section id="textgrid">
<paragraph xml-lang="en-US" id="par_id3150140" role="paragraph">Menu <emph>Format - Page Style </emph> - tab <emph>Text Grid</emph>, if Asian language support is enabled</paragraph>
diff --git a/source/text/swriter/01/05110000.xhp b/source/text/swriter/01/05110000.xhp
index 8cf8a71e99..2b1f71305c 100644
--- a/source/text/swriter/01/05110000.xhp
+++ b/source/text/swriter/01/05110000.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +17,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="textswriter0105110000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Row</title>
@@ -30,18 +28,18 @@
</history>
</meta>
<body>
-<paragraph role="heading" id="hd_id3149502" xml-lang="en-US" level="1"><link href="text/swriter/01/05110000.xhp" name="Row">Row</link></paragraph>
+<h1 id="hd_id3149502" xml-lang="en-US"><link href="text/swriter/01/05110000.xhp" name="Row">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>
-<paragraph role="heading" id="hd_id3083451" xml-lang="en-US" level="2"><link href="text/swriter/01/05110100.xhp" name="Height">Height</link></paragraph>
-<embed href="text/swriter/01/05110100.xhp#hoehetext"/>
-<paragraph role="heading" id="hd_id3149349" xml-lang="en-US" level="2"><link href="text/swriter/01/05110200.xhp" name="Optimal Height">Optimal Height</link></paragraph>
-<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
+<h2 id="hd_id3083451" xml-lang="en-US"><link href="text/swriter/01/05110100.xhp" name="Height">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" name="Optimal Height">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"/>
-<paragraph role="heading" id="hd_id3149883" xml-lang="en-US" level="2"><link href="text/swriter/01/05120400.xhp" name="Insert...">Insert...</link></paragraph>
+<h2 id="hd_id3149883" xml-lang="en-US"><link href="text/swriter/01/05120400.xhp" name="Insert...">Insert...</link></h2>
<embed href="text/swriter/01/05120400.xhp#einfuegentext"/>
<embed href="text/swriter/01/05110500.xhp#delete"/>
</body>
diff --git a/source/text/swriter/01/05110100.xhp b/source/text/swriter/01/05110100.xhp
index 95e1810340..389e6f4dcf 100644
--- a/source/text/swriter/01/05110100.xhp
+++ b/source/text/swriter/01/05110100.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -19,7 +18,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<helpdocument version="1.0">
<meta>
<topic id="textswriter0105110100xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Row Height</title>
@@ -33,18 +31,18 @@
<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"/>
-<paragraph role="heading" id="hd_id3149871" xml-lang="en-US" level="1">Row Height</paragraph>
-<paragraph role="paragraph" id="par_id3149053" xml-lang="en-US"><variable id="hoehetext"><ahelp hid=".uno:SetRowHeight">Changes the height of the selected row(s).</ahelp>
+<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>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#hoehez"/>
</section>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/rowheight/heightmf" id="bm_id3145823" localize="false"/>
-<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2">Height</paragraph>
+<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="heading" id="hd_id3149878" xml-lang="en-US" level="3">Fit to size</paragraph>
+<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="note" id="par_id3154646" xml-lang="en-US">You can also right-click in a cell, and then choose <link href="text/swriter/01/05110200.xhp" name="Row - Optimal Height"><emph>Row - Optimal Height</emph></link>.</paragraph>
+<note id="par_id3154646">You can also right-click in a cell, and then choose <link href="text/swriter/01/05110200.xhp" name="Row - Optimal Height"><emph>Row - Optimal Height</emph></link>.</note>
</body>
</helpdocument>
diff --git a/source/text/swriter/01/05110200.xhp b/source/text/swriter/01/05110200.xhp
index c8405371e6..ac239d03da 100644
--- a/source/text/swriter/01/05110200.xhp
+++ b/source/text/swriter/01/05110200.xhp
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -16,10 +17,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="textswriter0105110200xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Optimal Height</title>
+<title xml-lang="en-US" id="tit">Optimal Row Height</title>
<filename>/text/swriter/01/05110200.xhp</filename>
</topic>
<history>
@@ -27,13 +28,23 @@
</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">Optimal Height</h1>
- <paragraph role="paragraph" id="par_id3147436" xml-lang="en-US"><variable id="zeilenhoehetext"><ahelp hid=".uno:SetOptimalRowHeight" visibility="visible">Automatically adjusts row heights to match the contents of the cells.</ahelp> This is the default setting for new tables.</variable></paragraph>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#optimal_row_height"/>
+<h1 id="hd_id3150010" xml-lang="en-US">Optimal Row Height</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" name="Minimal Row"><menuitem>Minimal Row Height</menuitem></link> and then distributing those rows by using <link href="text/shared/01/05110600m.xhp" name="Distribute Rows"><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>
- <note id="par_id3154765">This option is only available if the table contains a row with a fixed height.</note>
- </body>
+</body>
</helpdocument>
diff --git a/source/text/swriter/01/05120000.xhp b/source/text/swriter/01/05120000.xhp
index ea4e808cb1..3c812dfe30 100644
--- a/source/text/swriter/01/05120000.xhp
+++ b/source/text/swriter/01/05120000.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +17,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="textswriter0105120000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Column</title>
@@ -30,15 +28,14 @@
</history>
</meta>
<body>
-<paragraph role="heading" id="hd_id3154762" xml-lang="en-US" level="1"><link href="text/swriter/01/05120000.xhp" name="Column">Column</link></paragraph>
+<h1 id="hd_id3154762"><link href="text/swriter/01/05120000.xhp" name="Column">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>
-<paragraph role="heading" id="hd_id3146322" xml-lang="en-US" level="2"><link href="text/swriter/01/05120100.xhp" name="Width...">Width...</link></paragraph>
+<h2 id="hd_id3146322"><link href="text/swriter/01/05120100.xhp" name="Width...">Width...</link></h2>
<embed href="text/swriter/01/05120100.xhp#breitetext"/>
-<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2"><link href="text/swriter/01/05120200.xhp" name="Optimal width">Optimal width</link></paragraph>
-<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
+<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"/>
<paragraph role="heading" id="hd_id3150564" xml-lang="en-US" level="2"><link href="text/swriter/01/05120400.xhp" name="Insert...">Insert...</link></paragraph>
diff --git a/source/text/swriter/01/05120200.xhp b/source/text/swriter/01/05120200.xhp
index e2dbb23dc8..daec3f54e4 100644
--- a/source/text/swriter/01/05120200.xhp
+++ b/source/text/swriter/01/05120200.xhp
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -16,10 +17,9 @@
* 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="textswriter0105120200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Optimal Width</title>
+<title id="tit" xml-lang="en-US">Optimal Column Width</title>
<filename>/text/swriter/01/05120200.xhp</filename>
</topic>
<history>
@@ -27,13 +27,55 @@
</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">Optimal Width</h1>
-<paragraph role="paragraph" id="par_id3149050" xml-lang="en-US"><variable id="spaltenbreitetext"><ahelp hid=".uno:SetOptimalColumnWidth">Automatically adjusts column widths to match the contents of the cells.</ahelp> Changing the width of a column does not affect the width of the other columns in the table. The width of the table cannot exceed the page width.
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id5611743" xml-lang="en-US">The change affects only selected cells. You can adjust multiple cells next to each other if you select the cells together.</paragraph>
+<h1 id="hd_id3149500" xml-lang="en-US">Optimal Column Width</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/swriter/00/00000405.xhp#optimal_column_width"/>
+ <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/guide/table_sizing.xhp b/source/text/swriter/guide/table_sizing.xhp
index 838de6e43b..ad45d5120c 100644
--- a/source/text/swriter/guide/table_sizing.xhp
+++ b/source/text/swriter/guide/table_sizing.xhp
@@ -16,7 +16,7 @@
* 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="textswriterguidetable_sizingxml" indexer="include">
<title xml-lang="en-US" id="tit">Resizing Rows and Columns in a Text Table </title>
@@ -45,11 +45,10 @@
<tablerow>
<tablecell>
<paragraph id="par_id3149615" role="paragraph" xml-lang="en-US">
-<image id="img_id3149622" src="cmd/sc_optimizetable.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3149622">Icon</alt>
- </image></paragraph>
+<image id="img_id3149622" src="cmd/sc_optimizetable.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3149622">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
-<paragraph id="par_id3146497" role="paragraph" xml-lang="en-US">You can also distribute rows and columns evenly using the icons on the <item type="menuitem">Optimize Size</item> toolbar on the <item type="menuitem">Table</item> Bar.</paragraph>
+<paragraph id="par_id3146497" role="paragraph" xml-lang="en-US">You can also distribute rows and columns evenly using the icons on the <link href="text/shared/02/04210000.xhp" name="Link to Optimize Size"><menuitem>Optimize Size</menuitem></link> toolbar on the <link href="text/swriter/main0204.xhp" name="Link to Table Bar"><menuitem>Table</menuitem></link> Bar.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -65,18 +64,15 @@
<paragraph id="par_id3145390" role="listitem" xml-lang="en-US">Rest the mouse pointer over the column dividing line on the ruler until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id0918200811260957" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then click and drag a line to scale all cells right or above the line proportionally.</paragraph>
+<paragraph id="par_id0918200811260957" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then click and drag a line to scale all cells right or above the line proportionally.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id3145411" role="listitem" xml-lang="en-US">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the left or the right arrow key.</paragraph>
+<paragraph id="par_id3145411" role="listitem" xml-lang="en-US">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the left or the right arrow key.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id3153364" role="listitem" xml-lang="en-US">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph>
+<paragraph id="par_id3153364" role="listitem" xml-lang="en-US">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph>
</listitem></list>
-<paragraph id="par_id3155891" role="note" xml-lang="en-US">You can specify the behavior for the arrow keys by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
+<note id="par_id3155891" xml-lang="en-US">You can specify the behavior for the arrow keys by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</note>
<h3 id="hd_id3149993" xml-lang="en-US">To Change the Width of a Cell</h3>
<paragraph id="par_id3148676" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key</paragraph>
<h2 id="hd_id3153014" xml-lang="en-US">Changing the Height of a Row</h2>
@@ -90,9 +86,13 @@
<listitem>
<paragraph id="par_id1279030" role="paragraph" xml-lang="en-US">Click inside the table. Choose <item type="menuitem">Table - Properties</item> to open a dialog and set the properties to the numbers.</paragraph>
</listitem></list>
-<paragraph id="par_id5009308" role="tip" xml-lang="en-US">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A twice to select the whole table, then choose <emph>Insert - Frame</emph>.</paragraph>
-<paragraph id="par_id4190496" role="note" xml-lang="en-US">Tables within HTML pages do not offer the full range of properties and commands as tables in OpenDocument format.</paragraph><embed href="text/shared/00/00000004.xhp#related"/><embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
-<embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/><embed href="text/swriter/guide/ruler.xhp#ruler"/>
+<tip id="par_id5009308" xml-lang="en-US">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A twice to select the whole table, then choose <emph>Insert - Frame</emph>.</tip>
+<note id="par_id4190496" xml-lang="en-US">Tables within HTML pages do not offer the full range of properties and commands as tables in OpenDocument format.</note>
+<section id="relatedtopics">
+<embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
+<embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
+<embed href="text/swriter/guide/ruler.xhp#ruler"/>
+<embed href="text/shared/02/04210000.xhp#optimizeh1"/>
+</section>
</body>
</helpdocument>
diff --git a/source/text/swriter/main0110.xhp b/source/text/swriter/main0110.xhp
index 4faa4b504d..621aef754a 100644
--- a/source/text/swriter/main0110.xhp
+++ b/source/text/swriter/main0110.xhp
@@ -88,26 +88,26 @@
<h3 id="par_idN106E9" xml-lang="en-US">Row Height</h3>
<paragraph id="par_idN106EC" role="paragraph" xml-lang="en-US">Opens the Row Height dialog where you can change the height of a row.</paragraph>
-<h3 id="hd_id451605990864684">Minimize Row Height</h3>
-<paragraph role="paragraph" id="par_id261605990897312">Set the row height to the smallest possible for the content in each selected row.</paragraph>
+<h3 id="hd_id451605990864684">Minimal Row Height</h3>
+<embed href="text/shared/01/minimal_row_height.xhp#minimal_row_height_text"/>
<h3 id="par_idN106EF" xml-lang="en-US"><link href="text/swriter/01/05110200.xhp">Optimal Row Height</link></h3>
-<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
+<embed href="text/swriter/01/05110200.xhp#optimal_row_height_text"/>
<h3 id="par_idN10706" xml-lang="en-US"><link href="text/shared/01/05110600m.xhp">Distribute Rows Evenly</link></h3>
-<embed href="text/shared/01/05110600m.xhp#verteilentext"/>
+<embed href="text/shared/01/05110600m.xhp#distribute_rows_text"/>
<h3 id="par_idN106B5" xml-lang="en-US">Column Width</h3>
<paragraph id="par_idN106B8" role="paragraph" xml-lang="en-US">Opens the Column Width dialog where you can change the width of a column.</paragraph>
-<h3 id="hd_id671605991381461">Minimize Column Width</h3>
-<paragraph role="paragraph" id="par_id581605991965966">Set column width to the smallest possible for the content in each selected column.</paragraph>
+<h3 id="hd_id671605991381461">Minimal Column Width</h3>
+<embed href="text/shared/01/minimal_column_width.xhp#minimal_column_width_text"/>
<h3 id="par_idN106BB" xml-lang="en-US"><link href="text/swriter/01/05120200.xhp">Optimal Column Width</link></h3>
-<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
+<embed href="text/swriter/01/05120200.xhp#column_width_text"/>
<h3 id="par_idN106D2" xml-lang="en-US"><link href="text/shared/01/05120600.xhp">Distribute Columns Evenly</link></h3>
-<embed href="text/shared/01/05120600.xhp#verteilentext"/>
+<embed href="text/shared/01/05120600.xhp#distribute_columns_text"/>
<h2 id="par_idN105B7" xml-lang="en-US"><link href="text/shared/01/05100100.xhp">Merge Cells</link></h2>
<embed href="text/shared/01/05100100.xhp#verbindentext"/>