diff options
| -rw-r--r-- | AllLangHelp_sbasic.mk | 1 | ||||
| -rw-r--r-- | help3xsl/online_transform.xsl | 56 | ||||
| -rw-r--r-- | source/auxiliary/sbasic.tree | 1 | ||||
| -rw-r--r-- | source/text/sbasic/shared/03130000.xhp | 1 | ||||
| -rw-r--r-- | source/text/sbasic/shared/03130600.xhp | 13 | ||||
| -rw-r--r-- | source/text/sbasic/shared/03130610.xhp | 51 |
6 files changed, 89 insertions, 34 deletions
diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index 11c686abe7..21f9589633 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -317,6 +317,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/03130100 \ helpcontent2/source/text/sbasic/shared/03130500 \ helpcontent2/source/text/sbasic/shared/03130600 \ + helpcontent2/source/text/sbasic/shared/03130610 \ helpcontent2/source/text/sbasic/shared/03130700 \ helpcontent2/source/text/sbasic/shared/03130800 \ helpcontent2/source/text/sbasic/shared/03131000 \ diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 5fa01a773b..2bd356a8c7 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -473,35 +473,35 @@ <!-- LIST --> <xsl:template match="list"> - <xsl:choose> - <xsl:when test="@type='ordered'"> - <ol> - <xsl:if test="@startwith"> - <xsl:attribute name="start"><xsl:value-of select="@startwith"/></xsl:attribute> - </xsl:if> - <xsl:apply-templates /> - </ol> - </xsl:when> - <xsl:otherwise> - <ul><xsl:apply-templates /></ul> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="@type='ordered'"> + <ol> + <xsl:if test="@startwith"> + <xsl:attribute name="start"><xsl:value-of select="@startwith"/></xsl:attribute> + </xsl:if> + <xsl:apply-templates /> + </ol> + </xsl:when> + <xsl:otherwise> + <ul><xsl:apply-templates /></ul> + </xsl:otherwise> + </xsl:choose> </xsl:template> <xsl:template match="list" mode="embedded"> - <xsl:choose> - <xsl:when test="@type='ordered'"> - <ol> - <xsl:if test="@startwith"> - <xsl:attribute name="start"><xsl:value-of select="@startwith"/></xsl:attribute> - </xsl:if> - <xsl:apply-templates mode="embedded"/> - </ol> - </xsl:when> - <xsl:otherwise> - <ul><xsl:apply-templates mode="embedded"/></ul> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <xsl:when test="@type='ordered'"> + <ol> + <xsl:if test="@startwith"> + <xsl:attribute name="start"><xsl:value-of select="@startwith"/></xsl:attribute> + </xsl:if> + <xsl:apply-templates mode="embedded"/> + </ol> + </xsl:when> + <xsl:otherwise> + <ul><xsl:apply-templates mode="embedded"/></ul> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!-- LISTITEM --> @@ -519,12 +519,12 @@ <!-- OBJECT --> <xsl:template match="object"> <xsl:if test="$online"> - <xsl:call-template name="insertobject"/> + <xsl:call-template name="insertobject"/> </xsl:if> </xsl:template> <xsl:template match="object" mode="embedded"> <xsl:if test="$online"> - <xsl:call-template name="insertobject"/> + <xsl:call-template name="insertobject"/> </xsl:if> </xsl:template> diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 6e3fcd8421..a803d00b1f 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -281,6 +281,7 @@ <topic id="sbasic/text/sbasic/shared/03120310.xhp">UCase Function</topic> <topic id="sbasic/text/sbasic/shared/03120104.xhp">Val Function</topic> <topic id="sbasic/text/sbasic/shared/03130600.xhp">Wait Statement</topic> + <topic id="sbasic/text/sbasic/shared/03130610.xhp">WaitUntil Statement</topic> <topic id="sbasic/text/sbasic/shared/03030105.xhp">WeekDay Function</topic> <topic id="sbasic/text/sbasic/shared/03150001.xhp">WeekdayName Function [VBA]</topic> <topic id="sbasic/text/sbasic/shared/03090203.xhp">While...Wend Statement</topic> diff --git a/source/text/sbasic/shared/03130000.xhp b/source/text/sbasic/shared/03130000.xhp index 9be85339ed..5b458428b5 100644 --- a/source/text/sbasic/shared/03130000.xhp +++ b/source/text/sbasic/shared/03130000.xhp @@ -37,6 +37,7 @@ <embed href="text/sbasic/shared/03130100.xhp#beep"/> <embed href="text/sbasic/shared/03130500.xhp#shell"/> <embed href="text/sbasic/shared/03130600.xhp#wait"/> +<embed href="text/sbasic/shared/03130610.xhp#waituntil"/> <embed href="text/sbasic/shared/03130700.xhp#getsystemticks"/> <embed href="text/sbasic/shared/03130800.xhp#environ"/> <embed href="text/sbasic/shared/03131000.xhp#getsolarversion"/> diff --git a/source/text/sbasic/shared/03130600.xhp b/source/text/sbasic/shared/03130600.xhp index 9a78d75b20..849f00c864 100644 --- a/source/text/sbasic/shared/03130600.xhp +++ b/source/text/sbasic/shared/03130600.xhp @@ -35,16 +35,14 @@ <paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1"><link href="text/sbasic/shared/03130600.xhp" name="Wait Statement">Wait Statement</link></paragraph> <paragraph role="paragraph" id="par_id3149236" xml-lang="en-US">Interrupts the program execution for the amount of time that you specify in milliseconds.</paragraph> </section> -<paragraph role="heading" id="hd_id3143229" xml-lang="en-US" level="2">Syntax:</paragraph> -<bascode> -<paragraph role="bascode" id="par_id3150669" xml-lang="en-US">Wait millisec</paragraph> -</bascode> -<paragraph role="heading" id="hd_id3148943" xml-lang="en-US" level="2">Parameters:</paragraph> +<embed href="text/sbasic/shared/00000003.xhp#functsyntax"/> +<paragraph role="code" id="par_id3150669" xml-lang="en-US">Wait millisec</paragraph> +<embed href="text/sbasic/shared/00000003.xhp#functparameters"/> <paragraph role="paragraph" id="par_id3154924" xml-lang="en-US"> <emph>millisec:</emph> Numeric expression that contains the amount of time (in milliseconds) to wait before the program is executed.</paragraph> <embed href="text/sbasic/shared/00000003.xhp#errorcode"/> <embed href="text/sbasic/shared/00000003.xhp#err5"/> -<paragraph role="heading" id="hd_id3150541" xml-lang="en-US" level="2">Example:</paragraph> +<embed href="text/sbasic/shared/00000003.xhp#functexample"/> <bascode> <paragraph role="bascode" id="par_id3154138" xml-lang="en-US" localize="false">Sub ExampleWait</paragraph> <paragraph role="bascode" id="par_id3154367" xml-lang="en-US" localize="false">Dim lTick As Long</paragraph> @@ -54,6 +52,9 @@ <paragraph role="bascode" id="par_id3156214" xml-lang="en-US"> MsgBox "" & lTick & " Ticks" ,0,"The pause lasted"</paragraph> <paragraph role="bascode" id="par_id3148922" xml-lang="en-US" localize="false">End Sub</paragraph> </bascode> +<section id="relatedtopics"> + <paragraph role="paragraph" id="par_id251546102545124"><link href="text/sbasic/shared/03130610.xhp" name="WaitUntil statement">WaitUntil statement</link></paragraph> +</section> </body> </helpdocument> diff --git a/source/text/sbasic/shared/03130610.xhp b/source/text/sbasic/shared/03130610.xhp new file mode 100644 index 0000000000..1e68ce7aa5 --- /dev/null +++ b/source/text/sbasic/shared/03130610.xhp @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +* This file is part of the LibreOffice project. +* +* This Source Code Form is subject to the terms of the Mozilla Public +* License, v. 2.0. If a copy of the MPL was not distributed with this +* file, You can obtain one at http://mozilla.org/MPL/2.0/. +* +--> + +<helpdocument version="1.0"> + <meta> + <topic id="textsbasicshared03130610xml" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">WaitUntil Statement</title> + <filename>/text/sbasic/shared/03130610.xhp</filename> + </topic> + </meta> + <body> + <section id="waituntil"> + <bookmark xml-lang="en-US" branch="index" id="bm_id3154136"> + <bookmark_value>WaitUntil statement</bookmark_value> + </bookmark> + <h1 id="hd_id3154136"><link href="text/sbasic/shared/03130610.xhp" name="WaitUntil Statement">WaitUntil Statement</link></h1> + <paragraph role="paragraph" id="par_id3149236">Interrupts the program execution until the time specified.</paragraph> + </section> + <embed href="text/sbasic/shared/00000003.xhp#functsyntax"/> + <paragraph role="code" id="par_id3150669">WaitUntil Time</paragraph> + <embed href="text/sbasic/shared/00000003.xhp#functparameters"/> + <paragraph role="paragraph" id="par_id3154924"> + <emph>Time</emph>: A Date and Time expression that contains the date and time to wait before the program is executed.</paragraph> + <embed href="text/sbasic/shared/00000003.xhp#errorcode"/> + <embed href="text/sbasic/shared/00000003.xhp#err5"/> + <embed href="text/sbasic/shared/00000003.xhp#functexample"/> + + <bascode> + <paragraph role="bascode" id="par_id161546104675066">REM Wait until 6:00 PM then call MyMacro.</paragraph> + <paragraph role="bascode" id="par_id1001546104650052">REM If after 6:00 PM, exit.</paragraph> + <paragraph role="bascode" id="par_id3154138" localize="false">Sub ExampleWaitUntil</paragraph> + <paragraph role="bascode" id="par_id3154367" localize="false">Dim vTimeschedule As Long</paragraph> + <paragraph role="bascode" id="par_id3154909" localize="false"> vTimeSchedule = Date() + TimeValue("18:00:00")</paragraph> + <paragraph role="bascode" id="par_id3151042" localize="false"> If vTimeSchedule < Now() Then Exit Sub</paragraph> + <paragraph role="bascode" id="par_id3154217" localize="false"> WaitUntil vTimeSchedule</paragraph> + <paragraph role="bascode" id="par_id3156214" localize="false"> Call MyMacro</paragraph> + <paragraph role="bascode" id="par_id3148922" localize="false">End Sub</paragraph> + </bascode> + <section id="relatedtopics"> + <paragraph role="paragraph" id="par_id251546102545124"><link href="text/sbasic/shared/03130600.xhp" name="Wait statement">Wait statement</link></paragraph> + </section> +</body> +</helpdocument> |