source/auxiliary/sbasic.tree              |    3 +
 source/text/sbasic/shared/03131900.xhp    |   47 ++++++++++--------------------
 source/text/sbasic/shared/03132200.xhp    |    6 +--
 source/text/sbasic/shared/uno_objects.xhp |    2 +
 4 files changed, 24 insertions(+), 34 deletions(-)

New commits:
commit 2ba8d7ab8af821da34117ecb61bf8bd87e731b53
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Oct 30 15:59:18 2019 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Oct 31 01:21:01 2019 +0100

    tdf#127716 Add GlobalScope object description
    
    Also add BasicLibraries and DialogLibraries
    Refactor page
    Add entry in tree
    
    Change-Id: I9754af4d98fc6267120c232e1ba366262534b3a7
    Reviewed-on: https://gerrit.libreoffice.org/81803
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 5a6fc17a2..cce09691c 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -60,6 +60,7 @@
                     <topic id="sbasic/text/sbasic/shared/03120101.xhp">Asc 
Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03120111.xhp">AscW 
Function [VBA]</topic>
                     <topic id="sbasic/text/sbasic/shared/03080101.xhp">Atn 
Function</topic>
+                    <topic 
id="sbasic/text/sbasic/shared/03131900.xhp">BasicLibraries</topic>
                     <topic id="sbasic/text/sbasic/shared/03130100.xhp">Beep 
Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03010301.xhp">Blue 
Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03100100.xhp">CBool 
Function</topic>
@@ -118,6 +119,7 @@
                     <topic id="sbasic/text/sbasic/shared/03101600.xhp">DefLng 
Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03101700.xhp">DefObj 
Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03102000.xhp">DefVar 
Statement</topic>
+                    <topic 
id="sbasic/text/sbasic/shared/03131900.xhp">DialogLibraries</topic>
                     <topic 
id="sbasic/text/sbasic/shared/03104300.xhp">DimArray Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03102100.xhp">Dim 
Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03020404.xhp">Dir 
Function</topic>
@@ -274,6 +276,7 @@
                     <topic id="sbasic/text/sbasic/shared/03090410.xhp">Switch 
Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03140012.xhp">SYD 
Function [VBA]</topic>
                     <topic id="sbasic/text/sbasic/shared/03080104.xhp">Tan 
Function</topic>
+                    <topic 
id="sbasic/text/sbasic/shared/03132200.xhp">ThisComponent</topic>
                     <topic 
id="sbasic/text/sbasic/shared/03030205.xhp">TimeSerial Function</topic>
                     <topic 
id="sbasic/text/sbasic/shared/03030206.xhp">TimeValue Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03030302.xhp">Time 
Statement</topic>
diff --git a/source/text/sbasic/shared/03131900.xhp 
b/source/text/sbasic/shared/03131900.xhp
index ec885a29b..fbeb284fa 100644
--- a/source/text/sbasic/shared/03131900.xhp
+++ b/source/text/sbasic/shared/03131900.xhp
@@ -28,44 +28,29 @@
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
 </history>
 </meta>
-
 <body>
 <section id="globalscope">
 <bookmark xml-lang="en-US" branch="index" 
id="bm_id3150682"><bookmark_value>GlobalScope function</bookmark_value>
 <bookmark_value>library systems</bookmark_value>
 <bookmark_value>LibraryContainer</bookmark_value>
-<bookmark_value>BasicLibraries (LibraryContainer)</bookmark_value>
-<bookmark_value>DialogLibraries (LibraryContainer)</bookmark_value>
+<bookmark_value>GlobalScope</bookmark_value>
+<bookmark_value>BasicLibraries; library container</bookmark_value>
+<bookmark_value>DialogLibraries; library container</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150682" xml-lang="en-US" level="1"><link 
href="text/sbasic/shared/03131900.xhp" 
name="GlobalScope">GlobalScope</link></paragraph>
-<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US">Basic source 
code and dialogs are organized in a library system.</paragraph>
+<h1 id="hd_id3150682"><link href="text/sbasic/shared/03131900.xhp" 
name="GlobalScope">GlobalScope</link></h1>
+<paragraph role="paragraph" id="par_id991572457387308">To call a global 
library container (<emph>%PRODUCTNAME Macros</emph> or <emph>My Macros</emph>) 
from within a document, use the keyword 
<literal>GlobalScope</literal>.</paragraph>
 </section>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145315" xml-lang="en-US">The 
