source/text/shared/01/DeleteColumns.xhp | 2
source/text/shared/01/DeleteRows.xhp | 2
source/text/shared/01/DeleteTable.xhp | 2
source/text/shared/01/SelectTable.xhp | 2
source/text/shared/01/SetOptimalRowHeight.xhp | 5 -
source/text/swriter/00/00000405.xhp | 37 +++++++--
source/text/swriter/01/05120400.xhp | 7 +
source/text/swriter/main0110.xhp | 104 ++++++++++++++++++--------
8 files changed, 115 insertions(+), 46 deletions(-)
New commits:
commit d50121f44bc54b22ccc603093cf5fd0b75f26155
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Apr 22 17:10:39 2024 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Apr 23 12:36:51 2024 +0200
tdf#102265 More work on Impress format menu (5)
Change-Id: Ia1eb00e126f8609091464599a364f0da4e8dd38a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166471
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/01/DeleteColumns.xhp
b/source/text/shared/01/DeleteColumns.xhp
index 6ffcdf36c6..ab1e8901cd 100644
--- a/source/text/shared/01/DeleteColumns.xhp
+++ b/source/text/shared/01/DeleteColumns.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteColumns"
localize="false"/>
<section id="delete_columns">
- <h1 id="hd_id941693687739390"><variable id="h1"><switchinline
select="appl"><caseinline select="WRITER"><link
href="text/shared/01/DeleteColumns.xhp">Columns</link></caseinline><caseinline
select="CALC"><link href="text/shared/01/DeleteColumns.xhp">Delete
Columns</link></caseinline></switchinline></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><switchinline
select="appl"><caseinline select="WRITER"><link
href="text/shared/01/DeleteColumns.xhp">Columns</link></caseinline><defaultinline><link
href="text/shared/01/DeleteColumns.xhp">Delete
Columns</link></defaultinline></switchinline></variable></h1>
<paragraph id="par_idN10616" role="paragraph">Deletes the selected
columns.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/DeleteRows.xhp
b/source/text/shared/01/DeleteRows.xhp
index 2075f8e195..54f03c2854 100644
--- a/source/text/shared/01/DeleteRows.xhp
+++ b/source/text/shared/01/DeleteRows.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteRows"
localize="false"/>
<section id="delete_rows">
- <h1 id="hd_id941693687739390"><variable id="h1"><switchinline
select="appl"><caseinline select="WRITER"> <link
href="text/shared/01/DeleteRows.xhp">Rows</link></caseinline><caseinline
select="CALC"><link href="text/shared/01/DeleteRows.xhp">Delete
Rows</link></caseinline></switchinline></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><switchinline
select="appl"><caseinline select="WRITER"><link
href="text/shared/01/DeleteRows.xhp">Rows</link></caseinline><defaultinline><link
href="text/shared/01/DeleteRows.xhp">Delete
Rows</link></defaultinline></switchinline></variable></h1>
<paragraph id="par_idN10616" role="paragraph">Deletes the selected
rows.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/DeleteTable.xhp
b/source/text/shared/01/DeleteTable.xhp
index 810b877043..a47587de93 100644
--- a/source/text/shared/01/DeleteTable.xhp
+++ b/source/text/shared/01/DeleteTable.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteTable"
localize="false"/>
<section id="delete_table">
- <h1 id="hd_id941693687739390"><variable id="h1"><link
href="text/shared/01/DeleteTable.xhp">Table</link></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><link
href="text/shared/01/DeleteTable.xhp">Delete Table</link></variable></h1>
<paragraph id="par_idN10616" role="paragraph">Deletes the current
table.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/SelectTable.xhp
b/source/text/shared/01/SelectTable.xhp
index 0441953354..7c9327a113 100644
--- a/source/text/shared/01/SelectTable.xhp
+++ b/source/text/shared/01/SelectTable.xhp
@@ -18,7 +18,7 @@
<body>
<bookmark id="bm_id891693687739389" branch="hid/.uno:SelectTable"
localize="false"/>
<section id="select_table">
- <h1 id="hd_id941693687739390"><variable id="h1"><link
href="text/shared/01/SelectTable.xhp">Table</link></variable></h1>
+ <h1 id="hd_id941693687739390"><variable id="h1"><link
href="text/shared/01/SelectTable.xhp">Select Table</link></variable></h1>
<paragraph role="paragraph" id="par_idN10626">Selects the current
table.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/01/SetOptimalRowHeight.xhp
b/source/text/shared/01/SetOptimalRowHeight.xhp
index 18174368b6..bdc56accf4 100644
--- a/source/text/shared/01/SetOptimalRowHeight.xhp
+++ b/source/text/shared/01/SetOptimalRowHeight.xhp
@@ -35,11 +35,8 @@
<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>
+ <paragraph role="paragraph" id="par_id441713804246210">Set row
height for selected table rows so that each row has the same height as the row
with the tallest content.</paragraph>
</default>
</switch>
</section>
diff --git a/source/text/swriter/00/00000405.xhp
b/source/text/swriter/00/00000405.xhp
index ee90827495..614ba11745 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -519,7 +519,15 @@
</section>
<section id="select_table">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
- <paragraph id="par_id91693738574824" role="paragraph">Choose
<emph>Table - Select - Table</emph>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph id="par_id91693738574824" role="paragraph">Choose
<emph>Table - Select - Table</emph>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <paragraph role="paragraph" id="par_id401713819764756">Choose
<menuitem>Format - Table - Select</menuitem>.</paragraph>
+ </default>
+ </switch>
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id391693741329079">Choose
<menuitem>Table - Select Table</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
@@ -535,8 +543,12 @@
</tablerow>
</table>
</section>
- <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
- <paragraph role="paragraph" id="par_id381693738669400">Choose
<menuitem>Properties - Table - Table</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+ <paragraph role="paragraph" id="par_id381693738669400">Choose
<menuitem>Properties - Table - Table</menuitem>.</paragraph>
+ </case>
+ </switch>
</section>
<section id="object_properties">
@@ -572,7 +584,15 @@
<section id="delete_table">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
- <paragraph role="paragraph" id="par_id131693690148929">Choose
<menuitem>Table - Delete - Table</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <paragraph role="paragraph" id="par_id131693690148929">Choose
<menuitem>Table - Delete - Table</menuitem>.</paragraph>
+ </case>
+ <case select="CALC"></case>
+ <default>
+ <paragraph role="paragraph" id="par_id401713820421114">Choose
<menuitem>Format - Table - Delete Table</menuitem>.</paragraph>
+ </default>
+ </switch>
<embed href="text/shared/00/00000004.xhp#from_context"/>
<paragraph role="paragraph" id="par_id531693690152814">Choose
<menuitem>Delete - Table</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
@@ -586,9 +606,14 @@
</tablecell>
</tablerow>
</table>
- <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
- <paragraph role="paragraph" id="par_id691693690135938">Choose
<menuitem>Properties - Table - Delete Table</menuitem>.</paragraph>
+ <switch select="appl">
+ <case select="WRITER">
+ <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+ <paragraph role="paragraph" id="par_id691693690135938">Choose
<menuitem>Properties - Table - Delete Table</menuitem>.</paragraph>
+ </case>
+ </switch>
</section>
+
<section id="delete_table_menu">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
<paragraph role="paragraph" id="par_id61693691400020">Choose
<menuitem>Table - Delete</menuitem>.</paragraph>
diff --git a/source/text/swriter/01/05120400.xhp
b/source/text/swriter/01/05120400.xhp
index a43577550d..2bea4c5486 100644
--- a/source/text/swriter/01/05120400.xhp
+++ b/source/text/swriter/01/05120400.xhp
@@ -31,9 +31,12 @@
<paragraph role="paragraph" id="par_idN1058C"><ahelp hid="."
visibility="hidden">Inserts a row into the table.</ahelp></paragraph>
<bookmark branch="hid/.uno:InsertColumnDialog" id="bm_id3149874"
localize="false"/>
<paragraph role="paragraph" id="par_idN105A7"><ahelp hid="."
visibility="hidden">Inserts a column into the table.</ahelp></paragraph>
-<h1 id="hd_id3148489">Insert Columns/Rows</h1>
+
+<section id="insertcolumnsrows">
+ <h1 id="hd_id3148489"><variable id="h1"><link
href="text/swriter/01/05120400.xhp">Insert Columns/Rows</link></variable></h1>
<paragraph role="paragraph" id="par_id3151241"><variable
id="einfuegentext">Inserts a row or column into the table. This command is only
available when the cursor is in a table.
-</variable></paragraph>
+ </variable></paragraph>
+</section>
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#insert_columns_rows"/>
</section>
diff --git a/source/text/swriter/main0110.xhp b/source/text/swriter/main0110.xhp
index 63e8bbfb98..dd809cec74 100644
--- a/source/text/swriter/main0110.xhp
+++ b/source/text/swriter/main0110.xhp
@@ -45,37 +45,81 @@
</default>
</switch>
</section>
-<embed href="text/swriter/01/04150000.xhp#inserttable"/>
-
-<embed href="text/swriter/01/TableInsertMenu.xhp#insertmenu"/>
-<embed href="text/swriter/01/TableDeleteMenu.xhp#deletemenu"/>
-<embed href="text/swriter/01/TableSelectMenu.xhp#selectmenu"/>
-<embed href="text/swriter/01/TableAutoFitMenu.xhp#table_size_menu"/>
-
-<embed href="text/shared/01/05100100.xhp#merge_cells"/>
-<embed href="text/shared/01/05100200.xhp#split_cells"/>
-
-<embed href="text/swriter/01/05200000.xhp#merge_table"/>
-<embed href="text/swriter/01/05190000.xhp#split_table"/>
-
-<embed href="text/shared/01/Protect.xhp#protect"/>
-<embed href="text/swriter/01/05100400.xhp#unprotect"/>
-
-<embed href="text/shared/01/AutoFormat.xhp#autoformat"/>
-
-<embed href="text/shared/01/05020300.xhp#numbersh1"/>
-
-<embed href="text/swriter/01/TableNumberRecognition.xhp#numberrecognition"/>
-<embed href="text/swriter/01/HeadingRowsRepeat.xhp#HeadingRowsRepeat"/>
-
-<embed href="text/swriter/01/RowSplit.xhp#rowsplit"/>
-
-<embed href="text/swriter/01/TableConvertMenu.xhp#convertmenu"/>
-
-<embed href="text/swriter/main0214.xhp#formula_bar"/>
-<embed href="text/swriter/01/06100000.xhp#sorttable"/>
-
+<switch select="appl">
+ <case select="WRITER">
+ <embed href="text/swriter/01/04150000.xhp#inserttable"/>
+
+ <embed href="text/swriter/01/TableInsertMenu.xhp#insertmenu"/>
+ <embed href="text/swriter/01/TableDeleteMenu.xhp#deletemenu"/>
+ <embed href="text/swriter/01/TableSelectMenu.xhp#selectmenu"/>
+ <embed href="text/swriter/01/TableAutoFitMenu.xhp#table_size_menu"/>
+
+ <embed href="text/shared/01/05100100.xhp#merge_cells"/>
+ <embed href="text/shared/01/05100200.xhp#split_cells"/>
+
+ <embed href="text/swriter/01/05200000.xhp#merge_table"/>
+ <embed href="text/swriter/01/05190000.xhp#split_table"/>
+
+ <embed href="text/shared/01/Protect.xhp#protect"/>
+ <embed href="text/swriter/01/05100400.xhp#unprotect"/>
+
+ <embed href="text/shared/01/AutoFormat.xhp#autoformat"/>
+
+ <embed href="text/shared/01/05020300.xhp#numbersh1"/>
+
+ <embed
href="text/swriter/01/TableNumberRecognition.xhp#numberrecognition"/>
+ <embed href="text/swriter/01/HeadingRowsRepeat.xhp#HeadingRowsRepeat"/>
+
+ <embed href="text/swriter/01/RowSplit.xhp#rowsplit"/>
+
+ <embed href="text/swriter/01/TableConvertMenu.xhp#convertmenu"/>
+
+ <embed href="text/swriter/main0214.xhp#formula_bar"/>
+ <embed href="text/swriter/01/06100000.xhp#sorttable"/>
+ </case>
+ <case select="CALC"></case>
+ <case select="IMPRESS">
+ <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/shared/01/EntireRow.xhp#entire_row"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteRows.xhp#delete_rows"/>
+
+ <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"/>
+ <embed href="text/shared/01/EntireColumn.xhp#entire_column"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteColumns.xhp#delete_columns"/>
+
+ <embed href="text/shared/01/05100100.xhp#merge_cells"/>
+ <embed href="text/shared/01/05100200.xhp#split_cells"/>
+ <embed href="text/shared/01/DeleteTable.xhp#delete_table"/>
+ <embed href="text/shared/01/SelectTable.xhp#select_table"/>
+ </case>
+ <case select="DRAW">
+ <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/shared/01/EntireRow.xhp#entire_row"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteRows.xhp#delete_rows"/>
+
+ <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"/>
+ <embed href="text/shared/01/EntireColumn.xhp#entire_column"/>
+ <embed href="text/swriter/01/05120400.xhp#insertcolumnsrows"/>
+ <embed href="text/shared/01/DeleteColumns.xhp#delete_columns"/>
+
+ <embed href="text/shared/01/05100100.xhp#merge_cells"/>
+ <embed href="text/shared/01/05100200.xhp#split_cells"/>
+ <embed href="text/shared/01/DeleteTable.xhp#delete_table"/>
+ <embed href="text/shared/01/SelectTable.xhp#select_table"/>
+ </case>
+</switch>
<h2 id="par_idN10617"><link
href="text/swriter/01/05090000.xhp">Properties</link></h2>
<embed href="text/swriter/01/05090000.xhp#tabletext"/>
</body>
