source/text/sbasic/python/python_session.xhp | 36 ++++++++++++---------------
1 file changed, 16 insertions(+), 20 deletions(-)
New commits:
commit 7bb0e54187ed11a169f682c49c07a461f0e84d13
Author: LibreOfficiant <openoffici...@sfr.fr>
AuthorDate: Thu Feb 21 11:58:38 2019 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Feb 21 12:25:25 2019 +0100
Copying/Pasting sample code results in compiler error.
Embed tags in place of link within relatedtopics
Change-Id: I05d899e77a51c15d69e066bc94bd5bbb9ed69c8f
Reviewed-on: https://gerrit.libreoffice.org/68142
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/sbasic/python/python_session.xhp
b/source/text/sbasic/python/python_session.xhp
index 3d54a6ffe..2a35081a3 100644
--- a/source/text/sbasic/python/python_session.xhp
+++ b/source/text/sbasic/python/python_session.xhp
@@ -28,7 +28,7 @@
<h2 id="N0343">Examples:</h2>
<paragraph role="paragraph" id="N0344">With Python shell.</paragraph>
<paragraph role="paragraph" localize="false"
id="N0345"><literal>>>> from <the_module> import
Session</literal></paragraph>
- <paragraph role="paragraph" xml-lang="en-US"
id="N0346"><literal>>>> print(Session.SharedPythonScripts()) # class
method</literal></paragraph>
+ <paragraph role="paragraph" xml-lang="en-US"
id="N0346"><literal>>>> print(Session.SharedPythonScripts()) # static
method</literal></paragraph>
<paragraph role="paragraph" xml-lang="en-US"
id="N0347"><literal>>>> print(Session().UserName) # object
property</literal></paragraph>
<paragraph role="paragraph" xml-lang="en-US"
id="N0348"><literal>>>> input(Session().UserProfile) # object
property</literal></paragraph>
<h3 id="N0349">From <menuitem>Tools – Macros - Run Macro</menuitem>...
menu.</h3>
@@ -37,8 +37,8 @@
<paragraph role="pycode" localize="false" id="N0351"> </paragraph>
<paragraph role="pycode" localize="false" id="N0352">def
demo_session():</paragraph>
<paragraph role="pycode" localize="false" id="N0353"> import
screen_io as ui</paragraph>
- <paragraph role="pycode" xml-lang="en-US" id="N0354">
ui.MsgBox(Session.Share(),title='Installation Share') # class
method</paragraph>
- <paragraph role="pycode" xml-lang="en-US" id="N0355">
ui.Print(Session.SharedPythonScripts()) # class method</paragraph>
+ <paragraph role="pycode" xml-lang="en-US" id="N0354">
ui.MsgBox(Session.Share(),title='Installation Share') # static
method</paragraph>
+ <paragraph role="pycode" xml-lang="en-US" id="N0355">
ui.Print(Session.SharedPythonScripts()) # static method</paragraph>
<paragraph role="pycode" xml-lang="en-US" id="N0356"> s = Session()
# instance creation</paragraph>
<paragraph role="pycode" xml-lang="en-US" id="N0357">
ui.MsgBox(s.UserName,title='Hello') # object property</paragraph>
<paragraph role="pycode" xml-lang="en-US" id="N0358">
ui.Print(s.UserPythonScripts) # object property</paragraph>
@@ -76,31 +76,31 @@
<paragraph role="pycode" localize="false" id="N0384">class
Session():</paragraph>
<paragraph role="pycode" localize="false" id="N0385">
@staticmethod</paragraph>
<paragraph role="pycode" localize="false" id="N0386"> def
substitute(var_name):</paragraph>
- <paragraph role="pycode" localize="false" id="N0387"> ctx =
uno.getComponentContext()</paragraph>
- <paragraph role="pycode" localize="false" id="N0388"> ps =
ctx.getServiceManager().createInstanceWithContext(</paragraph>
- <paragraph role="pycode" localize="false" id="N0389">
'com.sun.star.util.PathSubstitution', ctx)</paragraph>
- <paragraph role="pycode" localize="false" id="N0390"> return
ps.getSubstituteVariableValue(var_name)</paragraph>
+ <paragraph role="pycode" localize="false" id="N0387"> ctx =
uno.getComponentContext()</paragraph>
+ <paragraph role="pycode" localize="false" id="N0388"> ps =
ctx.getServiceManager().createInstanceWithContext(</paragraph>
+ <paragraph role="pycode" localize="false" id="N0389">
'com.sun.star.util.PathSubstitution', ctx)</paragraph>
+ <paragraph role="pycode" localize="false" id="N0390"> return
ps.getSubstituteVariableValue(var_name)</paragraph>
<paragraph role="pycode" localize="false" id="N0391">
@staticmethod</paragraph>
<paragraph role="pycode" localize="false" id="N0392"> def
Share():</paragraph>
- <paragraph role="pycode" localize="false" id="N0393"> inst =
uno.fileUrlToSystemPath(Session.substitute("$(prog)"))</paragraph>
- <paragraph role="pycode" localize="false" id="N0394"> return
os.path.normpath(inst.replace('program',
"Share"))</paragraph>
+ <paragraph role="pycode" localize="false" id="N0393"> inst =
uno.fileUrlToSystemPath(Session.substitute("$(prog)"))</paragraph>
+ <paragraph role="pycode" localize="false" id="N0394"> return
os.path.normpath(inst.replace('program',
"Share"))</paragraph>
<paragraph role="pycode" localize="false" id="N0395">
@staticmethod</paragraph>
<paragraph role="pycode" localize="false" id="N0396"> def
SharedScripts():</paragraph>
- <paragraph role="pycode" localize="false" id="N0397"> return
''.join([Session.Share(), os.sep, "Scripts"])</paragraph>
+ <paragraph role="pycode" localize="false" id="N0397"> return
''.join([Session.Share(), os.sep, "Scripts"])</paragraph>
<paragraph role="pycode" localize="false" id="N0398">
@staticmethod</paragraph>
<paragraph role="pycode" localize="false" id="N0399"> def
SharedPythonScripts():</paragraph>
- <paragraph role="pycode" localize="false" id="N0400"> return
''.join([Session.SharedScripts(), os.sep,
'python'])</paragraph>
+ <paragraph role="pycode" localize="false" id="N0400"> return
''.join([Session.SharedScripts(), os.sep,
'python'])</paragraph>
<paragraph role="pycode" xml-lang="en-US" id="N0401"> @property #
alternative to '$(username)' variable</paragraph>
<paragraph role="pycode" localize="false" id="N0402"> def
UserName(self): return getpass.getuser()</paragraph>
<paragraph role="pycode" localize="false" id="N0403">
@property</paragraph>
<paragraph role="pycode" localize="false" id="N0404"> def
UserProfile(self):</paragraph>
- <paragraph role="pycode" localize="false" id="N0405"> return
uno.fileUrlToSystemPath(Session.substitute("$(user)"))</paragraph>
+ <paragraph role="pycode" localize="false" id="N0405"> return
uno.fileUrlToSystemPath(Session.substitute("$(user)"))</paragraph>
<paragraph role="pycode" localize="false" id="N0406">
@property</paragraph>
<paragraph role="pycode" localize="false" id="N0407"> def
UserScripts(self):</paragraph>
- <paragraph role="pycode" localize="false" id="N0408"> return
''.join([self.UserProfile, os.sep, 'Scripts'])</paragraph>
+ <paragraph role="pycode" localize="false" id="N0408"> return
''.join([self.UserProfile, os.sep, 'Scripts'])</paragraph>
<paragraph role="pycode" localize="false" id="N0409">
@property</paragraph>
<paragraph role="pycode" localize="false" id="N0410"> def
UserPythonScripts(self):</paragraph>
- <paragraph role="pycode" localize="false" id="N0411"> return
''.join([self.UserScripts, os.sep, "python"])</paragraph>
+ <paragraph role="pycode" localize="false" id="N0411"> return
''.join([self.UserScripts, os.sep, "python"])</paragraph>
</pycode>
<note id="N0342">Unlike Basic, pathname normalization is performed with
Python inside Session class.</note>
<h2 id="N0412">%PRODUCTNAME Basic Session class:</h2>
@@ -148,12 +148,8 @@
<paragraph role="bascode" localize="false" id="N0453">End Property
' Session.userPythonScripts</paragraph>
</bascode>
<section id="relatedtopics">
- <paragraph role="paragraph" id="N0454">
- <link href="text/sbasic/python/python_import.xhp">Importing Python
modules</link>
- </paragraph>
- <paragraph role="paragraph" id="N0455">
- <link href="text/sbasic/python/python_screen.xhp">Input/Output to
Screen</link>
- </paragraph>
+ <embed href="text/sbasic/python/python_import.xhp#pythonimporth1"/>
+ <embed href="text/sbasic/python/python_screen.xhp#ioscreen"/>
<embed href="text/sbasic/python/python_examples.xhp#pythonexamples2"/>
</section>
</body>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
