From 86d4cff5887833253bcfe95ecdb1689ef810315c Mon Sep 17 00:00:00 2001 From: Rafael Lima Date: Thu, 1 Jul 2021 20:11:05 +0200 Subject: [PATCH] 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 --- 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 | 83 ++++++++--------------- 4 files changed, 83 insertions(+), 101 deletions(-) diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index 8aeeaac285..4e88f87350 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -117,7 +117,7 @@ Applying Filters -Filter: Applying Advanced Filters +Applying Advanced Filters Applying AutoFilter Applying Sort Lists diff --git a/source/text/scalc/01/12040201.xhp b/source/text/scalc/01/12040201.xhp index f5a6400b3b..46d17d5b5e 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 . --> - - -Options -/text/scalc/01/12040201.xhp - + + Options + /text/scalc/01/12040201.xhp + Options @@ -33,39 +32,43 @@ Shows additional filter options.
- + +
+ Options + + +
+ Case sensitive + Distinguishes between uppercase and lowercase letters when filtering the data. + + + Range contains column labels + Includes the column labels in the first row of a cell range. + + + + + + + Copy results to + Select the check box, and then select the cell range where you want to display the filter results. You can also select a named range from the list.
-Options - - -Case sensitive -Distinguishes between uppercase and lowercase letters when filtering the data. - - -Range contains column labels -Includes the column labels in the first row of a cell range. - - - - - - -Copy results to -Select the check box, and then select the cell range where you want to display the filter results. You can also select a named range from the list. - - -Regular expression -Allows you to use regular expressions in the filter definition. For a list of the regular expressions that $[officename] supports, click here. -If the Regular Expressions 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. - - -No duplication -Excludes duplicate rows in the list of filtered data. - - -Keep filter criteria -Select the Copy results to 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 Data - Define range as a database range. Following this, you can reapply the defined filter at any time as follows: click into the source range, then choose Data - Refresh Range. +
+ + + Regular expression + Allows you to use regular expressions in the filter definition. For a list of the regular expressions that $[officename] supports, click here. + If the Regular Expressions 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. + + + No duplication + Excludes duplicate rows in the list of filtered data. + + + Keep filter criteria + Select the Copy results to 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 Data - Define range as a database range. Following this, you can reapply the defined filter at any time as follows: click into the source range, then choose Data - Refresh Range. +
Data range Displays the cell range or the name of the cell range that you want to filter. diff --git a/source/text/scalc/01/12040300.xhp b/source/text/scalc/01/12040300.xhp index dbbb6da622..5e5573ead8 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 . --> - - -Advanced Filter -/text/scalc/01/12040300.xhp - + + Advanced Filter + /text/scalc/01/12040300.xhp + @@ -34,17 +33,22 @@ Defines an advanced filter.
- +
- - - Read filter criteria from Select the named range, or enter the cell range that contains the filter criteria that you want to use. -More +

Options

+ + + + +
+ + +
diff --git a/source/text/scalc/guide/specialfilter.xhp b/source/text/scalc/guide/specialfilter.xhp index 3cb7367ae1..e206214360 100644 --- a/source/text/scalc/guide/specialfilter.xhp +++ b/source/text/scalc/guide/specialfilter.xhp @@ -1,4 +1,6 @@ + + - + - -Filter: Applying Advanced Filters -/text/scalc/guide/specialfilter.xhp - + + Applying Advanced Filters + /text/scalc/guide/specialfilter.xhp + - - filters;defining advanced filters advanced filters defining; advanced filters database ranges; advanced filters - MW made "applying;advanced filters" a one level entry -

Filter: Applying Advanced Filters +MW made "applying;advanced filters" a one level entry +
+

Applying Advanced Filters

@@ -50,9 +51,7 @@ Load a spreadsheet with a large number of records. We are using a fictional Turnover document, but you can just as easily use any other document. The document has the following layout: - - - + A @@ -139,12 +138,8 @@ 170000 - - - - - - + + and so on... @@ -152,12 +147,8 @@
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. - - - - - + A @@ -201,48 +192,32 @@ January - - - - - - - - - - - - + + + + 22 - - - + <160000 - - - - - - - - - + + +
Specify that only rows which either have the value January in the Month cells OR a value of under 160000 in the Standardstandard not default, look at U59!!! cells will be displayed. Choose Data - More Filters - Advanced Filter, 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. -
+
- - - - -
- +
+ + + +
+