source/auxiliary/scalc.tree | 2 source/text/scalc/01/12040201.xhp | 75 +++++++++++++------------- source/text/scalc/01/12040300.xhp | 24 ++++---- source/text/scalc/guide/specialfilter.xhp | 85 ++++++++++-------------------- 4 files changed, 84 insertions(+), 102 deletions(-)
New commits: commit 86d4cff5887833253bcfe95ecdb1689ef810315c Author: Rafael Lima <[email protected]> AuthorDate: Thu Jul 1 20:11:05 2021 +0200 Commit: Olivier Hallot <[email protected]> CommitDate: Fri Jul 2 21:07:26 2021 +0200 tdf#102523 Improve Advanced Filter help page This patch embeds the page specialfilter.xhp and 12040201.xhp into the 12040300.xhp file, which is the landing page when the user clicks the Help button in the Advanced Filter dialog. As a result, the landing page now covers all the features in the dialog and also presents a useful example. This also updates the .tree file. Change-Id: I25d31838fa2604851962fdf8200b887255489017 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118191 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index 8aeeaac28..4e88f8735 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -117,7 +117,7 @@ </node> <node id="0806" title="Filtering and Sorting"> <topic id="scalc/text/scalc/guide/filters.xhp">Applying Filters</topic> -<topic id="scalc/text/scalc/guide/specialfilter.xhp">Filter: Applying Advanced Filters</topic> +<topic id="scalc/text/scalc/guide/specialfilter.xhp">Applying Advanced Filters</topic> <topic id="scalc/text/scalc/guide/autofilter.xhp">Applying AutoFilter</topic> <topic id="scalc/text/scalc/guide/sorted_list.xhp">Applying Sort Lists</topic> </node> diff --git a/source/text/scalc/01/12040201.xhp b/source/text/scalc/01/12040201.xhp index f5a6400b3..46d17d5b5 100644 --- a/source/text/scalc/01/12040201.xhp +++ b/source/text/scalc/01/12040201.xhp @@ -19,12 +19,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <meta> -<topic id="textscalc0112040201xml" indexer="include"> -<title id="tit" xml-lang="en-US">Options</title> -<filename>/text/scalc/01/12040201.xhp</filename> -</topic> + <topic id="textscalc0112040201xml" indexer="include"> + <title id="tit" xml-lang="en-US">Options</title> + <filename>/text/scalc/01/12040201.xhp</filename> + </topic> </meta> <body> <paragraph role="heading" id="hd_id3148492" xml-lang="en-US" level="1"><link href="text/scalc/01/12040201.xhp" name="Options">Options</link></paragraph> @@ -33,39 +32,43 @@ <paragraph role="paragraph" id="par_id3159400" xml-lang="en-US"><variable id="zusaetzetext"><ahelp hid="modules/scalc/ui/advancedfilterdialog/more">Shows additional filter options.</ahelp> </variable></paragraph> <section id="howtoget"> -<embed href="text/scalc/00/00000412.xhp#filterzus"/> + <embed href="text/scalc/00/00000412.xhp#filterzus"/> +</section> + <paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="2">Options</paragraph> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/case" id="bm_id3151210" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/case" id="bm_id3150871" localize="false"/> +<section id="FilterOptions_Pt1"> + <paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3">Case sensitive</paragraph> + <paragraph role="paragraph" id="par_id3147228" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/case">Distinguishes between uppercase and lowercase letters when filtering the data.</ahelp></paragraph> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/header" id="bm_id3153968" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/header" id="bm_id3145173" localize="false"/> + <paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3">Range contains column labels</paragraph> + <paragraph role="paragraph" id="par_id3153768" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/header">Includes the column labels in the first row of a cell range.</ahelp></paragraph> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/copyresult" id="bm_id3147426" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/copyresult" id="bm_id3148576" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/lbcopyarea" id="bm_id3163713" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/lbcopyarea" id="bm_id3147349" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/edcopyarea" id="bm_id3147348" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/edcopyarea" id="bm_id3153093" localize="false"/> + <paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3">Copy results to</paragraph> + <paragraph role="paragraph" id="par_id3154319" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/edcopyarea">Select the check box, and then select the cell range where you want to display the filter results.</ahelp> You can also select a named range from the list.</paragraph> </section> -<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="2">Options</paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/case" id="bm_id3151210" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/case" id="bm_id3150871" localize="false"/> -<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3">Case sensitive</paragraph> -<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/case">Distinguishes between uppercase and lowercase letters when filtering the data.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/header" id="bm_id3153968" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/header" id="bm_id3145173" localize="false"/> -<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3">Range contains column labels</paragraph> -<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/header">Includes the column labels in the first row of a cell range.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/copyresult" id="bm_id3147426" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/copyresult" id="bm_id3148576" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/lbcopyarea" id="bm_id3163713" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/lbcopyarea" id="bm_id3147349" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/edcopyarea" id="bm_id3147348" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/edcopyarea" id="bm_id3153093" localize="false"/> -<paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3">Copy results to</paragraph> -<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/edcopyarea">Select the check box, and then select the cell range where you want to display the filter results.</ahelp> You can also select a named range from the list.</paragraph> <embed href="text/shared/00/00000001.xhp#shrink_maximize"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/regexp" id="bm_id3153726" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/regexp" id="bm_id3153144" localize="false"/> -<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3">Regular expression</paragraph> -<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/regexp">Allows you to use regular expressions in the filter definition.</ahelp> For a list of the regular expressions that $[officename] supports, click <link href="text/shared/01/02100001.xhp" name="here">here</link>.</paragraph> -<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US">If the <emph>Regular Expressions</emph> check box is selected, you can use regular expressions in the Value field if the Condition list box is set to '=' EQUAL or '<>' UNEQUAL. This also applies to the respective cells that you reference for an advanced filter.</paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/unique" id="bm_id3149410" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/unique" id="bm_id3147126" localize="false"/> -<paragraph role="heading" id="hd_id3149958" xml-lang="en-US" level="3">No duplication</paragraph> -<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/unique">Excludes duplicate rows in the list of filtered data.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/destpers" id="bm_id3149403" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/destpers" id="bm_id3149402" localize="false"/> -<paragraph role="heading" id="hd_id3154018" xml-lang="en-US" level="3">Keep filter criteria</paragraph> -<paragraph role="paragraph" id="par_id3149123" xml-lang="en-US"><ahelp hid="modules/scalc/ui/standardfilterdialog/destpers">Select the <emph>Copy results to</emph> check box, and then specify the destination range where you want to display the filtered data. If this box is checked, the destination range remains linked to the source range. You must have defined the source range under <emph>Data - Define range</emph> as a database range.</ahelp> Following this, you can reapply the defined filter at any time as follows: click into the source range, then choose <emph>Data - Refresh Range</emph>.</paragraph> +<section id="FilterOptions_Pt2"> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/regexp" id="bm_id3153726" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/regexp" id="bm_id3153144" localize="false"/> + <paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3">Regular expression</paragraph> + <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/regexp">Allows you to use regular expressions in the filter definition.</ahelp> For a list of the regular expressions that $[officename] supports, click <link href="text/shared/01/02100001.xhp" name="here">here</link>.</paragraph> + <paragraph role="paragraph" id="par_id3149377" xml-lang="en-US">If the <emph>Regular Expressions</emph> check box is selected, you can use regular expressions in the Value field if the Condition list box is set to '=' EQUAL or '<>' UNEQUAL. This also applies to the respective cells that you reference for an advanced filter.</paragraph> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/unique" id="bm_id3149410" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/unique" id="bm_id3147126" localize="false"/> + <paragraph role="heading" id="hd_id3149958" xml-lang="en-US" level="3">No duplication</paragraph> + <paragraph role="paragraph" id="par_id3153876" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/unique">Excludes duplicate rows in the list of filtered data.</ahelp></paragraph> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/destpers" id="bm_id3149403" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/destpers" id="bm_id3149402" localize="false"/> + <paragraph role="heading" id="hd_id3154018" xml-lang="en-US" level="3">Keep filter criteria</paragraph> + <paragraph role="paragraph" id="par_id3149123" xml-lang="en-US"><ahelp hid="modules/scalc/ui/standardfilterdialog/destpers">Select the <emph>Copy results to</emph> check box, and then specify the destination range where you want to display the filtered data. If this box is checked, the destination range remains linked to the source range. You must have defined the source range under <emph>Data - Define range</emph> as a database range.</ahelp> Following this, you can reapply the defined filter at any time as follows: click into the source range, then choose <emph>Data - Refresh Range</emph>.</paragraph> +</section> <paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="2">Data range</paragraph> <paragraph role="paragraph" id="par_id3150042" xml-lang="en-US">Displays the cell range or the name of the cell range that you want to filter.</paragraph> <embed href="text/shared/00/00000001.xhp#options"/> diff --git a/source/text/scalc/01/12040300.xhp b/source/text/scalc/01/12040300.xhp index dbbb6da62..5e5573ead 100644 --- a/source/text/scalc/01/12040300.xhp +++ b/source/text/scalc/01/12040300.xhp @@ -19,12 +19,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <meta> -<topic id="textscalc0112040300xml" indexer="include"> -<title id="tit" xml-lang="en-US">Advanced Filter</title> -<filename>/text/scalc/01/12040300.xhp</filename> -</topic> + <topic id="textscalc0112040300xml" indexer="include"> + <title id="tit" xml-lang="en-US">Advanced Filter</title> + <filename>/text/scalc/01/12040300.xhp</filename> + </topic> </meta> <body> <bookmark xml-lang="en-US" branch="hid/.uno:DataFilterSpecialFilter" id="bm_id4998774" localize="false"/> @@ -34,17 +33,22 @@ <paragraph role="paragraph" id="par_id3156281" xml-lang="en-US"><variable id="spezialfilter"><ahelp hid=".uno:DataFilterSpecialFilter">Defines an advanced filter.</ahelp> </variable></paragraph> <section id="howtoget"> -<embed href="text/scalc/00/00000412.xhp#dnfspz"/> + <embed href="text/scalc/00/00000412.xhp#dnfspz"/> </section> -<paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US" localize="false"> - <embedvar href="text/scalc/guide/filters.xhp#filters"/> -</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/lbfilterarea" id="bm_id3149664" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/edfilterarea" id="bm_id3151113" localize="false"/> <paragraph role="heading" id="hd_id3153771" xml-lang="en-US" level="2">Read filter criteria from</paragraph> <paragraph role="paragraph" id="par_id3147426" xml-lang="en-US"><ahelp hid="modules/scalc/ui/advancedfilterdialog/edfilterarea">Select the named range, or enter the cell range that contains the filter criteria that you want to use.</ahelp></paragraph> <embed href="text/shared/00/00000001.xhp#shrink_maximize"/> -<paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2"><link href="text/scalc/01/12040201.xhp" name="More">More</link></paragraph> +<h2 id="hd_id331625165680452">Options</h2> <embed href="text/scalc/01/12040201.xhp#zusaetzetext"/> +<embed href="text/scalc/01/12040201.xhp#FilterOptions_Pt1"/> +<embed href="text/scalc/01/12040201.xhp#FilterOptions_Pt2"/> +<embed href="text/scalc/guide/specialfilter.xhp#AdvancedFilter"/> + +<section id="relatedtopics"> + <embed href="text/scalc/guide/filters.xhp#filters"/> + <embed href="text/scalc/guide/autofilter.xhp#autofilter"/> +</section> </body> </helpdocument> diff --git a/source/text/scalc/guide/specialfilter.xhp b/source/text/scalc/guide/specialfilter.xhp index 3cb7367ae..e20621436 100644 --- a/source/text/scalc/guide/specialfilter.xhp +++ b/source/text/scalc/guide/specialfilter.xhp @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> + <!-- * This file is part of the LibreOffice project. * @@ -16,24 +18,23 @@ * 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="textscalcguidespecialfilterxml" indexer="include" status="PUBLISH"> -<title xml-lang="en-US" id="tit">Filter: Applying Advanced Filters</title> -<filename>/text/scalc/guide/specialfilter.xhp</filename> -</topic> + <topic id="textscalcguidespecialfilterxml" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Applying Advanced Filters</title> + <filename>/text/scalc/guide/specialfilter.xhp</filename> + </topic> </meta> <body> - - <bookmark xml-lang="en-US" branch="index" id="bm_id3148798"><bookmark_value>filters;defining advanced filters </bookmark_value> <bookmark_value>advanced filters</bookmark_value> <bookmark_value>defining; advanced filters</bookmark_value> <bookmark_value>database ranges; advanced filters</bookmark_value> </bookmark> - <comment>MW made "applying;advanced filters" a one level entry</comment> - <h1 id="hd_id3148798"><variable id="specialfilter"><link href="text/scalc/guide/specialfilter.xhp" name="Filter: Applying Advanced Filters">Filter: Applying Advanced Filters</link> +<comment>MW made "applying;advanced filters" a one level entry</comment> +<section id="AdvancedFilter"> + <h1 id="hd_id3148798"><variable id="specialfilter"><link href="text/scalc/guide/specialfilter.xhp" name="Applying Advanced Filters">Applying Advanced Filters</link> </variable></h1> <list type="ordered"> <listitem> @@ -50,9 +51,7 @@ <paragraph xml-lang="en-US" id="par_id3147427" role="paragraph">Load a spreadsheet with a large number of records. We are using a fictional <emph>Turnover</emph> document, but you can just as easily use any other document. The document has the following layout:</paragraph> <table id="tbl_id3149377"> <tablerow> - <tablecell> - - </tablecell> + <tablecell></tablecell> <tablecell> <paragraph xml-lang="en-US" id="par_id3154510" role="tablehead" localize="false"> <emph>A</emph> </paragraph> </tablecell> @@ -139,12 +138,8 @@ <tablecell> <paragraph xml-lang="en-US" id="par_id3153334" role="paragraph" localize="false">170000</paragraph> </tablecell> - <tablecell> - - </tablecell> - <tablecell> - - </tablecell> + <tablecell></tablecell> + <tablecell></tablecell> <tablecell> <paragraph xml-lang="en-US" id="par_id3151391" role="paragraph">and so on...</paragraph> </tablecell> @@ -152,12 +147,8 @@ </table> <paragraph xml-lang="en-US" id="par_id3147300" role="paragraph">Copy row 1 with the row headers (field names), to row 20, for example. Enter the filter conditions linked with OR in rows 21, 22, and so on.</paragraph> <table id="tbl_id3166462"> - - <tablerow> - <tablecell> - - </tablecell> + <tablecell></tablecell> <tablecell> <paragraph xml-lang="en-US" id="par_id3159115" role="tablehead" localize="false"> <emph>A</emph> </paragraph> </tablecell> @@ -201,48 +192,32 @@ <tablecell> <paragraph xml-lang="en-US" id="par_id3149956" role="paragraph">January</paragraph> </tablecell> - <tablecell> - - </tablecell> - <tablecell> - - </tablecell> - <tablecell> - - </tablecell> - <tablecell> - - </tablecell> + <tablecell></tablecell> + <tablecell></tablecell> + <tablecell></tablecell> + <tablecell></tablecell> </tablerow> <tablerow> <tablecell> <paragraph xml-lang="en-US" id="par_id3150865" role="tablehead" localize="false"> <emph>22</emph> </paragraph> </tablecell> - <tablecell> - - </tablecell> + <tablecell></tablecell> <tablecell> <paragraph xml-lang="en-US" id="par_id3155957" role="paragraph" localize="false"><160000</paragraph> </tablecell> - <tablecell> - - </tablecell> - <tablecell> - - </tablecell> - <tablecell> - - </tablecell> + <tablecell></tablecell> + <tablecell></tablecell> + <tablecell></tablecell> </tablerow> </table> <paragraph xml-lang="en-US" id="par_id3153566" role="paragraph">Specify that only rows which either have the value <literal>January</literal> in the <emph>Month</emph> cells OR a value of under 160000 in the <emph>Standard</emph><comment>standard not default, look at U59!!!</comment> cells will be displayed.</paragraph> <paragraph xml-lang="en-US" id="par_id3147372" role="paragraph">Choose <menuitem>Data - More Filters - Advanced Filter</menuitem>, and then select the range A20:E22. After you click OK, only the filtered rows will be displayed. The other rows will be hidden from view.</paragraph> - <section id="relatedtopics"> - - <embed href="text/scalc/guide/filters.xhp#filters"/> - <embed href="text/scalc/guide/autofilter.xhp#autofilter"/> - <embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/> - - </section> - </body> +</section> + +<section id="relatedtopics"> + <embed href="text/scalc/guide/filters.xhp#filters"/> + <embed href="text/scalc/guide/autofilter.xhp#autofilter"/> + <embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/> +</section> +</body> </helpdocument> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
