[Libreoffice-commits] help.git: 2 commits - source/text
Olivier Hallot
olivier.hallot at libreoffice.org
Tue May 16 13:30:04 UTC 2017
source/text/sbasic/shared/03010101.xhp | 182 +++++++++++++++++++--
source/text/sbasic/shared/03010102.xhp | 279 ++++++++++++++++++++++++++++++---
source/text/sbasic/shared/03020409.xhp | 115 +++++++++++--
source/text/sbasic/shared/03020414.xhp | 71 ++++++--
4 files changed, 578 insertions(+), 69 deletions(-)
New commits:
commit fd99f1798a440ccdfb34e910285a7c5c9a9ff08d
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Sat May 13 12:43:49 2017 -0300
tdf#84675 (part2) document hidden BASIC func/const
GetAttr()
SetAttr
Valid ATTR for SetAttr statement are
ATTR_NORMAL
ATTR_READONLY
ATTR_HIDDEN
Others ATTR_* were not implemented, see
http://opengrok.libreoffice.org/xref/core/basic/source/runtime/methods.cxx#4689
Change-Id: I51b50c13709b668c935b9a68981c20545648691d
Reviewed-on: https://gerrit.libreoffice.org/37576
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
diff --git a/source/text/sbasic/shared/03020409.xhp b/source/text/sbasic/shared/03020409.xhp
index a26b96530..8c1196fd9 100644
--- a/source/text/sbasic/shared/03020409.xhp
+++ b/source/text/sbasic/shared/03020409.xhp
@@ -54,27 +54,114 @@
<embed href="text/sbasic/shared/00000003.xhp#err53"/>
<paragraph id="hd_id3145364" role="heading" level="2" xml-lang="en-US">Value</paragraph>
-<paragraph id="par_id3147349" role="paragraph" xml-lang="en-US">0 : Normal files.</paragraph>
-<paragraph id="par_id3147434" role="paragraph" xml-lang="en-US">1 : Read-only files.</paragraph>
-<paragraph id="par_id3159154" role="paragraph" xml-lang="en-US">8 : Returns the name of the volume</paragraph>
-<paragraph id="par_id3145271" role="paragraph" xml-lang="en-US">16 : Returns the name of the directory only.</paragraph>
-<paragraph id="par_id3153953" role="paragraph" xml-lang="en-US">32 : File was changed since last backup (Archive bit).</paragraph>
+
+<table id="Table1">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522586822" role="tablehead" xml-lang="en-US">Named constant</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522583099" role="tablehead" xml-lang="en-US">Value</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522583818" role="tablehead" xml-lang="en-US">Definition</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522588740" role="tablecontent" xml-lang="en-US">ATTR_NORMAL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522583733" role="tablecontent" xml-lang="en-US">0</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3147349" role="paragraph" xml-lang="en-US"> Normal files.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522587742" role="tablecontent" xml-lang="en-US">ATTR_READONLY</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522584092" role="tablecontent" xml-lang="en-US">1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3147434" role="paragraph" xml-lang="en-US"> Read-only files.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id05122017054654588" role="tablecontent" xml-lang="en-US">ATTR_HIDDEN</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170546549512" role="tablecontent" xml-lang="en-US">2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170546544550" role="paragraph" xml-lang="en-US"> Hidden file</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170546546528" role="tablecontent" xml-lang="en-US">ATTR_SYSTEM</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170546548373" role="tablecontent" xml-lang="en-US">4</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170546546496" role="paragraph" xml-lang="en-US"> System file</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522588594" role="tablecontent" xml-lang="en-US">ATTR_VOLUME</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522581431" role="tablecontent" xml-lang="en-US">8</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3159154" role="paragraph" xml-lang="en-US"> Returns the name of the volume</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id05122017052258465" role="tablecontent" xml-lang="en-US">ATTR_DIRECTORY</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522585148" role="tablecontent" xml-lang="en-US">16</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3145271" role="paragraph" xml-lang="en-US"> Returns the name of the directory only.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522585987" role="tablecontent" xml-lang="en-US">ATTR_ARCHIVE</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522583804" role="tablecontent" xml-lang="en-US">32</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153953" role="paragraph" xml-lang="en-US"> File was changed since last backup (Archive bit).</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
+
<paragraph id="par_id3156444" role="paragraph" xml-lang="en-US">If you want to know if a bit of the attribute byte is set, use the following query method:</paragraph>
<paragraph id="hd_id3153094" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
<paragraph id="par_idm1341566848" role="bascode" localize="false" xml-lang="en-US">Sub ExampleSetGetAttr</paragraph>
<paragraph id="par_id3155415" role="bascode" xml-lang="en-US">On Error GoTo ErrorHandler ' Define target for error handler</paragraph>
-<paragraph id="par_idm1341563936" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test",16)="" Then MkDir "C:\test"</paragraph>
-<paragraph id="par_idm1341562672" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test\autoexec.sav")="" Then FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
-<paragraph id="par_idm1341561360" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" ,0</paragraph>
-<paragraph id="par_idm1341560096" role="bascode" localize="false" xml-lang="en-US"> FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
-<paragraph id="par_idm1341558816" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" ,1</paragraph>
-<paragraph id="par_idm1341557552" role="bascode" localize="false" xml-lang="en-US"> Print GetAttr( "c:\test\autoexec.sav" )</paragraph>
-<paragraph id="par_idm1341556288" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
+<paragraph id="par_idm1341563936" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test",16)="" Then MkDir "C:\test"</paragraph>
+<paragraph id="par_idm1341562672" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test\autoexec.sav")="" Then FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
+<paragraph id="par_idm1341561360" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" ,0</paragraph>
+<paragraph id="par_idm1341560096" role="bascode" localize="false" xml-lang="en-US"> FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
+<paragraph id="par_idm1341558816" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" ,1</paragraph>
+<paragraph id="par_idm1341557552" role="bascode" localize="false" xml-lang="en-US"> Print GetAttr( "c:\test\autoexec.sav" )</paragraph>
+<paragraph id="par_idm1341556288" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
<paragraph id="par_idm1341555056" role="bascode" localize="false" xml-lang="en-US">ErrorHandler:</paragraph>
-<paragraph id="par_idm1341553824" role="bascode" localize="false" xml-lang="en-US"> Print Error</paragraph>
-<paragraph id="par_idm1341552592" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
+<paragraph id="par_idm1341553824" role="bascode" localize="false" xml-lang="en-US"> Print Error</paragraph>
+<paragraph id="par_idm1341552592" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
<paragraph id="par_idm1341551360" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
</bascode>
</body>
diff --git a/source/text/sbasic/shared/03020414.xhp b/source/text/sbasic/shared/03020414.xhp
index f7296ea16..fbd727499 100644
--- a/source/text/sbasic/shared/03020414.xhp
+++ b/source/text/sbasic/shared/03020414.xhp
@@ -47,9 +47,54 @@
<paragraph id="par_id3154909" role="paragraph" xml-lang="en-US">FileName: Name of the file, including the path, that you want to test attributes of. If you do not enter a path, <emph>SetAttr</emph> searches for the file in the current directory. You can also use <link href="text/sbasic/shared/00000002.xhp" name="URL notation">URL notation</link>.</paragraph>
<paragraph id="par_id3153192" role="paragraph" xml-lang="en-US"> <emph>Attribute:</emph> Bit pattern defining the attributes that you want to set or to clear:</paragraph>
<paragraph id="par_id3145786" role="paragraph" xml-lang="en-US"> <emph>Value</emph> </paragraph>
-<paragraph id="par_id3152596" role="paragraph" xml-lang="en-US">0 : Normal files.</paragraph>
-<paragraph id="par_id3149262" role="paragraph" xml-lang="en-US">1 : Read-only files.</paragraph>
-<paragraph id="par_id3152576" role="paragraph" xml-lang="en-US">32 : File was changed since last backup (Archive bit).</paragraph>
+
+<table id="Table1">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522586822" role="tablehead" xml-lang="en-US">Named constant</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522583099" role="tablehead" xml-lang="en-US">Value</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522583818" role="tablehead" xml-lang="en-US">Definition</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522588740" role="tablecontent" xml-lang="en-US">ATTR_NORMAL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522583733" role="tablecontent" xml-lang="en-US">0</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3147349" role="paragraph" xml-lang="en-US"> Normal files.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170522587742" role="tablecontent" xml-lang="en-US">ATTR_READONLY</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170522584092" role="tablecontent" xml-lang="en-US">1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3147434" role="paragraph" xml-lang="en-US"> Read-only files.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id05122017054654588" role="tablecontent" xml-lang="en-US">ATTR_HIDDEN</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170546549512" role="tablecontent" xml-lang="en-US">2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170546544550" role="paragraph" xml-lang="en-US"> Hidden file</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
+
<paragraph id="par_id3153093" role="paragraph" xml-lang="en-US">You can set multiple attributes by combining the respective values with a logic OR statement.</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
@@ -59,17 +104,17 @@
<paragraph id="hd_id3147434" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
<paragraph id="par_idm1340803584" role="bascode" localize="false" xml-lang="en-US">Sub ExampleSetGetAttr</paragraph>
-<paragraph id="par_id3148645" role="bascode" xml-lang="en-US"> On Error GoTo ErrorHandler ' Define target for error handler</paragraph>
-<paragraph id="par_idm1340800592" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test",16)="" Then MkDir "C:\test"</paragraph>
-<paragraph id="par_idm1340799328" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test\autoexec.sav")="" Then FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
-<paragraph id="par_idm1340798016" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" ,0</paragraph>
-<paragraph id="par_idm1340796752" role="bascode" localize="false" xml-lang="en-US"> FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
-<paragraph id="par_idm1341620608" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" ,1</paragraph>
-<paragraph id="par_idm1341619344" role="bascode" localize="false" xml-lang="en-US"> Print GetAttr( "c:\test\autoexec.sav" )</paragraph>
-<paragraph id="par_idm1341618080" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
+<paragraph id="par_id3148645" role="bascode" xml-lang="en-US"> On Error GoTo ErrorHandler ' Define target for error handler</paragraph>
+<paragraph id="par_idm1340800592" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test",16)="" Then MkDir "C:\test"</paragraph>
+<paragraph id="par_idm1340799328" role="bascode" localize="false" xml-lang="en-US"> If Dir("C:\test\autoexec.sav")="" Then FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
+<paragraph id="par_idm1340798016" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" ,0</paragraph>
+<paragraph id="par_idm1340796752" role="bascode" localize="false" xml-lang="en-US"> FileCopy "c:\autoexec.bat", "c:\test\autoexec.sav"</paragraph>
+<paragraph id="par_idm1341620608" role="bascode" localize="false" xml-lang="en-US"> SetAttr "c:\test\autoexec.sav" , ATTR_READONLY</paragraph>
+<paragraph id="par_idm1341619344" role="bascode" localize="false" xml-lang="en-US"> Print GetAttr( "c:\test\autoexec.sav" )</paragraph>
+<paragraph id="par_idm1341618080" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
<paragraph id="par_idm1341616848" role="bascode" localize="false" xml-lang="en-US">ErrorHandler:</paragraph>
-<paragraph id="par_idm1341615616" role="bascode" localize="false" xml-lang="en-US"> Print Error</paragraph>
-<paragraph id="par_idm1341614384" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
+<paragraph id="par_idm1341615616" role="bascode" localize="false" xml-lang="en-US"> Print Error</paragraph>
+<paragraph id="par_idm1341614384" role="bascode" localize="false" xml-lang="en-US"> End</paragraph>
<paragraph id="par_idm1341613152" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
</bascode>
</body>
commit 9a16735c5ebee4513d02b8f28b2147ec9407c18a
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Fri May 12 15:46:17 2017 -0300
tdf#84675 (part) document hidden BASIC func/const
Help page for MsgBox function and MsgBox statement
Constants
MB_*
ID*
Fix: remove MB_DEFBUTTON1
fix bug#
Change-Id: Id8cbadc92a8e9c5902c3ff23b4e04bff3de3c03d
Reviewed-on: https://gerrit.libreoffice.org/37558
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
diff --git a/source/text/sbasic/shared/03010101.xhp b/source/text/sbasic/shared/03010101.xhp
index 86acce126..27782f5ea 100644
--- a/source/text/sbasic/shared/03010101.xhp
+++ b/source/text/sbasic/shared/03010101.xhp
@@ -47,31 +47,177 @@
<paragraph id="par_id3148798" role="paragraph" xml-lang="en-US"> <emph>Text</emph>: String expression displayed as a message in the dialog box. Line breaks can be inserted with Chr$(13).</paragraph>
<paragraph id="par_id3150769" role="paragraph" xml-lang="en-US"> <emph>DialogTitle</emph>: String expression displayed in the title bar of the dialog. If omitted, the title bar displays the name of the respective application.</paragraph>
<paragraph id="par_id3147228" role="paragraph" xml-lang="en-US"> <emph>Type</emph>: Any integer expression that specifies the dialog type, as well as the number and type of buttons to display, and the icon type. <emph>Type</emph> represents a combination of bit patterns, that is, a combination of elements can be defined by adding their respective values:</paragraph>
-<paragraph id="par_id3161832" role="paragraph" xml-lang="en-US">0 : Display OK button only.</paragraph>
-<paragraph id="par_id3153726" role="paragraph" xml-lang="en-US">1 : Display OK and Cancel buttons.</paragraph>
-<paragraph id="par_id3149665" role="paragraph" xml-lang="en-US">2 : Display Abort, Retry, and Ignore buttons.</paragraph>
-<paragraph id="par_id3147318" role="paragraph" xml-lang="en-US">3 : Display Yes, No and Cancel buttons.</paragraph>
-<paragraph id="par_id3155412" role="paragraph" xml-lang="en-US">4 : Display Yes and No buttons.</paragraph>
-<paragraph id="par_id3146119" role="paragraph" xml-lang="en-US">5 : Display Retry and Cancel buttons.</paragraph>
-<paragraph id="par_id3159155" role="paragraph" xml-lang="en-US">16 : Add the Stop icon to the dialog.</paragraph>
-<paragraph id="par_id3145366" role="paragraph" xml-lang="en-US">32 : Add the Question icon to the dialog.</paragraph>
-<paragraph id="par_id3147350" role="paragraph" xml-lang="en-US">48 : Add the Exclamation icon to the dialog.</paragraph>
-<paragraph id="par_id3149960" role="paragraph" xml-lang="en-US">64 : Add the Information icon to the dialog.</paragraph>
-<paragraph id="par_id3154944" role="paragraph" xml-lang="en-US">128 : First button in the dialog as default button.</paragraph>
-<paragraph id="par_id3155417" role="paragraph" xml-lang="en-US">256 : Second button in the dialog as default button.</paragraph>
-<paragraph id="par_id3153878" role="paragraph" xml-lang="en-US">512 : Third button in the dialog as default button.</paragraph>
+
+<table id="tbl_051220170220345412">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241588881" role="tablehead" xml-lang="en-US">Named constant</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241585541" role="tablehead" xml-lang="en-US">Integer value</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241585124" role="tablehead" xml-lang="en-US">Definition</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241588348" role="tablecontent" localize="false" xml-lang="en-US">MB_OK</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241583191" role="tablecontent" localize="false" xml-lang="en-US">0</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3147397" role="paragraph" xml-lang="en-US">Display OK button only.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241583930" role="tablecontent" localize="false" xml-lang="en-US">MB_OKCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241598544" role="tablecontent" localize="false" xml-lang="en-US">1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3145646" role="paragraph" xml-lang="en-US">Display OK and Cancel buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241591470" role="tablecontent" localize="false" xml-lang="en-US">MB_ABORTRETRYCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241592832" role="tablecontent" localize="false" xml-lang="en-US">2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3149410" role="paragraph" xml-lang="en-US">Display Abort, Retry, and Ignore buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241594311" role="tablecontent" localize="false" xml-lang="en-US">MB_YESNOCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241594996" role="tablecontent" localize="false" xml-lang="en-US">3</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3151075" role="paragraph" xml-lang="en-US">Display Yes, No, and Cancel buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241596937" role="tablecontent" localize="false" xml-lang="en-US">MB_YESNO</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241592706" role="tablecontent" localize="false" xml-lang="en-US">4</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153878" role="paragraph" xml-lang="en-US">Display Yes and No buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241591119" role="tablecontent" localize="false" xml-lang="en-US">MB_RETRYCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241595093" role="tablecontent" localize="false" xml-lang="en-US">5</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3155601" role="paragraph" xml-lang="en-US">Display Retry and Cancel buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id05122017024159933" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONSTOP</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id05122017024159655" role="tablecontent" localize="false" xml-lang="en-US">16</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3150716" role="paragraph" xml-lang="en-US">Add the Stop icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241591424" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONQUESTION</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241593191" role="tablecontent" localize="false" xml-lang="en-US">32</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153837" role="paragraph" xml-lang="en-US">Add the Question icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241598357" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONEXCLAMATION</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242002870" role="tablecontent" localize="false" xml-lang="en-US">48</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3150751" role="paragraph" xml-lang="en-US">Add the Exclamation Point icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242001511" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONINFORMATION</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242008091" role="tablecontent" localize="false" xml-lang="en-US">64</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3146915" role="paragraph" xml-lang="en-US">Add the Information icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242003564" role="tablecontent" localize="false" xml-lang="en-US"> </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242001398" role="tablecontent" localize="false" xml-lang="en-US">128</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3145640" role="paragraph" xml-lang="en-US">First button in the dialog as default button.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242007839" role="tablecontent" localize="false" xml-lang="en-US">MB_DEFBUTTON2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242005589" role="tablecontent" localize="false" xml-lang="en-US">256</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153765" role="paragraph" xml-lang="en-US">Second button in the dialog as default button.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242005074" role="tablecontent" localize="false" xml-lang="en-US">MB_DEFBUTTON3</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242001655" role="tablecontent" localize="false" xml-lang="en-US">512</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153715" role="paragraph" xml-lang="en-US">Third button in the dialog as default button.</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
+
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
<paragraph id="hd_id3150715" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
<bascode>
<paragraph id="par_idm1340869408" role="bascode" localize="false" xml-lang="en-US">Sub ExampleMsgBox</paragraph>
-<paragraph id="par_id3150327" role="bascode" xml-lang="en-US"> Const sText1 = "An unexpected error occurred."</paragraph>
-<paragraph id="par_id3146912" role="bascode" xml-lang="en-US"> Const sText2 = "The program execution will continue, however."</paragraph>
-<paragraph id="par_id3154757" role="bascode" xml-lang="en-US"> Const sText3 = "Error"</paragraph>
-<paragraph id="par_idm1340862944" role="bascode" localize="false" xml-lang="en-US"> MsgBox(sText1 + Chr(13) + sText2,16,sText3)</paragraph>
+<paragraph id="par_id3150327" role="bascode" xml-lang="en-US"> Const sText1 = "An unexpected error occurred."</paragraph>
+<paragraph id="par_id3146912" role="bascode" xml-lang="en-US"> Const sText2 = "The program execution will continue, however."</paragraph>
+<paragraph id="par_id3154757" role="bascode" xml-lang="en-US"> Const sText3 = "Error"</paragraph>
+<paragraph id="par_idm1340862944" role="bascode" localize="false" xml-lang="en-US"> MsgBox(sText1 + Chr(13) + sText2,16,sText3)</paragraph>
+<paragraph id="par_id051220170312352138" role="bascode" localize="false" xml-lang="en-US"> MsgBox(sText1 + Chr(13) + sText2, MB_ICONSTOP, sText3)</paragraph>
<paragraph id="par_idm1340861680" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
</bascode>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/sbasic/shared/03010102.xhp b/source/text/sbasic/shared/03010102.xhp
index b11459e74..aa54b77c5 100644
--- a/source/text/sbasic/shared/03010102.xhp
+++ b/source/text/sbasic/shared/03010102.xhp
@@ -51,27 +51,257 @@
<paragraph id="par_id3147317" role="paragraph" xml-lang="en-US"> <emph>DialogTitle</emph>: String expression displayed in the title bar of the dialog. If omitted, the name of the respective application is displayed.</paragraph>
<paragraph id="par_id3153954" role="paragraph" xml-lang="en-US"> <emph>Type</emph>: Any integer expression that specifies the dialog type and defines the number and type of buttons or icons displayed. <emph>Type</emph> represents a combination of bit patterns (dialog elements defined by adding the respective values):</paragraph>
<paragraph id="par_id3154319" role="paragraph" xml-lang="en-US"> <emph>Values</emph> </paragraph>
-<paragraph id="par_id3147397" role="paragraph" xml-lang="en-US">0 : Display OK button only.</paragraph>
-<paragraph id="par_id3145646" role="paragraph" xml-lang="en-US">1 : Display OK and Cancel buttons.</paragraph>
-<paragraph id="par_id3149410" role="paragraph" xml-lang="en-US">2 : Display Abort, Retry, and Ignore buttons.</paragraph>
-<paragraph id="par_id3151075" role="paragraph" xml-lang="en-US">3 : Display Yes, No, and Cancel buttons.</paragraph>
-<paragraph id="par_id3153878" role="paragraph" xml-lang="en-US">4 : Display Yes and No buttons.</paragraph>
-<paragraph id="par_id3155601" role="paragraph" xml-lang="en-US">5 : Display Retry and Cancel buttons.</paragraph>
-<paragraph id="par_id3150716" role="paragraph" xml-lang="en-US">16 : Add the Stop icon to the dialog.</paragraph>
-<paragraph id="par_id3153837" role="paragraph" xml-lang="en-US">32 : Add the Question icon to the dialog.</paragraph>
-<paragraph id="par_id3150751" role="paragraph" xml-lang="en-US">48 : Add the Exclamation Point icon to the dialog.</paragraph>
-<paragraph id="par_id3146915" role="paragraph" xml-lang="en-US">64 : Add the Information icon to the dialog.</paragraph>
-<paragraph id="par_id3145640" role="paragraph" xml-lang="en-US">128 : First button in the dialog as default button.</paragraph>
-<paragraph id="par_id3153765" role="paragraph" xml-lang="en-US">256 : Second button in the dialog as default button.</paragraph>
-<paragraph id="par_id3153715" role="paragraph" xml-lang="en-US">512 : Third button in the dialog as default button.</paragraph>
+
+<table id="tbl_051220170220345412">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241588881" role="tablehead" xml-lang="en-US">Named constant</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241585541" role="tablehead" xml-lang="en-US">Integer value</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241585124" role="tablehead" xml-lang="en-US">Definition</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241588348" role="tablecontent" localize="false" xml-lang="en-US">MB_OK</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241583191" role="tablecontent" localize="false" xml-lang="en-US">0</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3147397" role="paragraph" xml-lang="en-US">Display OK button only.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241583930" role="tablecontent" localize="false" xml-lang="en-US">MB_OKCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241598544" role="tablecontent" localize="false" xml-lang="en-US">1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3145646" role="paragraph" xml-lang="en-US">Display OK and Cancel buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241591470" role="tablecontent" localize="false" xml-lang="en-US">MB_ABORTRETRYCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241592832" role="tablecontent" localize="false" xml-lang="en-US">2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3149410" role="paragraph" xml-lang="en-US">Display Abort, Retry, and Ignore buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241594311" role="tablecontent" localize="false" xml-lang="en-US">MB_YESNOCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241594996" role="tablecontent" localize="false" xml-lang="en-US">3</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3151075" role="paragraph" xml-lang="en-US">Display Yes, No, and Cancel buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241596937" role="tablecontent" localize="false" xml-lang="en-US">MB_YESNO</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241592706" role="tablecontent" localize="false" xml-lang="en-US">4</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153878" role="paragraph" xml-lang="en-US">Display Yes and No buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241591119" role="tablecontent" localize="false" xml-lang="en-US">MB_RETRYCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241595093" role="tablecontent" localize="false" xml-lang="en-US">5</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3155601" role="paragraph" xml-lang="en-US">Display Retry and Cancel buttons.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id05122017024159933" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONSTOP</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id05122017024159655" role="tablecontent" localize="false" xml-lang="en-US">16</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3150716" role="paragraph" xml-lang="en-US">Add the Stop icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241591424" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONQUESTION</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170241593191" role="tablecontent" localize="false" xml-lang="en-US">32</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153837" role="paragraph" xml-lang="en-US">Add the Question icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170241598357" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONEXCLAMATION</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242002870" role="tablecontent" localize="false" xml-lang="en-US">48</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3150751" role="paragraph" xml-lang="en-US">Add the Exclamation Point icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242001511" role="tablecontent" localize="false" xml-lang="en-US">MB_ICONINFORMATION</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242008091" role="tablecontent" localize="false" xml-lang="en-US">64</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3146915" role="paragraph" xml-lang="en-US">Add the Information icon to the dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242003564" role="tablecontent" localize="false" xml-lang="en-US"> </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242001398" role="tablecontent" localize="false" xml-lang="en-US">128</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3145640" role="paragraph" xml-lang="en-US">First button in the dialog as default button.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242007839" role="tablecontent" localize="false" xml-lang="en-US">MB_DEFBUTTON2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242005589" role="tablecontent" localize="false" xml-lang="en-US">256</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153765" role="paragraph" xml-lang="en-US">Second button in the dialog as default button.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170242005074" role="tablecontent" localize="false" xml-lang="en-US">MB_DEFBUTTON3</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170242001655" role="tablecontent" localize="false" xml-lang="en-US">512</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3153715" role="paragraph" xml-lang="en-US">Third button in the dialog as default button.</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
+
<paragraph id="par_id3159267" role="paragraph" xml-lang="en-US"> <emph>Return value:</emph> </paragraph>
-<paragraph id="par_id3145230" role="paragraph" xml-lang="en-US">1 : OK</paragraph>
-<paragraph id="par_id3149567" role="paragraph" xml-lang="en-US">2 : Cancel</paragraph>
-<paragraph id="par_id4056825" role="paragraph" xml-lang="en-US">3 : Abort</paragraph>
-<paragraph id="par_id3155335" role="paragraph" xml-lang="en-US">4 : Retry</paragraph>
-<paragraph id="par_id3146918" role="paragraph" xml-lang="en-US">5 : Ignore</paragraph>
-<paragraph id="par_id3155961" role="paragraph" xml-lang="en-US">6 : Yes</paragraph>
-<paragraph id="par_id3148488" role="paragraph" xml-lang="en-US">7 : No</paragraph>
+
+<table id="tbl_051220170325378371">
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170330379805" role="tablehead" xml-lang="en-US">Named constant</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330387072" role="tablehead" xml-lang="en-US">Integer value</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330387973" role="tablehead" xml-lang="en-US">Definition</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170330388585" role="tablecontent" localize="false" xml-lang="en-US">IDOK</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330389516" role="tablecontent" localize="false" xml-lang="en-US">1</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3145230" role="paragraph" xml-lang="en-US"> OK</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170330381793" role="tablecontent" localize="false" xml-lang="en-US">IDCANCEL</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330388083" role="tablecontent" localize="false" xml-lang="en-US">2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3149567" role="paragraph" xml-lang="en-US"> Cancel</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170330387992" role="tablecontent" localize="false" xml-lang="en-US">IDABORT</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id05122017033038256" role="tablecontent" localize="false" xml-lang="en-US">3</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id4056825" role="paragraph" xml-lang="en-US"> Abort</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170330383300" role="tablecontent" localize="false" xml-lang="en-US">IDRETRY</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330382200" role="tablecontent" localize="false" xml-lang="en-US">4</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3155335" role="paragraph" xml-lang="en-US"> Retry</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id0512201703303859" role="tablecontent" localize="false" xml-lang="en-US">IDIGNORE</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330388644" role="tablecontent" localize="false" xml-lang="en-US">5</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3146918" role="paragraph" xml-lang="en-US"> Ignore</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170330386652" role="tablecontent" localize="false" xml-lang="en-US">IDYES</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330387211" role="tablecontent" localize="false" xml-lang="en-US">6</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3155961" role="paragraph" xml-lang="en-US"> Yes</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph id="par_id051220170330381656" role="tablecontent" localize="false" xml-lang="en-US">IDNO</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id051220170330383819" role="tablecontent" localize="false" xml-lang="en-US">7</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph id="par_id3148488" role="paragraph" xml-lang="en-US"> No</paragraph>
+ </tablecell>
+ </tablerow>
+</table>
+
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
@@ -79,11 +309,12 @@
<bascode>
<paragraph id="par_idm1340837456" role="bascode" localize="false" xml-lang="en-US">Sub ExampleMsgBox</paragraph>
<paragraph id="par_idm1340836224" role="bascode" localize="false" xml-lang="en-US">Dim sVar As Integer</paragraph>
-<paragraph id="par_id3151278" role="bascode" xml-lang="en-US"> sVar = MsgBox("Las Vegas")</paragraph>
-<paragraph id="par_id3149034" role="bascode" xml-lang="en-US"> sVar = MsgBox("Las Vegas",1)</paragraph>
-<paragraph id="par_id3166424" role="bascode" xml-lang="en-US"> sVar = MsgBox( "Las Vegas",256 + 16 + 2,"Dialog title")</paragraph>
+<paragraph id="par_id3151278" role="bascode" xml-lang="en-US"> sVar = MsgBox("Las Vegas")</paragraph>
+<paragraph id="par_id3149034" role="bascode" xml-lang="en-US"> sVar = MsgBox("Las Vegas",1)</paragraph>
+<paragraph id="par_id3166424" role="bascode" xml-lang="en-US"> sVar = MsgBox( "Las Vegas",256 + 16 + 2,"Dialog title")</paragraph>
+<paragraph id="par_id051220170242005479" role="bascode" xml-lang="en-US"> sVar = MsgBox("Las Vegas", MB_DEFBUTTON2 + MB_ICONSTOP + MB_ABORTRETRYCANCEL, "Dialog title")</paragraph>
<paragraph id="par_idm1340829728" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
</bascode>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
More information about the Libreoffice-commits
mailing list