[Libreoffice-commits] help.git: source/text

Sat Apr 25 13:29:40 UTC 2020

source/text/sbasic/shared/03010305.xhp |    5 ++++-
 source/text/sbasic/shared/Resume.xhp   |    6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 82c126e04a96b7419c93e05186b88e7df72b2f29
Author:     LibreOﬃciant <LibreOfficiant at sfr.fr>
AuthorDate: Thu Apr 23 10:41:18 2020 +0100
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Sat Apr 25 15:29:19 2020 +0200

    help pages corrections
    
    - faulty embed in RGB() pages
      - faulty embeds could be removed in Blue(), Green(), Red() pages
      - did not clear 'farbcodes' in case use elsewhere
    - Rewording in Resume statement
    
    Change-Id: Ic760007a5e58af973f9935e22c107094d2170001
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92545
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/sbasic/shared/03010305.xhp b/source/text/sbasic/shared/03010305.xhp
index 5d9d1ea4e..9678eaf61 100644
--- a/source/text/sbasic/shared/03010305.xhp
+++ b/source/text/sbasic/shared/03010305.xhp
@@ -34,7 +34,7 @@
 </bookmark>
 
 <paragraph id="hd_id3150792" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03010305.xhp" name="RGB Function">RGB Function</link></paragraph>
-<paragraph id="par_id3150447" role="paragraph" xml-lang="en-US">Returns a <link href="text/sbasic/shared/00000003.xhp#farbcodes" name="long integer color value">long integer color value</link> consisting of red, green, and blue components.</paragraph>
+  <paragraph id="par_id3150447" role="paragraph" xml-lang="en-US">Returns a <literal>Long</literal> integer color value consisting of red, green, and blue components.</paragraph>
 </section>
 
 <paragraph id="hd_id3147229" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
@@ -49,6 +49,8 @@
 <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 Custom colour displays the color picker dialog.</tip>
+
 <embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
 <embed href="text/sbasic/shared/00000003.xhp#err5"/>
 
@@ -63,6 +65,7 @@
 <paragraph id="par_id3150716" role="bascode" xml-lang="en-US">        "blue= " & blue(lVar) & Chr(13) , 64,"colors"</paragraph>
 <paragraph id="par_idm1340927072" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
 </bascode>
+  
 </body>
 
 </helpdocument>
\ No newline at end of file
diff --git a/source/text/sbasic/shared/Resume.xhp b/source/text/sbasic/shared/Resume.xhp
index c7e46b901..e95860e51 100644
--- a/source/text/sbasic/shared/Resume.xhp
+++ b/source/text/sbasic/shared/Resume.xhp
@@ -28,9 +28,9 @@
      <paragraph role="bascode" id="par_id3150984" localize="false">Resume [ [0] | label | Next ]</paragraph>
    </bascode>
    <embed href="text/sbasic/shared/00000003.xhp#functparameters"/>
-    <paragraph role="paragraph" id="par_id481586090298901"><emph>0: </emph>Resets error information and re-executes the instruction that caused the error. <emph>0</emph> is optional.</paragraph>
-    <paragraph role="paragraph" id="par_id331586090532804"><emph>label: </emph>Resets error information and executes the instruction at the given label.</paragraph>
-    <paragraph role="paragraph" id="par_id331586090432804"><emph>Next: </emph>Resets error information and executes the instruction following the one that caused the error.</paragraph>
+    <paragraph role="paragraph" id="par_id481586090298901"><literal>0</literal>: Resets error information and re-executes the instruction that caused the error. <literal>0</literal> is optional.</paragraph>
+    <paragraph role="paragraph" id="par_id331586090532804"><emph>label: </emph>: Resets error information and resumes execution at the specified label of the current subroutine.</paragraph>
+    <paragraph role="paragraph" id="par_id331586090432804"><literal>Next</literal>: Resets error information and executes the instruction following the one that caused the error.</paragraph>
     <paragraph role="paragraph" id="par_id441586333320983">Error information is built with <literal>Erl</literal>, <literal>Err</literal> and <literal>Error$</literal> functions.</paragraph>
     <list type="unordered">
       <listitem><paragraph id="par_id741586333516110" role="listitem"><literal>Erl</literal>: Module line number where error occurs.</paragraph></listitem>
