source/text/scalc/guide/wildcards.xhp | 6 +++--- source/text/simpress/guide/palette_files.xhp | 8 ++++---- source/text/swriter/01/05030200.xhp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit e7ef99cadf81a72688dbae1f8ba9f99c3b568aa7 Author: Adolfo Jayme Barrientos <[email protected]> AuthorDate: Mon Sep 27 04:36:27 2021 -0500 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Mon Sep 27 04:39:13 2021 -0500 Assorted string fixes • Removed some hardcoded product names • Updated color palettes referred to in a string • Updated an option’s name I missed in d599028d4f126c8a2badc3787e3fdf8277219c96 because I didn’t expect the Help would be inconsistent with the UI when searching. Change-Id: I75a33ae802e1baa01c99d274b8418dfe049d39c6 diff --git a/source/text/scalc/guide/wildcards.xhp b/source/text/scalc/guide/wildcards.xhp index 8c33ba0ad..6f8c46fe4 100644 --- a/source/text/scalc/guide/wildcards.xhp +++ b/source/text/scalc/guide/wildcards.xhp @@ -24,7 +24,7 @@ <h1 id="hd_id941629155075179"><variable id="wildcards_h1"><link href="text/scalc/guide/wildcards.xhp" name="wildcards_link">Using Wildcards in Formulas</link></variable></h1> <paragraph role="paragraph" id="par_id571629155308959">Wildcards are special characters that can be used in search strings that are passed as arguments to some Calc functions. They can also be used to define search criteria in the <emph>Find & Replace</emph> dialog. The use of wildcards enables the definition of more advanced search parameters with a single search string.</paragraph> <paragraph role="paragraph" id="par_id391629156224638">%PRODUCTNAME Calc supports either <emph>wildcards</emph> or <emph>regular expressions</emph> as arguments depending on the current application settings. By default %PRODUCTNAME Calc is set to support wildcards instead of regular expressions.</paragraph> - <tip id="par_id551629156504794">To make sure wildcards are supported, go to <switchinline select="sys"><caseinline select="MAC"><menuitem>LibreOffice - Preferences - %PRODUCTNAME Calc - Calculate</menuitem></caseinline><defaultinline><menuitem>Tools - Options - %PRODUCTNAME Calc - Calculate</menuitem></defaultinline></switchinline> and check if the option <emph>Enable wildcards in formulas</emph> is selected. Note that you can use this dialog to switch to regular expressions by choosing <emph>Enable regular expressions in formulas</emph> or choose to support neither wildcards nor regular expressions.</tip> + <tip id="par_id551629156504794">To make sure wildcards are supported, go to <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences - %PRODUCTNAME Calc - Calculate</menuitem></caseinline><defaultinline><menuitem>Tools - Options - %PRODUCTNAME Calc - Calculate</menuitem></defaultinline></switchinline> and check if the option <emph>Enable wildcards in formulas</emph> is selected. Note that you can use this dialog to switch to regular expressions by choosing <emph>Enable regular expressions in formulas</emph> or choose to support neither wildcards nor regular expressions.</tip> <paragraph role="paragraph" id="par_id141629156913731">The following wildcards are supported:</paragraph> <table id="tab_id561629209073388"> <tablerow> @@ -50,7 +50,7 @@ </tablecell> <tablecell> <paragraph id="par_id51629209073388" role="tablecontent">Matches any sequence of characters, including an empty string. For example, the search string "*cast" will match “cast”, “forecast”, and “outcast”, but will not match "forecaster" using default %PRODUCTNAME settings.</paragraph> - <paragraph id="par_id351629209153307" role="tablecontent">If the option <menuitem>Search criteria = and <> must apply to whole cells</menuitem> is disabled in <switchinline select="sys"><caseinline select="MAC"><menuitem>LibreOffice - Preferences - %PRODUCTNAME Calc - Calculate</menuitem></caseinline><defaultinline><menuitem>Tools - Options - %PRODUCTNAME Calc - Calculate</menuitem></defaultinline></switchinline>, then "forecaster" will be a match using the "*cast" search string.</paragraph> + <paragraph id="par_id351629209153307" role="tablecontent">If the option <menuitem>Search criteria = and <> must apply to whole cells</menuitem> is disabled in <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences - %PRODUCTNAME Calc - Calculate</menuitem></caseinline><defaultinline><menuitem>Tools - Options - %PRODUCTNAME Calc - Calculate</menuitem></defaultinline></switchinline>, then "forecaster" will be a match using the "*cast" search string.</paragraph> </tablecell> </tablerow> <tablerow> @@ -81,7 +81,7 @@ </listitem> </list> <h2 id="hd_id701629159564269">Examples of Wildcards in Formulas</h2> - <paragraph role="paragraph" id="par_id121629289062103">The following examples consider that the options <menuitem>Enable wildcards in formulas</menuitem> and <menuitem>Search criteria = and <> must apply to whole cells</menuitem> are enabled in <switchinline select="sys"><caseinline select="MAC"><menuitem>LibreOffice - Preferences - %PRODUCTNAME Calc - Calculate</menuitem></caseinline><defaultinline><menuitem>Tools - Options - %PRODUCTNAME Calc - Calculate</menuitem></defaultinline></switchinline>.</paragraph> + <paragraph role="paragraph" id="par_id121629289062103">The following examples consider that the options <menuitem>Enable wildcards in formulas</menuitem> and <menuitem>Search criteria = and <> must apply to whole cells</menuitem> are enabled in <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences - %PRODUCTNAME Calc - Calculate</menuitem></caseinline><defaultinline><menuitem>Tools - Options - %PRODUCTNAME Calc - Calculate</menuitem></defaultinline></switchinline>.</paragraph> <paragraph role="paragraph" id="par_id271629159111490"><input>=COUNTIF(A1:A10;"Chi*")</input> counts the number of cells in the range <emph>A1:A10</emph> containing strings that start with "Chi" followed by zero or more characters.</paragraph> <paragraph role="paragraph" id="par_id741629159343415"><input>=SUMIF(A1:A5;"A??";B1:B5)</input> sums the values in <emph>B1:B5</emph> whose corresponding values in <emph>A1:A5</emph> start with "A" followed by exactly two other characters.</paragraph> <note id="par_id141629159465592">Wildcard comparisons are <emph>not</emph> case sensitive, hence "A?" will match both "A1" and "a1".</note> diff --git a/source/text/simpress/guide/palette_files.xhp b/source/text/simpress/guide/palette_files.xhp index 430a1d034..72285a69e 100644 --- a/source/text/simpress/guide/palette_files.xhp +++ b/source/text/simpress/guide/palette_files.xhp @@ -57,12 +57,12 @@ <bookmark_value>colors; default colors</bookmark_value> <bookmark_value>colors; LibreOffice colors</bookmark_value> <bookmark_value>LibreOffice colors</bookmark_value> -<bookmark_value>colors; Tango colors</bookmark_value> -<bookmark_value>Tango colors</bookmark_value> +<bookmark_value>colors; HLC colors</bookmark_value> +<bookmark_value>Material Design colors</bookmark_value> <bookmark_value>colors; web</bookmark_value> -<bookmark_value>colors; CMYK</bookmark_value> +<bookmark_value>colors; freieFarbe</bookmark_value> </bookmark> -<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US">The CMYK list is optimized for print colors. The colors in the Web and the HTML lists are optimized for displays using a resolution of 256 colors. The palettes libreoffice.soc and tango.soc contain the official LibreOffice and Tango colors respectively.</paragraph> +<paragraph role="paragraph" id="par_id3149871" xml-lang="en-US">The freieFarbe HLC color list is based on the CIELAB model and is optimized for professional CMYK printing. The colors in the Compatibility and HTML lists are optimized for displays using a resolution of 256 colors. The palettes “LibreOffice” and “Material” contain the official LibreOffice and Material Design palettes respectively. The tonal.soc palette provides a set of colors organized by luminance contrast that work across different hardware.</paragraph><!--see tdf#80196--> <paragraph role="heading" id="hd_id3150435" xml-lang="en-US" level="3">To load a gradient list:</paragraph> <list type="ordered"> <listitem> diff --git a/source/text/swriter/01/05030200.xhp b/source/text/swriter/01/05030200.xhp index daaaf4492..7621e3024 100644 --- a/source/text/swriter/01/05030200.xhp +++ b/source/text/swriter/01/05030200.xhp @@ -55,7 +55,7 @@ <paragraph role="heading" id="hd_id3145413" xml-lang="en-US" level="3">Characters at line begin</paragraph> <paragraph role="paragraph" id="par_id3147515" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinLineBegin">Enter the minimum number of characters that must appear at the beginning of the line after the hyphen.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinMaxNum" id="bm_id3153530" localize="false"/> -<paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3">Maximum no. of consecutive hyphens</paragraph> +<paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3">Maximum consecutive hyphenated lines</paragraph> <paragraph role="paragraph" id="par_id3153536" xml-lang="en-US"><ahelp hid="cui/ui/textflowpage/spinMaxNum">Enter the maximum number of consecutive lines that can be hyphenated.</ahelp></paragraph> <paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2">Breaks</paragraph> <paragraph role="paragraph" id="par_id3154470" xml-lang="en-US">Specify the page or column <link href="text/swriter/guide/page_break.xhp" name="break">break</link> options.</paragraph>
