source/text/sbasic/guide/show_dialog.xhp     |   24 ++++++++++++------------
 source/text/sbasic/python/python_dialogs.xhp |    4 ++--
 source/text/sbasic/shared/03/lib_tools.xhp   |    1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit a8a0ba510bc1b5d73d5267e1b36a0e00f4117816
Author:     LibreOfficiant <libreoffici...@sfr.fr>
AuthorDate: Sat May 25 11:00:14 2019 +0200
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon May 27 02:17:31 2019 +0200

    - Pages mutual x-Refs
    - Relate Tools help page to Basic Dialog page
    - Basic page title change
    - extra bookmark(s)
    - Basic code change
      - loadLibrary code change
      - loadDialog with full path (as best practice)
    
    Change-Id: Ia9a449b1dc8cb3a5acc7a921feeedebe7ce9cefb
    Reviewed-on: https://gerrit.libreoffice.org/72946
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/sbasic/guide/show_dialog.xhp 
b/source/text/sbasic/guide/show_dialog.xhp
index ee6596062..f59a481b0 100644
--- a/source/text/sbasic/guide/show_dialog.xhp
+++ b/source/text/sbasic/guide/show_dialog.xhp
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,27 +16,29 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-
-               <helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsbasicguideshow_dialogxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Opening a Dialog With Program Code</title>
+<title id="tit" xml-lang="en-US">Opening a Dialog With Basic</title>
 <filename>/text/sbasic/guide/show_dialog.xhp</filename>
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" 
id="bm_id3154140"><bookmark_value>module/dialog toggle</bookmark_value>
-<bookmark_value>dialogs;using program code to show (example)</bookmark_value>
-<bookmark_value>examples; showing a dialog using program code</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154140">
+   <bookmark_value>module/dialog toggle</bookmark_value>
+   <bookmark_value>dialogs;using Basic to show (example)</bookmark_value>
+   <bookmark_value>examples; showing a dialog with Basic</bookmark_value>
+   <bookmark_value>Tools;LoadDialog</bookmark_value>
 </bookmark><paragraph role="heading" id="hd_id3154140" xml-lang="en-US" 
level="1"><variable id="show_dialog"><link 
href="text/sbasic/guide/show_dialog.xhp" name="Opening a Dialog With Program 
Code">Opening a Dialog With Program Code</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US">In the <item 
type="productname">%PRODUCTNAME</item> BASIC window for a dialog that you 
created, leave the dialog editor by clicking the name tab of the Module that 
the dialog is assigned to. The name tab is at the bottom of the 
window.</paragraph>
 <paragraph role="paragraph" id="par_id3153968" xml-lang="en-US">Enter the 
following code for a subroutine called <emph>Dialog1Show</emph>. In this 
example, the name of the dialog that you created is "Dialog1":</paragraph>
 <bascode>
 <paragraph role="bascode" id="par_id3156443" xml-lang="en-US" 
localize="false">Sub Dialog1Show</paragraph>
-<paragraph role="bascode" id="par_id3148575" xml-lang="en-US" 
localize="false">    BasicLibraries.LoadLibrary("Tools")</paragraph>
-<paragraph role="bascode" id="par_id3152463" xml-lang="en-US" 
localize="false">    oDialog1 = LoadDialog("Standard", "Dialog1")</paragraph>
+<paragraph role="bascode" id="par_id6715587" xml-lang="en-US" 
localize="false">    With GlobalScope.Basiclibraries</paragraph>
+<paragraph role="bascode" id="par_id3148575" xml-lang="en-US" 
localize="false">       If Not .IsLibraryLoaded("Tools") Then 
.LoadLibrary("Tools")</paragraph>
+<paragraph role="bascode" id="par_id5815587" xml-lang="en-US" 
localize="false">    End With</paragraph>
+<paragraph role="bascode" id="par_id3152463" xml-lang="en-US" 
localize="false">    oDialog1 = Tools.ModuleControls.LoadDialog("Standard", 
"Dialog1")</paragraph>
 <paragraph role="bascode" id="par_id3148646" xml-lang="en-US" 
