source/text/shared/01/05100200.xhp | 6 +++-- source/text/swriter/00/00000405.xhp | 26 ++++++++++++++++++++++-- source/text/swriter/01/05190000.xhp | 38 ++++++++++++++++++------------------ source/text/swriter/01/05200000.xhp | 22 ++++++++++---------- source/text/swriter/main0110.xhp | 6 +---- 5 files changed, 60 insertions(+), 38 deletions(-)
New commits: commit 5f31e41620bb668c611701c87a9f2b1cbf3c93c9 Author: Olivier Hallot <[email protected]> AuthorDate: Thu Sep 7 10:00:58 2023 -0300 Commit: Olivier Hallot <[email protected]> CommitDate: Fri Sep 8 11:57:46 2023 +0200 tdf#155875 UI cmds Writer/Table in Help(33) + refactoring + Table - split/merge table (part 33) Change-Id: I86a47fc6b6941d7efd89e485e299271bea737826 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156677 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/source/text/shared/01/05100200.xhp b/source/text/shared/01/05100200.xhp index 482a0b3d7f..662c62bcd0 100644 --- a/source/text/shared/01/05100200.xhp +++ b/source/text/shared/01/05100200.xhp @@ -44,8 +44,10 @@ </section> </case> <default> - <h1 id="hd_id3154654"><variable id="splitcells"><link href="text/shared/01/05100200.xhp">Split Cells</link></variable></h1> - <paragraph role="paragraph" id="par_id3083451"><variable id="teilentext"><ahelp hid=".">Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into.</ahelp></variable></paragraph> + <section id="split_cells"> + <h1 id="hd_id3154654"><variable id="splitcells"><link href="text/shared/01/05100200.xhp">Split Cells</link></variable></h1> + <paragraph role="paragraph" id="par_id3083451"><variable id="teilentext"><ahelp hid=".">Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into.</ahelp></variable></paragraph> + </section> </default> </switch> <section id="howtoget"> diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp index c947f2d49b..167397b411 100644 --- a/source/text/swriter/00/00000405.xhp +++ b/source/text/swriter/00/00000405.xhp @@ -260,8 +260,30 @@ </table> </section> </section> - <paragraph id="par_id3149377" role="paragraph"><variable id="tabauf">Choose <emph>Table - Split Table</emph>.</variable></paragraph> - <paragraph id="par_id3155810" role="paragraph"><variable id="tabverb">Choose <emph>Table - Merge Table</emph>.</variable></paragraph> + +<section id="tablesplit"> + <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> + <paragraph id="par_id3149377" role="paragraph"><variable id="tabauf">Choose <emph>Table - Split Table</emph>.</variable></paragraph> + <embed href="text/shared/00/00000004.xhp#from_tabUI"/> + <paragraph role="paragraph" id="par_id681694089066094">Choose <menuitem>Table - Split Table</menuitem>.</paragraph> + <embed href="text/shared/00/00000004.xhp#from_toolbars"/> + <table id="tab_id101694089080239"> + <tablerow> + <tablecell> + <paragraph id="par_id331694089080241" role="paragraph"><image src="cmd/lc_splittable.svg" id="img_id61694089080242" width="1cm" height="1cm"><alt id="alt_id791694089080243">Icon Split Table</alt></image></paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id641694089080245" role="paragraph">Split Table</paragraph> + </tablecell> + </tablerow> + </table> + <embed href="text/shared/00/00000004.xhp#from_sidebar"/> + <paragraph role="paragraph" id="par_id181694089212408">On the <menuitem>Table</menuitem> deck of the <menuitem>Properties</menuitem> panel, click on <menuitem>Split Table</menuitem>.</paragraph> +</section> +<section id="tablemerge"> + <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> + <paragraph id="par_id3155810" role="paragraph"><variable id="tabverb">Choose <emph>Table - Merge Table</emph>.</variable></paragraph> +</section> <paragraph id="par_id3151233" role="paragraph"><variable id="tabformat">Choose <emph>Table - Properties - Table</emph> tab.</variable></paragraph> <paragraph id="par_id3154255" role="paragraph"><variable id="spaltentab">Choose <emph>Table - Properties - Columns</emph> tab.</variable></paragraph> <paragraph id="par_id3153140" role="paragraph"><variable id="tabelletextfluss">Choose <emph>Table - Properties - Text Flow</emph> tab.</variable></paragraph> diff --git a/source/text/swriter/01/05190000.xhp b/source/text/swriter/01/05190000.xhp index 38851d7ed9..cad232864c 100644 --- a/source/text/swriter/01/05190000.xhp +++ b/source/text/swriter/01/05190000.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="textswriter0105190000xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Split Table</title> +<title id="tit">Split Table</title> <filename>/text/swriter/01/05190000.xhp</filename> </topic> <history> @@ -31,32 +28,35 @@ </meta> <body> <section id="split_table"> -<bookmark xml-lang="en-US" branch="index" id="bm_id3153246"><bookmark_value>tables; splitting</bookmark_value> +<bookmark branch="index" id="bm_id3153246"><bookmark_value>tables; splitting</bookmark_value> <bookmark_value>splitting tables; at cursor position</bookmark_value> <bookmark_value>dividing tables</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/.uno:SplitTable" id="bm_id3037041" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/SplitTableDialog" id="bm_id3154654" localize="false"/> +<bookmark branch="hid/.uno:SplitTable" id="bm_id3037041" localize="false"/> +<bookmark branch="hid/modules/swriter/ui/splittable/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> +<bookmark branch="hid/modules/swriter/ui/splittable/SplitTableDialog" id="bm_id3154654" localize="false"/> <h1 id="hd_id3153246"><link href="text/swriter/01/05190000.xhp">Split Table</link></h1> -<paragraph role="paragraph" id="par_id3083450" xml-lang="en-US"><ahelp hid=".uno:SplitTable">Splits the current table into two separate tables at the cursor position.</ahelp> You can also access this command by right-clicking in a table cell.</paragraph> +<paragraph role="paragraph" id="par_id3083450"><ahelp hid=".uno:SplitTable">Splits the current table into two separate tables at the cursor position.</ahelp> You can also access this command by right-clicking in a table cell.</paragraph> </section> <section id="howtoget"> - <embed href="text/swriter/00/00000405.xhp#tabauf"/> + <embed href="text/swriter/00/00000405.xhp#tablesplit"/> </section> <h2 id="hd_id3149351">Mode</h2> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/copyheading" id="bm_id3153002" localize="false"/> +<bookmark branch="hid/modules/swriter/ui/splittable/copyheading" id="bm_id3153002" localize="false"/> <h3 id="hd_id3154554">Copy heading</h3> -<paragraph role="paragraph" id="par_id3154503" xml-lang="en-US"><ahelp hid="modules/swriter/ui/splittable/copyheading">Includes the first row of the original table as the first row of the second table.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/customheadingapplystyle" id="bm_id3145247" localize="false"/> +<paragraph role="paragraph" id="par_id3154503"><ahelp hid="modules/swriter/ui/splittable/copyheading">Includes the first row of the original table as the first row of the second table.</ahelp></paragraph> +<bookmark branch="hid/modules/swriter/ui/splittable/customheadingapplystyle" id="bm_id3145247" localize="false"/> <h3 id="hd_id3149880">Custom heading (apply style)</h3> -<paragraph role="paragraph" id="par_id3148389" xml-lang="en-US"><ahelp hid="modules/swriter/ui/splittable/customheadingapplystyle">Inserts a blank header row in the second table that is formatted with the style of the first row in the original table.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/customheading" id="bm_id3148775" localize="false"/> +<paragraph role="paragraph" id="par_id3148389"><ahelp hid="modules/swriter/ui/splittable/customheadingapplystyle">Inserts a blank header row in the second table that is formatted with the style of the first row in the original table.</ahelp></paragraph> +<bookmark branch="hid/modules/swriter/ui/splittable/customheading" id="bm_id3148775" localize="false"/> <h3 id="hd_id3150568">Custom heading</h3> -<paragraph role="paragraph" id="par_id3149027" xml-lang="en-US"><ahelp hid="modules/swriter/ui/splittable/customheading">Inserts an additional blank row in the second table.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/noheading" id="bm_id3147173" localize="false"/> +<paragraph role="paragraph" id="par_id3149027"><ahelp hid="modules/swriter/ui/splittable/customheading">Inserts an additional blank row in the second table.</ahelp></paragraph> +<bookmark branch="hid/modules/swriter/ui/splittable/noheading" id="bm_id3147173" localize="false"/> <h3 id="hd_id3153720">No heading</h3> -<paragraph role="paragraph" id="par_id3156318" xml-lang="en-US"><ahelp hid="modules/swriter/ui/splittable/noheading">Splits the table without copying the header row.</ahelp></paragraph> -<paragraph role="warning" id="par_id3145411" xml-lang="en-US">When you split a table that contains formulas, the formulas may be affected.</paragraph> +<paragraph role="paragraph" id="par_id3156318"><ahelp hid="modules/swriter/ui/splittable/noheading">Splits the table without copying the header row.</ahelp></paragraph> +<warning id="par_id3145411">When you split a table that contains formulas, the formulas may be affected.</warning> + <section id="relatedtopics"> + <embed href="text/swriter/main0110.xhp#h1"/> + </section> </body> </helpdocument> diff --git a/source/text/swriter/01/05200000.xhp b/source/text/swriter/01/05200000.xhp index 4f6620d93a..53f9304606 100644 --- a/source/text/swriter/01/05200000.xhp +++ b/source/text/swriter/01/05200000.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="textswriter0105200000xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Merge Table </title> +<title id="tit">Merge Table </title> <filename>/text/swriter/01/05200000.xhp</filename> </topic> <history> @@ -31,18 +28,21 @@ </meta> <body> <section id="merge_table"> -<bookmark xml-lang="en-US" branch="index" id="bm_id3154652"><bookmark_value>tables; merging</bookmark_value> +<bookmark branch="index" id="bm_id3154652"><bookmark_value>tables; merging</bookmark_value> <bookmark_value>merging; tables</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/.uno:MergeTable" id="bm_id6690819" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mergetabledialog/MergeTableDialog" id="bm_id3149048" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mergetabledialog/@@nowidget@@" id="@@nowidget@@" localize="false"/> +<bookmark branch="hid/.uno:MergeTable" id="bm_id6690819" localize="false"/> +<bookmark branch="hid/modules/swriter/ui/mergetabledialog/MergeTableDialog" id="bm_id3149048" localize="false"/> +<bookmark branch="hid/modules/swriter/ui/mergetabledialog/@@nowidget@@" id="@@nowidget@@" localize="false"/> <h1 id="hd_id3154652"><link href="text/swriter/01/05200000.xhp">Merge Table</link></h1> -<paragraph role="paragraph" id="par_id3147401" xml-lang="en-US"><ahelp hid=".">Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3147401"><ahelp hid=".">Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph.</ahelp></paragraph> </section> <section id="howtoget"> - <embed href="text/swriter/00/00000405.xhp#tabverb"/> + <embed href="text/swriter/00/00000405.xhp#tablemerge"/> </section> -<paragraph role="paragraph" id="par_id3146325" xml-lang="en-US">If you choose this command when the cursor is in the middle of three consecutive tables, you are prompted to select the table that you want to merge with.</paragraph> +<paragraph role="paragraph" id="par_id3146325">If you choose this command when the cursor is in the middle of three consecutive tables, you are prompted to select the table that you want to merge with.</paragraph> + <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 5fcf403f8b..5d2c190bc5 100644 --- a/source/text/swriter/main0110.xhp +++ b/source/text/swriter/main0110.xhp @@ -45,11 +45,9 @@ <embed href="text/swriter/01/TableSelectMenu.xhp#selectmenu"/> <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"/> +<embed href="text/shared/01/05100100.xhp#merge_cells"/> +<embed href="text/shared/01/05100200.xhp#split_cells"/> -<h2 id="par_idN105BB"><link href="text/shared/01/05100200.xhp">Split Cells</link></h2> -<embed href="text/shared/01/05100200.xhp#teilentext"/> <embed href="text/swriter/01/05200000.xhp#merge_table"/> <embed href="text/swriter/01/05190000.xhp#split_table"/>
