source/text/shared/optionen/01130200.xhp | 55 +++++++++++++++++++------------
1 file changed, 35 insertions(+), 20 deletions(-)
New commits:
commit e1867b2cfa96b646f9692855897166f5732ca087
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Jun 18 14:29:03 2020 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Fri Jun 19 01:43:14 2020 +0200
tdf#133116 add lock file info in MSO OLE page
Change-Id: I6f947900bc0e00b2583b095d619063d6e6fe4178
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96622
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/optionen/01130200.xhp
b/source/text/shared/optionen/01130200.xhp
index b043f1006..c04c11e6d 100644
--- a/source/text/shared/optionen/01130200.xhp
+++ b/source/text/shared/optionen/01130200.xhp
@@ -25,30 +25,45 @@
<title xml-lang="en-US" id="tit">Microsoft Office</title>
<filename>/text/shared/optionen/01130200.xhp</filename>
</topic>
- </meta>
- <body>
- <section id="office1">
- <bookmark xml-lang="en-US"
branch="hid/cui/ui/optfltrembedpage/OptFilterPage" id="bm_id3158430"
localize="false"/>
- <bookmark xml-lang="en-US"
branch="hid/cui/ui/optfltrembedpage/@@nowidget@@" id="bm_id3158430"
localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3156410" role="heading"
level="1"><link href="text/shared/optionen/01130200.xhp" name="Microsoft
Office">Microsoft Office</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149095"
role="paragraph"><ahelp hid=".">Specifies the settings for importing and
exporting Microsoft Office documents.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#etsofi2"/>
- </section>
- <paragraph xml-lang="en-US" id="hd_id3146799" role="heading"
level="2">Embedded Objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3159234"
role="paragraph">The<emph> Embedded Objects </emph>section specifies how to
import and export Microsoft Office OLE objects.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph">These
settings are valid when no Microsoft OLE server exists (for example, in UNIX)
or when there is no $[officename] OLE server ready for editing the OLE
objects.</paragraph>
+</meta>
+<body>
+
+<section id="office1">
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfltrembedpage/OptFilterPage"
id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfltrembedpage/@@nowidget@@"
id="bm_id3158430" localize="false"/>
+<bookmark xml-lang="en-US" branch="index" id="bm_id881592499093945">
+<bookmark_value>Microsoft lock files</bookmark_value>
+<bookmark_value>lock files;Microsoft Office</bookmark_value>
+<bookmark_value>lock files;%PRODUCTNAME</bookmark_value>
+<bookmark_value>OLE objects;import and export</bookmark_value>
+<bookmark_value>embedded objects;import and export</bookmark_value>
+<bookmark_value>OLE objects;Microsoft Office</bookmark_value>
+<bookmark_value>OLE objects;PDF</bookmark_value>
+<bookmark_value>character highlighting;Microsoft Office export</bookmark_value>
+</bookmark>
+<h1 id="hd_id3156410"><link href="text/shared/optionen/01130200.xhp"
name="Microsoft Office">Microsoft Office</link></h1>
+<paragraph xml-lang="en-US" id="par_id3149095" role="paragraph"><ahelp
hid=".">Specifies the settings for importing and exporting Microsoft Office and
other documents.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<embed href="text/shared/00/00000406.xhp#etsofi2"/>
+</section>
+<h2 id="hd_id3146799">Embedded Objects</h2>
+ <paragraph xml-lang="en-US" id="par_id3159234" role="paragraph">The
<emph>Embedded Objects</emph> section specifies how to import and export
Microsoft Office or other OLE objects.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph">These
settings are valid when no Microsoft or other OLE server exists (for example,
in UNIX) or when there is no $[officename] OLE server ready for editing the OLE
objects.</paragraph>
<paragraph xml-lang="en-US" id="par_id0107200910364795"
role="paragraph">If an OLE server is active for the embedded object, then the
OLE server will be used to handle the object.</paragraph>
<paragraph xml-lang="en-US" id="par_id0107200910364725"
role="paragraph">If no OLE server is active for MathType objects, then embedded
MathType objects can be converted to %PRODUCTNAME Math objects. For this
conversion, the embedded MathType objects must not exceed the MathType 3.1
specifications.<comment>mail answer by Thomas Lange re
i97686</comment></paragraph>
<bookmark xml-lang="en-US"
branch="hid/cui/ui/optfltrembedpage/checklbcontainer" id="bm_id3158420"
localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="2">List
Box</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150670" role="paragraph"><ahelp
hid="cui/ui/optfltrembedpage/checklbcontainer">The<emph> List Box </emph>field
displays the entries for the pair of OLE objects that can be converted when
loading into $[officename] (L) and/or when saving into a Microsoft format (S).
</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph">Mark the
box in the [L] column in front of the entry if a Microsoft OLE object is to be
converted into the specified $[officename] OLE object when a Microsoft document
is loaded into $[officename].</paragraph>
+<h2 id="hd_id3146798">[L] and [S] Columns</h2>
+ <paragraph xml-lang="en-US" id="par_id3150670" role="paragraph"><ahelp
hid="cui/ui/optfltrembedpage/checklbcontainer">The <emph>[L] and [S]</emph>
checkbox displays the entries for the pair of OLE objects that can be converted
when loading into $[officename] [L] and/or when saving into a Microsoft format
[S]. </ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph">Mark the
box in the [L] column in front of the entry if a Microsoft or other OLE object
is to be converted into the specified $[officename] OLE object when a Microsoft
or other document is loaded into $[officename].</paragraph>
<paragraph xml-lang="en-US" id="par_id3153880" role="paragraph">Mark the
box in the [S] column in front of the entry if a $[officename] OLE object is to
be converted into the specified Microsoft OLE object when a document is saved
in a Microsoft file format.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optfltrembedpage/highlighting"
id="bm_id3158431" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui/ui/optfltrembedpage/shading"
id="bm_id3158432" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3146797" role="heading"
level="2">Character Background</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150671" role="paragraph"><ahelp
hid=".">Microsoft Office has two character attributes similar to $[officename]
character background. Select the appropriate attribute (highlighting or
shading) which you would like to use during export to Microsoft Office file
formats.</ahelp></paragraph>
- </body>
+<h2 id="hd_id3146797">Character Highlighting</h2>
+<paragraph xml-lang="en-US" id="par_id3150671" role="paragraph"><ahelp
hid=".">Microsoft Office has two character attributes similar to $[officename]
character background. Select the appropriate attribute (highlighting or
shading) which you would like to use during export to Microsoft Office file
formats.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optfltrembedpage/mso_lockfile"
id="bm_id271592496841390" localize="false"/>
+<h2 id="hd_id551592495779229">Lock files</h2>
+<paragraph role="paragraph" id="par_id91592496281531"><ahelp hid=".">Mark this
checkbox to generate a Microsoft Office lock file in addition to %PRODUCTNAME
own lock file.</ahelp> Lock files signal to applications that a resource or
file should not be used until the lock is released.</paragraph>
+<tip id="par_id931592496307158">%PRODUCTNAME can read lock files generated by
Microsoft Office.</tip>
+</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
