source/text/shared/00/00000021.xhp | 46 ++++++++++++++++++++++++++++--- source/text/shared/optionen/01010200.xhp | 13 ++++---- 2 files changed, 50 insertions(+), 9 deletions(-)
New commits: commit 8444c2c1af48ac5f7f4fd9555bae695c88b682bc Author: Michael Stahl <[email protected]> AuthorDate: Fri May 22 20:15:41 2020 +0200 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Tue May 26 11:47:25 2020 +0200 document new ODF 1.3 versions in Tools->Options->Load/Save Change-Id: I40a7f06274d311a537b8290cec4d7708c4c4ea4d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94705 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/source/text/shared/00/00000021.xhp b/source/text/shared/00/00000021.xhp index dae1427ef..3f867f2fe 100644 --- a/source/text/shared/00/00000021.xhp +++ b/source/text/shared/00/00000021.xhp @@ -78,6 +78,14 @@ <paragraph xml-lang="en-US" id="par_idN1077D" role="tablecontent">*.odm</paragraph> </tablecell> </tablerow> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_idN10779" role="tablecontent">ODF Master Document Template</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_idN1077E" role="tablecontent">*.otm</paragraph> + </tablecell> + </tablerow> <tablerow> <tablecell> <paragraph xml-lang="en-US" id="par_idN10783" role="tablecontent">HTML Document</paragraph> @@ -219,7 +227,18 @@ </tablerow> <tablerow> <tablecell> - <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent">ODF 1.2 (Extended)</paragraph> + <paragraph xml-lang="en-US" id="par_id1001200912381154" role="tablecontent">ODF 1.2 Extended (compatibility mode)</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id100120091238113" role="tablecontent">-</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id1001200912381175" role="tablecontent">LibreOffice 3.5</paragraph> + </tablecell> + </tablerow> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent">ODF 1.2 Extended</paragraph> </tablecell> <tablecell> <paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent">-</paragraph> @@ -228,9 +247,30 @@ <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent">OpenOffice.org 3.2 or StarOffice 9.2</paragraph> </tablecell> </tablerow> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id1001200912381155" role="tablecontent">ODF 1.3</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id100120091238114" role="tablecontent">TBD</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id1001200912381176" role="tablecontent">LibreOffice 7.0</paragraph> + </tablecell> + </tablerow> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id1001200912381156" role="tablecontent">ODF 1.3 Extended</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id100120091238115" role="tablecontent">-</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id1001200912381177" role="tablecontent">LibreOffice 7.0</paragraph> + </tablecell> + </tablerow> </table> - <paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US">In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version.</paragraph> -<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph> + <paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US">In current versions, you can select to save your documents using ODF 1.2 or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version.</paragraph> <paragraph role="tip" id="par_id3146907" xml-lang="en-US">If you want to define another file format as the default, choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - </menuitem><link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><menuitem>Load/Save - General</menuitem></link> to find alternative file formats for each $[officename] document type.</paragraph> <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2">XML file structure</paragraph> <paragraph role="paragraph" id="par_id3149649" xml-lang="en-US">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph> diff --git a/source/text/shared/optionen/01010200.xhp b/source/text/shared/optionen/01010200.xhp index 542a88b0b..e88dfad69 100644 --- a/source/text/shared/optionen/01010200.xhp +++ b/source/text/shared/optionen/01010200.xhp @@ -140,12 +140,13 @@ <h2 id="hd_id2016968">Default file format and ODF settings</h2> <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/odfversion" id="bm_id810266" localize="false"/> <h3 id="hd_id2659077">ODF format version</h3> - <paragraph xml-lang="en-US" id="par_id6944181" role="paragraph">OpenOffice.org 3 and StarOffice 9 introduced new features which have to be saved using the <link href="https://en.wikipedia.org/wiki/OpenDocument"; name="English Wikipedia: OpenDocument"><emph>OpenDocument></emph></link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph> - <paragraph xml-lang="en-US" id="par_id886257" role="paragraph">Current %PRODUCTNAME versions can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph> - <paragraph xml-lang="en-US" id="par_id8892483" role="paragraph">When you save a document, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1.</paragraph> - <note id="par_id0915200911205367">Currently, the ODF 1.2 (Extended) format enables files of Draw and Impress to contain comments. Those comments can be inserted by <item type="menuitem">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version.</note> - <paragraph xml-lang="en-US" id="par_id7198400" role="paragraph"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="par_id7198401" role="paragraph">The ODF 1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful, if you need to interchange ODF documents with users, who use pre-ODF1.2 or ODF1.2-only legacy applications.</paragraph> + <paragraph xml-lang="en-US" id="par_id6944182" role="paragraph">LibreOffice 7.0 supports the <link href="https://en.wikipedia.org/wiki/OpenDocument"; name="English Wikipedia: OpenDocument"><emph>OpenDocument</emph></link> format (ODF) version 1.3. The prior versions of LibreOffice support the file format ODF 1.2. Prior file formats cannot store all new features of the new software.</paragraph> + <paragraph xml-lang="en-US" id="par_id6944181" role="paragraph">OpenOffice.org 3 and StarOffice 9 introduced new features which have to be saved using the <link href="https://en.wikipedia.org/wiki/OpenDocument"; name="English Wikipedia: OpenDocument"><emph>OpenDocument</emph></link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph> + <paragraph xml-lang="en-US" id="par_id886257" role="paragraph">Current %PRODUCTNAME versions can open documents in ODF formats 1.0/1.1, 1.2, and 1.3.</paragraph> + <paragraph xml-lang="en-US" id="par_id8892483" role="paragraph">When you save a document, you can select whether to save the document in the format ODF 1.3, ODF 1.3 Extended, ODF 1.2, ODF 1.2 Extended, ODF 1.2 Extended (compatibility mode), or in the prior format ODF 1.0/1.1.</paragraph> + <note id="par_id0915200911205367">Currently, the ODF 1.2 (Extended) or newer formats enable files of Draw and Impress to contain comments. Those comments can be inserted by <item type="menuitem">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version.</note> + <paragraph xml-lang="en-US" id="par_id7198400" role="paragraph"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1, or ODF 1.2 format. You can select these format to save in the listbox. These older formats cannot store all new features, so the new format ODF 1.3 (Extended) is recommended where possible.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id7198401" role="paragraph">The ODF 1.2 Extended (compatibility mode) is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF 1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful if you need to interchange ODF documents with users who use pre-ODF 1.2 or ODF 1.2-only legacy applications.</paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/optsavepage/warnalienformat" id="bm_id6262092" localize="false"/> <bookmark xml-lang="en-US" branch="hid/sfx/ui/alienwarndialog/ask" id="bm_id7885982" localize="false"/> <h3 id="par_idN1091E">Warn when not saving in ODF or default format</h3> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
