AllLangHelp_shared.mk | 1 AllLangHelp_simpress.mk | 1 source/text/shared/01/insert_table.xhp | 105 ++++++++++++++++++++++++++++ source/text/simpress/00/00000404.xhp | 11 ++ source/text/simpress/01/04080100.xhp | 39 ---------- source/text/simpress/guide/table_insert.xhp | 9 +- source/text/simpress/main0104.xhp | 3 source/text/swriter/01/04150000.xhp | 53 ++++++++++---- 8 files changed, 162 insertions(+), 60 deletions(-)
New commits: commit 2f70c8aa2a700cad40257f020998c8dce5ed3dda Author: Dione Maddern <[email protected]> AuthorDate: Mon Jun 17 20:14:12 2024 +0200 Commit: Olivier Hallot <[email protected]> CommitDate: Tue Jun 18 14:17:31 2024 +0200 tdf#118588 Relevant help information for Impress Insert Table Created a new file text/shared/01/insert_table.xhp - Moved help content for Insert > Insert Table in Impress and Draw from text/simpress/01/04080100.xhp to a new file. - Moved hid bookmarks from text/simpress/01/04080100.xhp and text/swriter/01/04150000.xhp to the new file. Even though these are technically different ui components, they all use the same HID and pressing F1 or Help was opening the help file for Writer. - Embedded relevant help content for Writer to avoid retransalation. Deleted text/simpress/01/04080100.xhp In AllLangHelp_shared.mk - Added a reference to text/shared/01/insert_table.xhp In AllLangHelp_simpress.mk - Removed the reference to text/simpress/01/04080100.xhp In text/simpress/guide/table_insert.xhp - Changed title and H1 to make it clearer that the article is about both Tables and Spreadsheets. In text/simpress/main0104.xhp - Added variable tags so that the page can be more easily linked from other pages In text/simpress/00/00000404.xhp - Updated howtoget information to include information for the TabUI Change-Id: I16626a0bb467e475571185571348f26ce745af8c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169013 Reviewed-by: Olivier Hallot <[email protected]> Tested-by: Jenkins diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 71002db590..9499cd1e8f 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -372,6 +372,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/InsertColumnsBefore \ helpcontent2/source/text/shared/01/InsertRowsAfter \ helpcontent2/source/text/shared/01/InsertRowsBefore \ + helpcontent2/source/text/shared/01/insert_table \ helpcontent2/source/text/shared/01/mediaplayer \ helpcontent2/source/text/shared/01/menu_edit_find \ helpcontent2/source/text/shared/01/menu_view_sidebar \ diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk index e79a530b61..b3578315a6 100644 --- a/AllLangHelp_simpress.mk +++ b/AllLangHelp_simpress.mk @@ -58,7 +58,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\ helpcontent2/source/text/simpress/01/04030000m \ helpcontent2/source/text/simpress/01/04030100 \ helpcontent2/source/text/simpress/01/04040000m \ - helpcontent2/source/text/simpress/01/04080100 \ helpcontent2/source/text/simpress/01/04110100 \ helpcontent2/source/text/simpress/01/04110200 \ helpcontent2/source/text/simpress/01/04120000 \ diff --git a/source/text/shared/01/insert_table.xhp b/source/text/shared/01/insert_table.xhp new file mode 100644 index 0000000000..e66e5892b1 --- /dev/null +++ b/source/text/shared/01/insert_table.xhp @@ -0,0 +1,105 @@ +<?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="text/shared/01/insert_table.xhp" +indexer="include" status="PUBLISH"> + <title id="tit">Insert Table</title> + <filename>/text/shared/01/insert_table.xhp</filename> + </topic> + </meta> + <body> +<bookmark branch="index" id="bm_id391717784692346"> + <bookmark_value>Insert Table</bookmark_value> + <bookmark_value>inserting; tables</bookmark_value> + <bookmark_value>tables; inserting</bookmark_value> +</bookmark> +<bookmark xml-lang="en-US" branch="hid/.uno:InsertSpreadsheet" +id="bm_id3150012" localize="false"/> +<bookmark xml-lang="en-US" +branch="hid/cui/ui/newtabledialog/NewTableDialog" id="bm_id0916200804233395" +localize="false"/> +<bookmark xml-lang="en-US" branch="hid/cui/ui/newtabledialog/@@nowidget@@" +id="bm_id0916200804233395" localize="false"/> +<bookmark branch="hid/.uno:InsertTable" id="bm_id3151392" localize="false"/> +<bookmark branch="hid/modules/swriter/ui/inserttable/@@nowidget@@" +id="bm_@@nowidget@@" localize="false"/> +<bookmark branch="hid/modules/swriter/ui/inserttable/InsertTableDialog" +id="bm_id3151394" localize="false"/> + +<section id="inserttable"> + <h1 id="hd_id3148576"><variable +id="insert_table_h1"><link href="text/shared/01/insert_table.xhp">Insert +Table</link></variable></h1> + <paragraph role="paragraph" id="par_id3146975" xml-lang="en-US">Inserts a new +table into the current <switchinline +select="appl"><caseinline +select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline> +</switchinline>.</paragraph> +</section> +<section id="howtoget"> + <switch select="appl"> + <case select="WRITER"> + <embed href="text/swriter/00/00000404.xhp#insert_table"/> + </case> + <default> + <embed href="text/simpress/00/00000404.xhp#insert_table"/> + </default> + </switch> +</section> +<switch select="appl"> + <case select="WRITER"> + <embed href="text/swriter/01/04150000.xhp#name"/> + </case> + <default> + </default> +</switch> +<section id="columns"> + <h2 id="hd_id941717700034471">Number of Columns</h2> + <paragraph role="paragraph" id="par_id461717700080123">Enter the number of +columns to include in the new table or use the spin box to increase or decrease +the number of columns.</paragraph> + </section> + <section id="rows"> + <h2 id="hd_id111717700065106">Number of Rows</h2> + <paragraph role="paragraph" id="par_id301717700163556">Enter the number of +rows to include in the new table or use the spin box to increase or decrease the +number of rows.</paragraph> + </section> + <switch select="appl"> + <case select="WRITER"> + <embed href="text/swriter/01/04150000.xhp#options"/> + <bookmark branch="hid/modules/swriter/ui/inserttable/formatlbinstable" +id="bm_id3147226" localize="false"/> + <embed href="text/swriter/01/04150000.xhp#table_styles"/> + </case> + <default> + </default> + </switch> +<section id="relatedtopics"> + <switch select="appl"> + <case select="WRITER"> + <embed href="text/swriter/guide/table_insert.xhp#table_insert"/> + <embed href="text/swriter/guide/keyboard.xhp#keyboard"/> + <embed href="text/shared/guide/border_table.xhp#border_table"/> + <embed href="text/swriter/01/05090300.xhp#h1"/> + <paragraph role="paragraph" id="par_id3150688"> + <link href="text/shared/optionen/01040500.xhp"> Table + (Options)</link></paragraph> + </case> + <default> + <embed href="text/simpress/main0104.xhp#insert_h1"/> + <embed href="text/simpress/guide/table_insert.xhp#table_insert"/> + </default> + </switch> +</section> +</body> +</helpdocument> diff --git a/source/text/simpress/00/00000404.xhp b/source/text/simpress/00/00000404.xhp index 555134bf98..06d9809a3d 100644 --- a/source/text/simpress/00/00000404.xhp +++ b/source/text/simpress/00/00000404.xhp @@ -53,9 +53,14 @@ <paragraph role="paragraph" id="par_id3145388"><variable id="efglbe">Select a snap point or line, open the context menu, and choose <emph>Edit Snap Point/Line</emph></variable></paragraph> <section id="insert_table"> - <paragraph role="paragraph" id="par_id3151239">Choose <emph>Insert - Table</emph></paragraph> - <paragraph role="paragraph" id="par_id3144769">On the <emph>Insert</emph> toolbar, click</paragraph> - <section id="syinsert_table"> + <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> + <paragraph role="paragraph" id="par_id3151239">Choose <emph>Insert - +Table</emph></paragraph> + <embed href="text/shared/00/00000004.xhp#from_tabUI"/> + <paragraph role="paragraph" id="par_id911718630984017">Choose +<menuitem> Insert - Table</menuitem>.</paragraph> + <embed href="text/shared/00/00000004.xhp#from_toolbars"/> + <section id="syinsert_table"> <table id="tbl_id3159208"> <tablerow> <tablecell><paragraph role="paragraph" id="par_id3163703"><image id="img_id3145361" src="cmd/sc_grid.png" width="1cm" height="1cm"><alt id="alt_id3145361">Icon Insert Table</alt></image></paragraph></tablecell> diff --git a/source/text/simpress/01/04080100.xhp b/source/text/simpress/01/04080100.xhp deleted file mode 100644 index d493476278..0000000000 --- a/source/text/simpress/01/04080100.xhp +++ /dev/null @@ -1,39 +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="textsimpress0104080100xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Table</title> -<filename>/text/simpress/01/04080100.xhp</filename> -</topic> -</meta> -<body> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertSpreadsheet" id="bm_id3150012" localize="false"/> -<section id="inserttable"> -<h1 id="hd_id3148576"><link href="text/shared/01/04080100.xhp">Table</link></h1> -<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US"><variable id="tabelletext"><ahelp hid=".">Inserts a new table into the current slide or page.</ahelp></variable></paragraph> -</section> -<section id="howtoget"> -<embed href="text/simpress/00/00000404.xhp#insert_table"/> -</section> -<section id="relatedtopics"> -<embed href="text/simpress/guide/table_insert.xhp#table_insert"/> -</section> -</body> -</helpdocument> diff --git a/source/text/simpress/guide/table_insert.xhp b/source/text/simpress/guide/table_insert.xhp index af43abad7e..f7c7e4f8a4 100644 --- a/source/text/simpress/guide/table_insert.xhp +++ b/source/text/simpress/guide/table_insert.xhp @@ -20,7 +20,8 @@ <meta> <topic id="textsimpressguidetable_insertxml" indexer="include"> -<title id="tit" xml-lang="en-US">Including Spreadsheets in Slides</title> +<title id="tit" xml-lang="en-US">Including Tables and Spreadsheets in +Slides</title> <filename>/text/simpress/guide/table_insert.xhp</filename> </topic> </meta> @@ -29,7 +30,10 @@ <bookmark_value>presentations;inserting spreadsheets</bookmark_value> <bookmark_value>including spreadsheets</bookmark_value> </bookmark> -<h1 id="hd_id3154022" xml-lang="en-US"><variable id="table_insert"><link href="text/simpress/guide/table_insert.xhp">Including Spreadsheets in Slides</link></variable></h1> +<h1 id="hd_id3154022" xml-lang="en-US"><variable id="table_insert"><link +href="text/simpress/guide/table_insert.xhp">Including Tables and Spreadsheets +in +Slides</link></variable></h1> <paragraph role="paragraph" id="par_id4231086" xml-lang="en-US">You can apply different methods to insert spreadsheet cells into your Impress slides or Draw pages:</paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/newtabledialog/NewTableDialog" id="bm_id0916200804233395" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/newtabledialog/@@nowidget@@" id="bm_id0916200804233395" localize="false"/> @@ -135,6 +139,7 @@ <note id="par_id3155256" xml-lang="en-US">The entire spreadsheet is inserted into your slide. If you want to change the sheet that is displayed, double-click the spreadsheet, and then select a different sheet.</note> <section id="relatedtopics"> + <embed href="text/shared/01/insert_table.xhp#insert_table_h1"/> <paragraph role="paragraph" id="par_id3154505" xml-lang="en-US"><link href="text/simpress/01/05130000.xhp">Format - Slide Layout</link></paragraph> <paragraph role="paragraph" id="par_id3150335" xml-lang="en-US"><link href="text/shared/01/04150100.xhp">Insert - OLE Object - OLE Object</link></paragraph> </section> diff --git a/source/text/simpress/main0104.xhp b/source/text/simpress/main0104.xhp index 1f4a5eeb25..958b203325 100644 --- a/source/text/simpress/main0104.xhp +++ b/source/text/simpress/main0104.xhp @@ -30,7 +30,8 @@ <section id="insert"> <bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2743919" localize="false"/> -<h1 id="hd_id3153726"><link href="text/simpress/main0104.xhp">Insert</link></h1> +<h1 id="hd_id3153726"><variable id="insert_h1"><link +href="text/simpress/main0104.xhp">Insert</link></variable></h1> <paragraph id="par_id3146971" role="paragraph" xml-lang="en-US"><ahelp hid=".">This menu contains the commands that are used to insert new elements into the document, for example, graphics, objects, special characters and other files.</ahelp></paragraph> </section> diff --git a/source/text/swriter/01/04150000.xhp b/source/text/swriter/01/04150000.xhp index 425b295ad5..a3ee7b4aaa 100644 --- a/source/text/swriter/01/04150000.xhp +++ b/source/text/swriter/01/04150000.xhp @@ -50,31 +50,56 @@ <paragraph role="paragraph" id="par_id3154638">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph> <embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/> <bookmark branch="hid/modules/swriter/ui/inserttable/nameedit" id="bm_id3147514" localize="false"/> -<h2 id="hd_id3145419">Name</h2> -<paragraph role="paragraph" id="par_id3154099"><ahelp hid="modules/swriter/ui/inserttable/nameedit">Enter a name for the table.</ahelp></paragraph> +<section id="name"> + <h2 id="hd_id3145419">Name</h2> +<paragraph role="paragraph" id="par_id3154099"><ahelp +hid="modules/swriter/ui/inserttable/nameedit">Enter a name for the +table.</ahelp></paragraph> +</section> <bookmark branch="hid/modules/swriter/ui/inserttable/colspin" id="bm_id3154569" localize="false"/> <h3 id="hd_id3153672">Columns</h3> <paragraph role="paragraph" id="par_id3154576"><ahelp hid="modules/swriter/ui/inserttable/colspin">Enter the number of columns that you want in the table.</ahelp></paragraph> <bookmark branch="hid/modules/swriter/ui/inserttable/rowspin" id="bm_id3154470" localize="false"/> <h3 id="hd_id3152954">Rows</h3> <paragraph role="paragraph" id="par_id3154477"><ahelp hid="modules/swriter/ui/inserttable/rowspin">Enter the number of rows that you want in the table.</ahelp></paragraph> -<h2 id="hd_id3155903">Options</h2> -<paragraph role="paragraph" id="par_id3149694">Set the options for the table.</paragraph> -<bookmark branch="hid/modules/swriter/ui/inserttable/headercb" id="bm_id3155181" localize="false"/> +<section id="options"> + <h2 id="hd_id3155903">Options</h2> +<paragraph role="paragraph" id="par_id3149694">Set the options for the +table.</paragraph> +<bookmark branch="hid/modules/swriter/ui/inserttable/headercb" id="bm_id3155181" +localize="false"/> <h3 id="hd_id3154198">Heading</h3> -<paragraph role="paragraph" id="par_id3155188"><ahelp hid="modules/swriter/ui/inserttable/headercb">Includes a heading row in the table.</ahelp></paragraph> -<bookmark branch="hid/modules/swriter/ui/inserttable/repeatcb" id="bm_id3143283" localize="false"/> +<paragraph role="paragraph" id="par_id3155188"><ahelp +hid="modules/swriter/ui/inserttable/headercb">Includes a heading row in the +table.</ahelp></paragraph> +<bookmark branch="hid/modules/swriter/ui/inserttable/repeatcb" id="bm_id3143283" +localize="false"/> <h3 id="hd_id3143270">Repeat heading rows on new pages</h3> -<paragraph role="paragraph" id="par_id3151252"><ahelp hid="modules/swriter/ui/inserttable/repeatcb">Repeats the heading of the table at the top of subsequent page if the table spans more than one page.</ahelp></paragraph> -<bookmark branch="hid/modules/swriter/ui/inserttable/repeatheaderspin" id="bm_id227973" localize="false"/> +<paragraph role="paragraph" id="par_id3151252"><ahelp +hid="modules/swriter/ui/inserttable/repeatcb">Repeats the heading of the table +at the top of subsequent page if the table spans more than one +page.</ahelp></paragraph> +<bookmark branch="hid/modules/swriter/ui/inserttable/repeatheaderspin" +id="bm_id227973" localize="false"/> <h3 id="par_idN10754">Heading rows</h3> -<paragraph role="paragraph" id="par_idN10758"><ahelp hid="modules/swriter/ui/inserttable/repeatheaderspin">Select the number of rows that you want to use for the heading.</ahelp> The spinbox accepts values up to one less than the number of rows being inserted.</paragraph> -<bookmark branch="hid/modules/swriter/ui/inserttable/dontsplitcb" id="bm_id3149100" localize="false"/> +<paragraph role="paragraph" id="par_idN10758"><ahelp +hid="modules/swriter/ui/inserttable/repeatheaderspin">Select the number of rows +that you want to use for the heading.</ahelp> The spinbox accepts values up to +one less than the number of rows being inserted.</paragraph> +<bookmark branch="hid/modules/swriter/ui/inserttable/dontsplitcb" +id="bm_id3149100" localize="false"/> <h3 id="hd_id3149821">Don't split the table over pages</h3> -<paragraph role="paragraph" id="par_id3149106"><ahelp hid="modules/swriter/ui/inserttable/dontsplitcb">Prevents the table from spanning more than one page.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3149106"><ahelp +hid="modules/swriter/ui/inserttable/dontsplitcb">Prevents the table from +spanning more than one page.</ahelp></paragraph> +</section> <bookmark branch="hid/modules/swriter/ui/inserttable/formatlbinstable" id="bm_id3147226" localize="false"/> -<h2 id="hd_id3147213">List of table styles</h2> -<paragraph role="paragraph" id="par_id3149036"><ahelp hid=".">Select a predefined style for the new table.</ahelp></paragraph> +<section +id="table_styles"> + <h2 id="hd_id3147213">List of table styles</h2> +<paragraph role="paragraph" id="par_id3149036"><ahelp hid=".">Select a +predefined style for the new table.</ahelp></paragraph> +</section> <h2 id="hd_id3147575">Icon on the Insert toolbar</h2> <paragraph role="paragraph" id="par_id3153511">On the Insert toolbar, click the <emph>Table</emph> icon to open the <emph>Insert Table</emph> dialog, where you can insert a table in the current document. You can also click the arrow, drag to select the number of rows and columns to include in the table, and then click in the last cell.</paragraph> <embed href="text/swriter/00/00000404.xhp#syinsert_table"/>