LibraryContainer contains libraries</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US">Libraries can 
contain modules and dialogs</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3143271" xml-lang="en-US" level="2">In 
Basic:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153061" xml-lang="en-US">The 
LibraryContainer is called <emph>BasicLibraries</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="2">In 
dialogs:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148663" xml-lang="en-US">The 
LibraryContainer is called <emph>DialogLibraries</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US">Both 
LibraryContainers exist in an application level and within every document. In 
the document Basic, the document's LibraryContainers are called automatically. 
If you want to call the global LibraryContainers from within a document, you 
must use the keyword <emph>GlobalScope</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" 
level="2">Syntax:</paragraph>
-<bascode>
-<paragraph role="bascode" localize="false" id="par_id3149203" 
xml-lang="en-US">GlobalScope</paragraph>
-</bascode>
-<paragraph role="heading" id="hd_id3154685" xml-lang="en-US" 
level="2">Example:</paragraph>
+<section id="basicdialogs">
+    <paragraph role="paragraph" id="par_id3153345" xml-lang="en-US">Basic 
source code and dialogs are organized in library containers. Libraries can 
contain modules and dialogs.</paragraph>
+</section>
+<h2 id="hd_id3143271">In Basic:</h2>
+<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US">A Basic 
library is called with <literal>BasicLibraries</literal> keyword.</paragraph>
+<h2 id="hd_id3154346">In dialogs:</h2>
+<paragraph role="paragraph" id="par_id3148663" xml-lang="en-US">A dialog 
library is called with <literal>DialogLibraries</literal> keyword.</paragraph>
+<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US">Both 
containers exist in an application level and within every document. In the 
document Basic, the document's library containers are called automatically. If 
you want to call a global library container (located in <emph>%PRODUCTNAME 
Macros</emph> or <emph>My Macros</emph>) from within a document, you must use 
the keyword <literal>GlobalScope</literal>.</paragraph>
+<embed href="text/sbasic/shared/00000003.xhp#functsyntax"/>
+<paragraph role="code" localize="false" id="par_id3149203" 
xml-lang="en-US">GlobalScope</paragraph>
+<embed href="text/sbasic/shared/00000003.xhp#functexample"/>
 <paragraph role="paragraph" id="par_id3154124" xml-lang="en-US">Example in the 
document Basic</paragraph>
 <bascode>
     <paragraph role="bascode" id="par_id3158408" xml-lang="en-US">' calling 
Dialog1 in the document library Standard</paragraph>
diff --git a/source/text/sbasic/shared/03132200.xhp 
b/source/text/sbasic/shared/03132200.xhp
index a4f19ddae..6c53deb3b 100644
--- a/source/text/sbasic/shared/03132200.xhp
+++ b/source/text/sbasic/shared/03132200.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textsbasicshared03132200xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">ThisComponent Statement</title>
+    <title id="tit" xml-lang="en-US">ThisComponent Object</title>
     <filename>/text/sbasic/shared/03132200.xhp</filename>
   </topic>
 </meta>
@@ -28,10 +28,10 @@
 <body>
 <section id="thiscomponent">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155342">
-  <bookmark_value>ThisComponent property</bookmark_value>
+  <bookmark_value>ThisComponent object</bookmark_value>
   <bookmark_value>components;addressing</bookmark_value>
 </bookmark>
-<paragraph id="hd_id3155342" role="heading" level="1" xml-lang="en-US"><link 
href="text/sbasic/shared/03132200.xhp" name="ThisComponent 
Statement">ThisComponent Statement</link></paragraph>
+<paragraph id="hd_id3155342" role="heading" level="1" xml-lang="en-US"><link 
href="text/sbasic/shared/03132200.xhp" name="ThisComponent 
Object">ThisComponent Object</link></paragraph>
 <paragraph id="par_id3154923" role="paragraph" xml-lang="en-US">Addresses the 
active component so that its properties can be read and set. ThisComponent is 
used from document Basic, where it represents the document the Basic belongs 
to. The type of object accessed by ThisComponent depends on the document 
type.<comment>see i60932</comment></paragraph>
 </section>
 <embed href="text/sbasic/shared/00000003.xhp#functsyntax"/>
diff --git a/source/text/sbasic/shared/uno_objects.xhp 
b/source/text/sbasic/shared/uno_objects.xhp
index 1b671523a..760fcd8f5 100644
--- a/source/text/sbasic/shared/uno_objects.xhp
+++ b/source/text/sbasic/shared/uno_objects.xhp
@@ -36,6 +36,8 @@
     <embed href="text/sbasic/shared/03104500.xhp#isunostruct"/>
     <embed href="text/sbasic/shared/03132500.xhp#getdefaultcontext"/>
     <embed href="text/sbasic/shared/stardesktop.xhp#stardesktop"/>
+    <h2 id="hd_id91572461246639"><link 
href="text/sbasic/shared/03131900.xhp#basicdialogs" 
name="basicanddialog">BasicLibrearies and DialogLibraries</link></h2>
+    <embed href="text/sbasic/shared/03131900.xhp#globalscope"/>
     <embed href="text/sbasic/shared/03132200.xhp#thiscomponent"/>
 </body>
 </helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to