summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibreOļ¬ƒciant <LibreOfficiant@sfr.fr>2020-04-30 15:37:04 +0200
committerOlivier Hallot <olivier.hallot@libreoffice.org>2020-05-02 15:33:34 +0200
commitf6eb368525721bf598325dcf78c82604919b9484 (patch)
tree5597db5c812195f7f823993ec54e8ee37bde4762
parent52eb45cd79ed75eb37b46c579860cee4e6180138 (diff)
Basic color functions cleanup
- Color picker dialog wrong link in RGB() - extra links in Red(), Green(), Blue() Change-Id: If515dafedec9333cabf4d6adf34b9e1c59d1b325 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93135 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--source/text/sbasic/shared/03010301.xhp5
-rw-r--r--source/text/sbasic/shared/03010302.xhp5
-rw-r--r--source/text/sbasic/shared/03010303.xhp8
-rw-r--r--source/text/sbasic/shared/03010305.xhp2
4 files changed, 13 insertions, 7 deletions
diff --git a/source/text/sbasic/shared/03010301.xhp b/source/text/sbasic/shared/03010301.xhp
index b58853813..7fd30d055 100644
--- a/source/text/sbasic/shared/03010301.xhp
+++ b/source/text/sbasic/shared/03010301.xhp
@@ -35,7 +35,7 @@
<paragraph id="hd_id3149180" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03010301.xhp" name="Blue Function">Blue Function</link></paragraph>
-<paragraph id="par_id3156343" role="paragraph" xml-lang="en-US">Returns the blue component of the specified color code.</paragraph>
+<paragraph id="par_id3156343" role="paragraph" xml-lang="en-US">Returns the blue component of the specified composite color code.</paragraph>
</section>
<paragraph id="hd_id3149670" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
@@ -47,9 +47,10 @@
<paragraph id="par_id3154365" role="paragraph" xml-lang="en-US">Integer</paragraph>
<paragraph id="hd_id3156423" role="heading" level="2" xml-lang="en-US">Parameter:</paragraph>
-<paragraph id="par_id3150448" role="paragraph" xml-lang="en-US"> <emph>Color value</emph>: Long integer expression that specifies any <link href="text/sbasic/shared/00000003.xhp#farbcodes" name="color code">color code</link> for which to return the blue component.</paragraph>
+<paragraph id="par_id3150448" role="paragraph" xml-lang="en-US"> <emph>Color value</emph>: Long integer expression that specifies any composite color code for which to return the blue component.</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
+<embed href="text/sbasic/shared/03010303.xhp#ColorPickerDialog"/>
<paragraph id="hd_id3153091" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
diff --git a/source/text/sbasic/shared/03010302.xhp b/source/text/sbasic/shared/03010302.xhp
index 0974390ef..f5630fde7 100644
--- a/source/text/sbasic/shared/03010302.xhp
+++ b/source/text/sbasic/shared/03010302.xhp
@@ -35,7 +35,7 @@
<paragraph id="hd_id3148947" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03010302.xhp" name="Green Function">Green Function</link></paragraph>
-<paragraph id="par_id3153361" role="paragraph" xml-lang="en-US">Returns the Green component of the given color code.</paragraph>
+<paragraph id="par_id3153361" role="paragraph" xml-lang="en-US">Returns the Green component of the given composite color code.</paragraph>
</section>
<paragraph id="hd_id3154140" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
@@ -47,9 +47,10 @@
<paragraph id="par_id3153194" role="paragraph" xml-lang="en-US">Integer</paragraph>
<paragraph id="hd_id3154909" role="heading" level="2" xml-lang="en-US">Parameter:</paragraph>
-<paragraph id="par_id3153770" role="paragraph" xml-lang="en-US"> <emph>Color</emph>: Long integer expression that specifies a <link href="text/sbasic/shared/00000003.xhp#farbcodes" name="color code">color code</link> for which to return the Green component.</paragraph>
+<paragraph id="par_id3153770" role="paragraph" xml-lang="en-US"> <emph>Color</emph>: Long integer expression that specifies a composite color code for which to return the Green component.</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
+<embed href="text/sbasic/shared/03010303.xhp#ColorPickerDialog"/>
<paragraph id="hd_id3149664" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
diff --git a/source/text/sbasic/shared/03010303.xhp b/source/text/sbasic/shared/03010303.xhp
index d626234b5..1dfc411f0 100644
--- a/source/text/sbasic/shared/03010303.xhp
+++ b/source/text/sbasic/shared/03010303.xhp
@@ -35,7 +35,7 @@
<paragraph id="hd_id3148947" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03010303.xhp" name="Red Function">Red Function</link></paragraph>
-<paragraph id="par_id3149656" role="paragraph" xml-lang="en-US">Returns the Red component of the specified color code.</paragraph>
+<paragraph id="par_id3149656" role="paragraph" xml-lang="en-US">Returns the Red component of the specified composite color code.</paragraph>
</section>
<paragraph id="hd_id3148799" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
@@ -47,10 +47,14 @@
<paragraph id="par_id3145173" role="paragraph" xml-lang="en-US">Integer</paragraph>
<paragraph id="hd_id3154685" role="heading" level="2" xml-lang="en-US">Parameter:</paragraph>
-<paragraph id="par_id3150440" role="paragraph" xml-lang="en-US"> <emph>ColorNumber</emph>: Long integer expression that specifies any <link href="text/sbasic/shared/00000003.xhp#farbcodes" name="color code">color code</link> for which to return the Red component.</paragraph>
+<paragraph id="par_id3150440" role="paragraph" xml-lang="en-US"> <emph>ColorNumber</emph>: Long integer expression that specifies any composite color code for which to return the Red component.</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
+<section id="ColorPickerDialog">
+ <tip id="par_id961588421825749">The <link href="text/shared/optionen/01010501.xhp" name="color picker dialog">color picker dialog</link> details the red, green and blue components of a composite color code, as well as its hexadecimal expression. <link href="text/shared/guide/text_color.xhp" name="Changing the color of text">Changing the color of text</link> and selecting <emph>Custom color</emph> displays the color picker dialog.</tip>
+</section>
+
<paragraph id="hd_id3148575" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
<paragraph id="par_idm1341092848" role="bascode" localize="false" xml-lang="en-US">Sub ExampleColor</paragraph>
diff --git a/source/text/sbasic/shared/03010305.xhp b/source/text/sbasic/shared/03010305.xhp
index 0fbb754b7..337e07992 100644
--- a/source/text/sbasic/shared/03010305.xhp
+++ b/source/text/sbasic/shared/03010305.xhp
@@ -49,7 +49,7 @@
<paragraph id="par_id3152597" role="paragraph" xml-lang="en-US"> <emph>Red</emph>: Any integer expression that represents the red component (0-255) of the composite color.</paragraph>
<paragraph id="par_id3146974" role="paragraph" xml-lang="en-US"> <emph>Green</emph>: Any integer expression that represents the green component (0-255) of the composite color.</paragraph>
<paragraph id="par_id3151113" role="paragraph" xml-lang="en-US"> <emph>Blue</emph>: Any integer expression that represents the blue component (0-255) of the composite color.</paragraph>
-<tip id="par_id211587653651037">The <link href="text/shared/optionen.xhp/01010501.xhp" name="color picker dialog">color picker dialog</link> helps computing red, green and blue components of a composite color. <link href="text/shared/guide/text_color.xhp" name="Changing the color of text">Changing the color of text</link> and selecting <emph>Custom color</emph> displays the color picker dialog.</tip>
+<tip id="par_id211587653651037">The <link href="text/shared/optionen/01010501.xhp" name="color picker dialog">color picker dialog</link> helps computing red, green and blue components of a composite color. <link href="text/shared/guide/text_color.xhp" name="Changing the color of text">Changing the color of text</link> and selecting <emph>Custom color</emph> displays the color picker dialog.</tip>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>