source/text/scalc/00/00000412.xhp | 35 +++++++++++++++++++++++++++--- source/text/scalc/01/12050000.xhp | 14 ++++++------ source/text/scalc/01/12050100.xhp | 22 +++++++++---------- source/text/scalc/01/12050200.xhp | 44 +++++++++++++++++++------------------- 4 files changed, 72 insertions(+), 43 deletions(-)
New commits: commit 461a95979023ee810210b0b69d8497ba8f585dfd Author: Olivier Hallot <[email protected]> AuthorDate: Wed Jan 3 19:27:42 2024 -0300 Commit: Olivier Hallot <[email protected]> CommitDate: Wed Jan 3 23:30:14 2024 +0100 tdf#155876 UI cmds Calc-Sheet menu (41) + Data menu for Calc, subtotals commands + refactoring Change-Id: I83b4c61cad0ba8112c56089c0484fd43aa83cad5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161599 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/source/text/scalc/00/00000412.xhp b/source/text/scalc/00/00000412.xhp index 60471b6ecb..f1bc0189a2 100644 --- a/source/text/scalc/00/00000412.xhp +++ b/source/text/scalc/00/00000412.xhp @@ -238,9 +238,38 @@ </table> </section> - <paragraph role="paragraph" id="par_id3166424"><variable id="dntegs">Choose <emph>Data - Subtotals</emph>.</variable></paragraph> - <paragraph role="paragraph" id="par_id3154574"><variable id="dntezd">Choose <emph>Data - Subtotals - 1st, 2nd, 3rd Group</emph> tabs.</variable></paragraph> - <paragraph role="paragraph" id="par_id3151277"><variable id="dntopi">Choose <emph>Data - Subtotals - Options</emph> tab.</variable></paragraph> + <section id="subtotals_menu"> + <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> + <paragraph role="paragraph" id="par_id3166424"><variable id="dntegs">Choose <emph>Data - Subtotals</emph>.</variable></paragraph> + <embed href="text/shared/00/00000004.xhp#from_tabUI"/> + <paragraph role="paragraph" id="par_id231704304474727">Choose <menuitem>Data - Subtotals</menuitem>.</paragraph> + <paragraph role="paragraph" id="par_id791704304691703">On the <menuitem>Data</menuitem> menu of the <menuitem>Data</menuitem> tab, choose <menuitem>Subtotals</menuitem>.</paragraph> + <embed href="text/shared/00/00000004.xhp#from_toolbars"/> + <table id="tab_id361704304642911"> + <tablerow> + <tablecell> + <paragraph id="par_id601704304642912" role="paragraph"><image src="cmd/lc_datasubtotals.svg" id="img_id161704304642913" width="1cm" height="1cm"><alt id="alt_id281704304642915">Icon Subtotals</alt></image></paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id141704304642917" role="paragraph">Subtotals</paragraph> + </tablecell> + </tablerow> + </table> + </section> + + <section id="1st2nd3rd"> + <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> + <paragraph role="paragraph" id="par_id3154574"><variable id="dntezd">Choose <emph>Data - Subtotals - 1st, 2nd, 3rd Group</emph> tabs.</variable></paragraph> + <embed href="text/shared/00/00000004.xhp#from_tabUI"/> + <paragraph role="paragraph" id="par_id221704305332605">On the <menuitem>Data</menuitem> menu of the <menuitem>Data</menuitem> tab, choose <menuitem>Subtotals - 1st, 2nd or 3rd Group</menuitem> tabs.</paragraph> + </section> + + <section id="subtotoptions"> + <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> + <paragraph role="paragraph" id="par_id3151277"><variable id="dntopi">Choose <emph>Data - Subtotals - Options</emph> tab.</variable></paragraph> + <embed href="text/shared/00/00000004.xhp#from_tabUI"/> + <paragraph role="paragraph" id="par_id431704305670112">On the <menuitem>Data</menuitem> menu of the <menuitem>Data</menuitem> tab, choose <menuitem>Subtotals - Options</menuitem> tab.</paragraph> + </section> <section id="validity"> <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> diff --git a/source/text/scalc/01/12050000.xhp b/source/text/scalc/01/12050000.xhp index 6162a503bb..064f69c9b0 100644 --- a/source/text/scalc/01/12050000.xhp +++ b/source/text/scalc/01/12050000.xhp @@ -19,7 +19,7 @@ <helpdocument version="1.0"> <meta> <topic id="textscalc0112050000xml" indexer="include" status="PUBLISH"> -<title xml-lang="en-US" id="tit">Subtotals</title> +<title id="tit">Subtotals</title> <filename>/text/scalc/01/12050000.xhp</filename> </topic> <history> @@ -27,21 +27,21 @@ </history> </meta> <body> - -<bookmark branch="hid/.uno:DataSubTotals" xml-lang="en-US" id="bm_id3154515" localize="false"/> +<bookmark branch="hid/.uno:DataSubTotals" id="bm_id3154515" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/notebookbar/MenuData-DataSubTotals" id="bm_id231704304377244" localize="false"/> <section id="subtotalheader"> <h1 id="hd_id3153822"><variable id="subtotalheaderh1"><link href="text/scalc/01/12050000.xhp">Subtotals</link></variable></h1> - <paragraph role="paragraph" id="par_id3145119" xml-lang="en-US"><variable id="teilergebnisse"><ahelp hid=".uno:DataSubTotals" visibility="visible">Calculates subtotals for the columns that you select.</ahelp></variable> $[officename] uses the SUM function to automatically calculate the subtotal and grand total values in a labeled range. You can also use other functions to perform the calculation. $[officename] automatically recognizes a defined database area when you place the cursor in it.</paragraph> + <paragraph role="paragraph" id="par_id3145119"><variable id="teilergebnisse"><ahelp hid=".uno:DataSubTotals" visibility="visible">Calculates subtotals for the columns that you select.</ahelp></variable> $[officename] uses the SUM function to automatically calculate the subtotal and grand total values in a labeled range. You can also use other functions to perform the calculation. $[officename] automatically recognizes a defined database area when you place the cursor in it.</paragraph> </section> <section id="howtoget"> - <embed href="text/scalc/00/00000412.xhp#dntegs"/> + <embed href="text/scalc/00/00000412.xhp#subtotals_menu"/> </section> - <paragraph role="paragraph" id="par_id3153896" xml-lang="en-US">For example, you can generate a sales summary for a certain postal code based on data from a client database.</paragraph> + <paragraph role="paragraph" id="par_id3153896">For example, you can generate a sales summary for a certain postal code based on data from a client database.</paragraph> <embed href="text/scalc/01/12050100.xhp#group"/> <embed href="text/scalc/01/12050200.xhp#options"/> <embed href="text/shared/00/00000001.xhp#reset"/> <h2 id="hd_id3163708">Delete</h2> - <paragraph role="paragraph" id="par_id3154125" xml-lang="en-US">Deletes the subtotal rows in the selected area.</paragraph> + <paragraph role="paragraph" id="par_id3154125">Deletes the subtotal rows in the selected area.</paragraph> <section id="relatedtopics"> <embed href="text/scalc/guide/subtotaltool.xhp#subtotaltoolh1"/> </section> diff --git a/source/text/scalc/01/12050100.xhp b/source/text/scalc/01/12050100.xhp index 06909b6aad..804a781eaf 100644 --- a/source/text/scalc/01/12050100.xhp +++ b/source/text/scalc/01/12050100.xhp @@ -19,7 +19,7 @@ <helpdocument version="1.0"> <meta> <topic id="textscalc0112050100xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">1st, 2nd, 3rd Group</title> +<title id="tit">1st, 2nd, 3rd Group</title> <filename>/text/scalc/01/12050100.xhp</filename> </topic> <history> @@ -28,23 +28,23 @@ </meta> <body> <section id="group"> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotalgrppage/SubTotalGrpPage" id="bm_id3147335" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotalgrppage/@@nowidget@@" id="bm_id3147335" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/subtotalgrppage/SubTotalGrpPage" id="bm_id3147335" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/subtotalgrppage/@@nowidget@@" id="bm_id3147335" localize="false"/> <h1 id="hd_id3149784"><link href="text/scalc/01/12050100.xhp">1st, 2nd, 3rd Group</link></h1> -<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotalgrppage/SubTotalGrpPage">Specify the settings for up to three subtotal groups. Each tab has the same layout.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3145068"><ahelp hid="modules/scalc/ui/subtotalgrppage/SubTotalGrpPage">Specify the settings for up to three subtotal groups. Each tab has the same layout.</ahelp></paragraph> </section> <section id="howtoget"> - <embed href="text/scalc/00/00000412.xhp#dntezd"/> + <embed href="text/scalc/00/00000412.xhp#1st2nd3rd"/> </section> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotalgrppage/group_by" id="bm_id3163713" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/subtotalgrppage/group_by" id="bm_id3163713" localize="false"/> <h2 id="hd_id3156441">Group by</h2> -<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotalgrppage/group_by">Select the column that you want to control the subtotal calculation process. If the contents of the selected column change, the subtotals are automatically recalculated.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotalgrppage/columns" id="bm_id3149379" localize="false"/> +<paragraph role="paragraph" id="par_id3154013"><ahelp hid="modules/scalc/ui/subtotalgrppage/group_by">Select the column that you want to control the subtotal calculation process. If the contents of the selected column change, the subtotals are automatically recalculated.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotalgrppage/columns" id="bm_id3149379" localize="false"/> <h2 id="hd_id3154943">Calculate subtotals for</h2> -<paragraph role="paragraph" id="par_id3147125" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotalgrppage/columns">Select the column(s) containing the values that you want to subtotal.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotalgrppage/functions" id="bm_id3149413" localize="false"/> +<paragraph role="paragraph" id="par_id3147125"><ahelp hid="modules/scalc/ui/subtotalgrppage/columns">Select the column(s) containing the values that you want to subtotal.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotalgrppage/functions" id="bm_id3149413" localize="false"/> <h2 id="hd_id3156283">Use function</h2> -<paragraph role="paragraph" id="par_id3145647" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotalgrppage/functions">Select the mathematical function that you want to use to calculate the subtotals.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3145647"><ahelp hid="modules/scalc/ui/subtotalgrppage/functions">Select the mathematical function that you want to use to calculate the subtotals.</ahelp></paragraph> <section id="relatedtopics"> <embed href="text/scalc/guide/subtotaltool.xhp#subtotaltoolh1"/> </section> diff --git a/source/text/scalc/01/12050200.xhp b/source/text/scalc/01/12050200.xhp index 47c2a1354c..03b9600011 100644 --- a/source/text/scalc/01/12050200.xhp +++ b/source/text/scalc/01/12050200.xhp @@ -19,38 +19,38 @@ <helpdocument version="1.0"> <meta> <topic id="textscalc0112050200xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Options</title> +<title id="tit">Options</title> <filename>/text/scalc/01/12050200.xhp</filename> </topic> </meta> <body> -<section id="options"> -<bookmark xml-lang="en-US" branch="index" id="bm_id3154758"><bookmark_value>subtotals; sorting options</bookmark_value> +<bookmark branch="index" id="bm_id3154758"><bookmark_value>subtotals; sorting options</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/SubTotalOptionsPage" id="bm_id3150543" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/@@nowidget@@" id="bm_id3150543" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/SubTotalOptionsPage" id="bm_id3150543" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/@@nowidget@@" id="bm_id3150543" localize="false"/> +<section id="options"> <h1 id="hd_id3154758"><link href="text/scalc/01/12050200.xhp">Options</link></h1> -<paragraph role="paragraph" id="par_id3154124" xml-lang="en-US"><ahelp hid=".">Specify the settings for calculating and presenting subtotals.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3154124"><ahelp hid=".">Specify the settings for calculating and presenting subtotals.</ahelp></paragraph> </section> <section id="howtoget"> - <embed href="text/scalc/00/00000412.xhp#dntopi"/> + <embed href="text/scalc/00/00000412.xhp#subtotoptions"/> </section> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/pagebreak" id="bm_id3155131" localize="false"/><h2 id="hd_id3156422">Page break between groups</h2> -<paragraph role="paragraph" id="par_id3147317" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotaloptionspage/pagebreak">Inserts a new page after each group of subtotaled data.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/case" id="bm_id3151115" localize="false"/><h2 id="hd_id3146985">Case sensitive</h2> -<paragraph role="paragraph" id="par_id3153190" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotaloptionspage/case">Recalculates subtotals when you change the case of a data label.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/sort" id="bm_id3152596" localize="false"/><h2 id="hd_id3151119">Pre-sort area according to groups</h2> -<paragraph role="paragraph" id="par_id3149664" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotaloptionspage/sort">Sorts the area that you selected in the <emph>Group by</emph> box of the Group tabs according to the columns that you selected.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/pagebreak" id="bm_id3155131" localize="false"/><h2 id="hd_id3156422">Page break between groups</h2> +<paragraph role="paragraph" id="par_id3147317"><ahelp hid="modules/scalc/ui/subtotaloptionspage/pagebreak">Inserts a new page after each group of subtotaled data.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/case" id="bm_id3151115" localize="false"/><h2 id="hd_id3146985">Case sensitive</h2> +<paragraph role="paragraph" id="par_id3153190"><ahelp hid="modules/scalc/ui/subtotaloptionspage/case">Recalculates subtotals when you change the case of a data label.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/sort" id="bm_id3152596" localize="false"/><h2 id="hd_id3151119">Pre-sort area according to groups</h2> +<paragraph role="paragraph" id="par_id3149664"><ahelp hid="modules/scalc/ui/subtotaloptionspage/sort">Sorts the area that you selected in the <emph>Group by</emph> box of the Group tabs according to the columns that you selected.</ahelp></paragraph> <h2 id="hd_id3153951">Sort</h2> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/formats" id="bm_id3147397" localize="false"/><h3 id="hd_id3145252">Include formats</h3> -<paragraph role="paragraph" id="par_id3147125" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotaloptionspage/formats">Considers formatting attributes when sorting.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/btnuserdef" id="bm_id3154729" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/lbuserdef" id="bm_id3153877" localize="false"/><h3 id="hd_id3155418">Custom sort order</h3> -<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US"><ahelp hid=".">Uses a custom sorting order that you defined in the Options dialog box at <emph>%PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/ascending" id="bm_id3150327" localize="false"/><h3 id="hd_id3149121">Ascending</h3> -<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotaloptionspage/ascending">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Languages and Locales - General</menuitem>.</paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/subtotaloptionspage/descending" id="bm_id3150324" localize="false"/><h3 id="hd_id3155443">Descending</h3> -<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US"><ahelp hid="modules/scalc/ui/subtotaloptionspage/descending">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Languages and Locales - General</menuitem>.</paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/formats" id="bm_id3147397" localize="false"/><h3 id="hd_id3145252">Include formats</h3> +<paragraph role="paragraph" id="par_id3147125"><ahelp hid="modules/scalc/ui/subtotaloptionspage/formats">Considers formatting attributes when sorting.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/btnuserdef" id="bm_id3154729" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/lbuserdef" id="bm_id3153877" localize="false"/><h3 id="hd_id3155418">Custom sort order</h3> +<paragraph role="paragraph" id="par_id3149400"><ahelp hid=".">Uses a custom sorting order that you defined in the Options dialog box at <emph>%PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/ascending" id="bm_id3150327" localize="false"/><h3 id="hd_id3149121">Ascending</h3> +<paragraph role="paragraph" id="par_id3155068"><ahelp hid="modules/scalc/ui/subtotaloptionspage/ascending">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Languages and Locales - General</menuitem>.</paragraph> +<bookmark branch="hid/modules/scalc/ui/subtotaloptionspage/descending" id="bm_id3150324" localize="false"/><h3 id="hd_id3155443">Descending</h3> +<paragraph role="paragraph" id="par_id3153766"><ahelp hid="modules/scalc/ui/subtotaloptionspage/descending">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Languages and Locales - General</menuitem>.</paragraph> <section id="relatedtopics"> <embed href="text/scalc/guide/subtotaltool.xhp#subtotaltoolh1"/> </section>