localize="false">    oDialog1.Execute()</paragraph>
 <paragraph role="bascode" id="par_id3147349" xml-lang="en-US" 
localize="false">End Sub</paragraph>
 </bascode>
@@ -56,6 +55,7 @@
 <embed href="text/sbasic/guide/control_properties.xhp#control_properties"/>
 <embed href="text/sbasic/guide/create_dialog.xhp#create_dialog"/>
 <embed href="text/sbasic/guide/insert_control.xhp#insert_control"/>
+<embed href="text/sbasic/python/python_dialogs.xhp#pythondialog"/>
 <embed href="text/sbasic/guide/sample_code.xhp#sample_code"/>
 </section>
 </body>
diff --git a/source/text/sbasic/python/python_dialogs.xhp 
b/source/text/sbasic/python/python_dialogs.xhp
index 6989e48f3..7f728b495 100644
--- a/source/text/sbasic/python/python_dialogs.xhp
+++ b/source/text/sbasic/python/python_dialogs.xhp
@@ -10,7 +10,7 @@
     -->
     <meta>
         <topic id="text/sbasic/python/Python_Dialog">
-            <title id="tit" xml-lang="en-US">Python: Opening a Dialog</title>
+            <title id="tit" xml-lang="en-US">Opening a Dialog with 
Python</title>
             <filename>/text/sbasic/python/python_dialogs.xhp</filename>
         </topic>
     </meta>
@@ -21,7 +21,7 @@
         <bookmark_value>dialogs;Python</bookmark_value>
     </bookmark>
     <section id="pythondialog1">
-        <h1 id="N0336"><variable id="pythondialog"><link 
href="text/sbasic/python/python_dialogs.xhp" name="command_name">Opening a 
Dialog in Python</link></variable></h1>
+        <h1 id="N0336"><variable id="pythondialog"><link 
href="text/sbasic/python/python_dialogs.xhp" name="command_name">Opening a 
Dialog with Python</link></variable></h1>
     </section>
     <paragraph role="paragraph" id="N0337">%PRODUCTNAME static dialogs are 
created with the <link href="text/sbasic/guide/create_dialog.xhp" name="dialog 
editor">Dialog editor</link> and are stored in varying places according to 
their personal (My Macros), shared (%PRODUCTNAME Macros) or document-embedded 
nature. In reverse, dynamic dialogs are constructed at runtime, from Basic or 
Python scripts, or using any other <link 
href="text/shared/guide/scripting.xhp">%PRODUCTNAME supported language</link> 
for that matter. Opening static dialogs with Python is illustrated herewith. 
Exception handling and internationalization are omitted for clarity.</paragraph>
     <h2 id="N0338">My Macros or %PRODUCTNAME Macros dialogs</h2>
diff --git a/source/text/sbasic/shared/03/lib_tools.xhp 
b/source/text/sbasic/shared/03/lib_tools.xhp
index dac54b168..97a6935ae 100644
--- a/source/text/sbasic/shared/03/lib_tools.xhp
+++ b/source/text/sbasic/shared/03/lib_tools.xhp
@@ -916,6 +916,7 @@
                         <paragraph id="par_id061520180728411337" 
role="bascode" localize="false" xml-lang="en-US">DialogName as String, 
</paragraph>
                         <paragraph id="par_id061520180728412212" 
role="bascode" localize="false" xml-lang="en-US">Optional 
oLibContainer)</paragraph>
                     </bascode>
+                  <paragraph role="paragraph" id="par_id261558858921700">Refer 
to <link href="text/sbasic/guide/show_dialog.xhp#show_dialog" name="Opening a 
Dialog with Basic">Opening a Dialog with Basic</link> for an example of 
LoadDialog function.</paragraph>
                 </tablecell>
             </tablerow>
             <tablerow>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to