diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2017-07-02 22:10:08 -0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2017-07-03 03:47:56 +0200 |
| commit | 610919cb26ee24329ca3ba90d0b3074fcc1acef1 (patch) | |
| tree | d39b1f34439b211678af67ce34562263273bb356 | |
| parent | 8e4ae9af51e001eefa59652c632cae44abc3e287 (diff) | |
tdf#108871 Fix embed of RAWSUBTRACT in Help
Fix also COLOR.
Change-Id: I159b20f36e1452864fa466584ff2de283251f11c
Reviewed-on: https://gerrit.libreoffice.org/39459
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | source/text/scalc/01/04060106.xhp | 11 | ||||
| -rw-r--r-- | source/text/scalc/01/func_color.xhp | 56 | ||||
| -rw-r--r-- | source/text/scalc/01/func_rawsubtract.xhp | 32 |
3 files changed, 50 insertions, 49 deletions
diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp index ec11f80459..27d121efba 100644 --- a/source/text/scalc/01/04060106.xhp +++ b/source/text/scalc/01/04060106.xhp @@ -913,9 +913,8 @@ </section> <section id="Section67"> -<paragraph id="par_2016112109351" role="heading" level="2" localize="false" xml-lang="en-US"><embedvar href="text/scalc/01/func_rawsubtract.xhp#rawsubtract_function"/></paragraph> + <embed href="text/scalc/01/func_rawsubtract.xhp#func_rawsubtract"/> </section> - <section id="Section21"> <bookmark xml-lang="en-US" branch="index" id="bm_id3158121"> <bookmark_value>ROUND function</bookmark_value> @@ -1113,14 +1112,12 @@ </section> <section id="color"> -<paragraph id="hd_id72921349523046" role="heading" level="2" localize="false" xml-lang="en-US"></paragraph> -<embed href="text/scalc/01/func_color.xhp#color_function"/> + <embed href="text/scalc/01/func_color.xhp#func_color"/> </section> <section id="sumifs"> - -<paragraph id="hd_id72921259523046" role="heading" level="2" localize="false" xml-lang="en-US"><embedvar href="text/scalc/01/func_sumifs.xhp#sumifs_head"/></paragraph> -<paragraph id="par_id131512822630259" role="paragraph" localize="false" xml-lang="en-US"><embedvar href="text/scalc/01/func_sumifs.xhp#sumifs_des"/></paragraph> + <paragraph id="hd_id72921259523046" role="heading" level="2" localize="false" xml-lang="en-US"><embedvar href="text/scalc/01/func_sumifs.xhp#sumifs_head"/></paragraph> + <paragraph id="par_id131512822630259" role="paragraph" localize="false" xml-lang="en-US"><embedvar href="text/scalc/01/func_sumifs.xhp#sumifs_des"/></paragraph> </section> <section id="Section14"> diff --git a/source/text/scalc/01/func_color.xhp b/source/text/scalc/01/func_color.xhp index 9915792a4b..fc6e0fb379 100644 --- a/source/text/scalc/01/func_color.xhp +++ b/source/text/scalc/01/func_color.xhp @@ -18,32 +18,34 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<meta> - <topic id="textscalc01func_colorxml"> - <title id="tit" xml-lang="en-US">COLOR function</title> - <filename>text/scalc/01/func_color.xhp</filename> - </topic> -</meta> -<body> -<section id="color_function"> -<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_COLOR" id="bm_id1102201617042146" localize="false"/> -<bookmark xml-lang="en-US" branch="index" id="bm_id1102201617201921"> - <bookmark_value>colors;numerical values</bookmark_value> - <bookmark_value>colors;calculating in spreadsheets</bookmark_value> - <bookmark_value>COLOR function</bookmark_value> -</bookmark> -<paragraph id="hd_id456845684568" role="heading" level="2" xml-lang="en-US"><variable id="color_head"><link href="text/scalc/01/func_color.xhp">COLOR</link></variable></paragraph> -<paragraph id="par_id1102201617001848" role="paragraph" xml-lang="en-US"><ahelp hid=".">Return a numeric value calculated by a combination of three colors (red, green and blue) and the alpha channel, in the RGBA color system.</ahelp> The result depends on the color system used by your computer.</paragraph> -<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> -<paragraph id="par_id27421466710275" role="code" xml-lang="en-US">COLOR(Red; Green; Blue; Alpha)</paragraph> -<paragraph id="par_id242131304318587" role="paragraph" xml-lang="en-US"><emph>Red, Green and Blue</emph> – required arguments. The value for the red, green and blue components of the color. The values must be between 0 and 255. Zero means no color component and 255 means full color component.</paragraph> -<paragraph id="par_id242131304315587" role="paragraph" xml-lang="en-US"><emph>Alpha</emph> – optional argument. The value for the alpha channel or alpha composite. Alpha is a integer value between 0 and 255. The value of zero for alpha means the color is fully transparent, whereas a value of 255 in the alpha channel gives a fully opaque color.</paragraph> -<embed href="text/scalc/01/ful_func.xhp#func_head_example"/> -<paragraph id="par_id1102201617001888" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(255;255;255;1)</item> returns 33554431</paragraph> -<paragraph id="par_id1102201618185378" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(0;0;255;0)</item> returns 255 </paragraph> -<paragraph id="par_id1102201618185326" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(0;0;255;255)</item> returns 4278190335 </paragraph> -<paragraph id="par_id1102201618188326" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(0;0;400;0)</item> returns Err:502 (Invalid argument) because the blue value is greater than 255. -</paragraph> -</section> + <meta> + <topic id="textscalc01func_colorxml"> + <title id="tit" xml-lang="en-US">COLOR function</title> + <filename>text/scalc/01/func_color.xhp</filename> + </topic> + </meta> + <body> + <section id="color_function"> + <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_COLOR" id="bm_id1102201617042146" localize="false"/> + <bookmark xml-lang="en-US" branch="index" id="bm_id1102201617201921"> + <bookmark_value>colors;numerical values</bookmark_value> + <bookmark_value>colors;calculating in spreadsheets</bookmark_value> + <bookmark_value>COLOR function</bookmark_value> + </bookmark> + <section id="func_color"> + <paragraph id="hd_id456845684568" role="heading" level="2" xml-lang="en-US"><variable id="color_head"><link href="text/scalc/01/func_color.xhp">COLOR</link></variable></paragraph> + <paragraph id="par_id1102201617001848" role="paragraph" xml-lang="en-US"><ahelp hid=".">Return a numeric value calculated by a combination of three colors (red, green and blue) and the alpha channel, in the RGBA color system.</ahelp> The result depends on the color system used by your computer.</paragraph> + </section> + <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> + <paragraph id="par_id27421466710275" role="code" xml-lang="en-US">COLOR(Red; Green; Blue; Alpha)</paragraph> + <paragraph id="par_id242131304318587" role="paragraph" xml-lang="en-US"><emph>Red, Green and Blue</emph> – required arguments. The value for the red, green and blue components of the color. The values must be between 0 and 255. Zero means no color component and 255 means full color component.</paragraph> + <paragraph id="par_id242131304315587" role="paragraph" xml-lang="en-US"><emph>Alpha</emph> – optional argument. The value for the alpha channel or alpha composite. Alpha is a integer value between 0 and 255. The value of zero for alpha means the color is fully transparent, whereas a value of 255 in the alpha channel gives a fully opaque color.</paragraph> + <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> + <paragraph id="par_id1102201617001888" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(255;255;255;1)</item> returns 33554431</paragraph> + <paragraph id="par_id1102201618185378" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(0;0;255;0)</item> returns 255 </paragraph> + <paragraph id="par_id1102201618185326" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(0;0;255;255)</item> returns 4278190335 </paragraph> + <paragraph id="par_id1102201618188326" role="paragraph" xml-lang="en-US"><item type="literal">COLOR(0;0;400;0)</item> returns Err:502 (Invalid argument) because the blue value is greater than 255. + </paragraph> + </section> </body> </helpdocument> diff --git a/source/text/scalc/01/func_rawsubtract.xhp b/source/text/scalc/01/func_rawsubtract.xhp index eb6935afd5..5aa76e3f55 100644 --- a/source/text/scalc/01/func_rawsubtract.xhp +++ b/source/text/scalc/01/func_rawsubtract.xhp @@ -15,20 +15,22 @@ </topic> </meta> <body> - <section id="rawsubtract_function"> - <bookmark xml-lang="en-US" branch="hid/SC_OPCODE_RAWSUBTRACT" id="bm_2016112109239" localize="false"/> - <bookmark xml-lang="en-US" branch="index" id="bm_2016112109230"> - <bookmark_value>rawsubtract;subtraction</bookmark_value> - <bookmark_value>RAWSUBTRACT function</bookmark_value> - </bookmark> - <paragraph id="hd_2016112109231" role="heading" level="2" xml-lang="en-US"><variable id="rawsubtract_head"><link href="text/scalc/01/func_rawsubtract.xhp">RAWSUBTRACT</link></variable></paragraph> - <paragraph id="par_2016112109232" role="paragraph" xml-lang="en-US"><ahelp hid=".">Subtracts a set of numbers and gives the result without eliminating small roundoff errors. </ahelp></paragraph> - <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> - <paragraph id="par_2016112109233" role="code" xml-lang="en-US">RAWSUBTRACT(Minuend, Subtrahend1, Subtrahend2, ...)</paragraph> - <paragraph id="par_2016112109234" role="paragraph" xml-lang="en-US">Subtracts the subtrahend(s) from the minuend without eliminating roundoff errors. The function should be called with at least two parameters.</paragraph> - <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> - <paragraph id="par_2016112109235" role="paragraph" xml-lang="en-US"><item type="literal">RAWSUBTRACT(0.987654321098765, 0.9876543210987)</item> returns 6.53921361504217E-14</paragraph> - <paragraph id="par_2016112109237" role="paragraph" xml-lang="en-US"><item type="literal">RAWSUBTRACT(0.987654321098765)</item> returns Err:511 (Missing variable) because RAWSUBTRACT requires a minimum of two numbers. </paragraph> +<section id="rawsubtract_function"> + <bookmark xml-lang="en-US" branch="hid/SC_OPCODE_RAWSUBTRACT" id="bm_2016112109239" localize="false"/> + <bookmark xml-lang="en-US" branch="index" id="bm_2016112109230"> + <bookmark_value>rawsubtract;subtraction</bookmark_value> + <bookmark_value>RAWSUBTRACT function</bookmark_value> + </bookmark> + <section id="func_rawsubtract"> + <paragraph id="hd_2016112109231" role="heading" level="2" xml-lang="en-US"><link href="text/scalc/01/func_rawsubtract.xhp">RAWSUBTRACT</link></paragraph> + <paragraph id="par_2016112109232" role="paragraph" xml-lang="en-US"><ahelp hid=".">Subtracts a set of numbers and gives the result without eliminating small roundoff errors.</ahelp></paragraph> </section> + <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> + <paragraph id="par_2016112109233" role="code" xml-lang="en-US">RAWSUBTRACT(Minuend, Subtrahend1, Subtrahend2, ...)</paragraph> + <paragraph id="par_2016112109234" role="paragraph" xml-lang="en-US">Subtracts the subtrahend(s) from the minuend without eliminating roundoff errors. The function should be called with at least two parameters.</paragraph> + <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> + <paragraph id="par_2016112109235" role="paragraph" xml-lang="en-US"><item type="literal">RAWSUBTRACT(0.987654321098765, 0.9876543210987)</item> returns 6.53921361504217E-14</paragraph> + <paragraph id="par_2016112109237" role="paragraph" xml-lang="en-US"><item type="literal">RAWSUBTRACT(0.987654321098765)</item> returns Err:511 (Missing variable) because RAWSUBTRACT requires a minimum of two numbers. </paragraph> +</section> </body> -</helpdocument>
\ No newline at end of file +</helpdocument> |