source/text/shared/optionen/01041000.xhp | 32 ++++++++--------
source/text/shared/optionen/01070500.xhp | 59 +++++++++++++++++++------------
2 files changed, 54 insertions(+), 37 deletions(-)
New commits:
commit 37a143c8e41209ae1836215e83313250de5a2fb4
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Nov 4 20:43:19 2022 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sun Nov 6 16:14:57 2022 +0100
Fix missing link and refactr
Option "printeroptions" no more available
Change-Id: I4aa67acaf2c24db196b14904e781679425bf8baa
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142314
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/optionen/01041000.xhp
b/source/text/shared/optionen/01041000.xhp
index d77ad09e0f..dda89b48f0 100644
--- a/source/text/shared/optionen/01041000.xhp
+++ b/source/text/shared/optionen/01041000.xhp
@@ -37,51 +37,51 @@
<section id="compatibility">
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcompatpage/OptCompatPage" id="bm_id2023987"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcompatpage/@@nowidget@@" id="bm_@@nowidget@@"
localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN10607" role="heading"
level="1"><variable id="compatibility_var"><link
href="text/shared/optionen/01041000.xhp">Compatibility</link>
-</variable></paragraph>
+<h1 id="par_idN10607"><variable id="compatibility_var"><link
href="text/shared/optionen/01041000.xhp">Compatibility</link>
+</variable></h1>
<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/optcompatpage/OptCompatPage">Specifies compatibility
settings for text documents. These options help in fine-tuning %PRODUCTNAME
when importing Microsoft Word documents.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#compatibility"/>
</section>
-<paragraph role="note" id="par_id3153876" xml-lang="en-US">Some of the
settings defined here are only valid for the current document and must be
defined separately for each document.</paragraph>
-<paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3">Add
spacing between paragraphs and tables</paragraph>
+<note id="par_id3153876">Some of the settings defined here are only valid for
the current document and must be defined separately for each document.</note>
+<h3 id="hd_id3145640">Add spacing between paragraphs and tables</h3>
<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US">In
$[officename] Writer, paragraph spacing is defined differently than in
Microsoft Word documents. If you have defined spacing between two paragraphs or
tables, spacing is also added in the corresponding Word documents.</paragraph>
<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US">Specifies
whether to add Microsoft Word-compatible spacing between paragraphs and tables
in $[officename] Writer text documents.</paragraph>
-<paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3">Add
paragraph and table spacing at tops of pages</paragraph>
+<h3 id="hd_id3146317">Add paragraph and table spacing at tops of pages</h3>
<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US">Specifies
whether paragraph spacing at the top of a page will also be effective at the
beginning of a page or column if the paragraph is positioned on the first page
of the document. The same applies for a page break.</paragraph>
-<paragraph role="note" id="par_id3145789" xml-lang="en-US">If you import a
Word document, the spaces are automatically added during the
conversion.</paragraph>
-<paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3">Use
OpenOffice.org 1.1 tab stop formatting<comment>UFI: spec "Tab Stop
Compatibility"</comment></paragraph>
+<note id="par_id3145789">If you import a Word document, the spaces are
automatically added during the conversion.</note>
+<h3 id="hd_id3149964">Use OpenOffice.org 1.1 tab stop formatting<comment>UFI:
spec "Tab Stop Compatibility"</comment></h3>
<paragraph role="paragraph" id="par_id3152777" xml-lang="en-US">Specifies how
to align text at tab stops beyond the right margin, how to handle decimal tab
stops, and how to handle tab stops close to a line break. If this check box is
not selected, tab stops are handled in the same way as in other Office
applications.</paragraph>
<paragraph role="paragraph" id="par_idN10810" xml-lang="en-US">In text
documents created by your current version of Writer, the new tab stop handling
is used by default. In text documents created by Writer versions prior to
StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is
applied.</paragraph>
-<paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="3">Do not
add leading (extra space) between lines of text<comment>UFI: spec
external_leading</comment></paragraph>
+<h3 id="par_idN107F9">Do not add leading (extra space) between lines of
text<comment>UFI: spec external_leading</comment></h3>
<paragraph role="paragraph" id="par_idN10806" xml-lang="en-US">Specifies that
additional leading (extra space) between lines of text is not added, even if
the font in use contains the additional leading attribute.</paragraph>
<paragraph role="paragraph" id="par_idN10809" xml-lang="en-US">In text
documents created by your current version of Writer, the additional leading is
used by default. In text documents created by Writer versions prior to
StarOffice 8 or OpenOffice.org 2.0, the additional leading is not
used.</paragraph>
-<paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="3">Use
OpenOffice.org 1.1 line spacing<comment>UFI: spec
spec-line-spacing</comment><comment>UFI: api.feature "Adjusted formatting of
text lines with proportional line spacing"</comment></paragraph>
+<h3 id="par_idN107FF">Use OpenOffice.org 1.1 line spacing<comment>UFI: spec
spec-line-spacing</comment><comment>UFI: api.feature "Adjusted formatting of
text lines with proportional line spacing"</comment></h3>
<paragraph role="paragraph" id="par_idN10815" xml-lang="en-US">If the option
is off, a new process for formatting text lines with proportional line spacing
will be applied. If the option is on, the previous method of formatting of text
lines with proportional line spacing will be applied.</paragraph>
<paragraph role="paragraph" id="par_idN10818" xml-lang="en-US">In text
documents created by your current version of Writer and in Microsoft Word
documents of recent versions, the new process is used. In text documents
created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the
previous process is used.</paragraph>
-<paragraph role="heading" id="par_idN1081B" xml-lang="en-US" level="3">Add
paragraph and table spacing at bottom of table cells<comment>UFI: spec
spec-formatting-table-cells</comment></paragraph>
+<h3 id="par_idN1081B">Add paragraph and table spacing at bottom of table
cells<comment>UFI: spec spec-formatting-table-cells</comment></h3>
<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US">Specifies that
the bottom spacing is added to a paragraph, even when it is the last paragraph
in a table cell.</paragraph>
<paragraph role="paragraph" id="par_idN10849" xml-lang="en-US">If the option
is off, table cells will be formatted as in Writer versions prior to StarOffice
8 or OpenOffice.org 2.0. If the option is on, an alternative method of
formatting table cells will be applied. The option is on by default for new
documents created with %PRODUCTNAME and for documents imported from Microsoft
Word format.</paragraph>
-<paragraph role="heading" id="par_idN1084C" xml-lang="en-US" level="3">Use
OpenOffice.org 1.1 object positioning<comment>UFI: spec
spec-adjust-object-positioning</comment></paragraph>
+<h3 id="par_idN1084C">Use OpenOffice.org 1.1 object positioning<comment>UFI:
spec spec-adjust-object-positioning</comment></h3>
<paragraph role="paragraph" id="par_idN10864" xml-lang="en-US">Specifies how
to calculate the position of floating objects anchored to a character or
paragraph with respect to the top and bottom paragraph spacing.</paragraph>
<paragraph role="paragraph" id="par_idN10867" xml-lang="en-US">If the option
is on, the floating objects are positioned as in Writer versions prior to
StarOffice 8 or OpenOffice.org 2.0. If the option is off, the floating objects
are positioned using an alternative method that is similar to the method used
by Microsoft Word. </paragraph>
<paragraph role="paragraph" id="par_idN1086A" xml-lang="en-US">The option will
be set to off for new documents. For Writer documents created by a version
prior to OpenOffice.org 2.0 the option is on.</paragraph>
-<paragraph role="heading" id="par_idN10821" xml-lang="en-US" level="3">Use
OpenOffice.org 1.1 text wrapping around objects<comment>UFI: spec doc
adjust-text-wrapping.sxw</comment></paragraph>
+<h3 id="par_idN10821">Use OpenOffice.org 1.1 text wrapping around
objects<comment>UFI: spec doc adjust-text-wrapping.sxw</comment></h3>
<paragraph role="paragraph" id="par_id4016541" xml-lang="en-US">Microsoft Word
and Writer have different approaches on wrapping text around floating screen
objects. Floating screen object are Writer frames and drawing objects, and the
objects 'text box', 'graphic', 'frame', 'picture' etc. in Microsoft
Word.</paragraph>
<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US">In Microsoft
Word and in current versions of Writer, page header/footer content and
footnote/endnote content does not wrap around floating screen objects. Text
body content wraps around floating screen objects which are anchored in the
page header. </paragraph>
<paragraph role="paragraph" id="par_id2782982" xml-lang="en-US">In Writer
versions prior to StarOffice 8 or OpenOffice.org 2.0, the opposite was
true.</paragraph>
<paragraph role="paragraph" id="par_idN10892" xml-lang="en-US">If the option
is off, which is the default setting, the new text wrapping will be applied. If
the option is on, the former text wrapping will be applied. </paragraph>
-<paragraph role="heading" id="par_idN1092A" xml-lang="en-US"
level="3">Consider wrapping style when positioning objects<comment>UFI: spec
obj-pos-without-wrapping</comment></paragraph>
+<h3 id="par_idN1092A">Consider wrapping style when positioning
objects<comment>UFI: spec obj-pos-without-wrapping</comment></h3>
<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US">Specifies how
the complex process of positioning floating objects that are anchored to a
character or paragraph should work. In Writer versions prior to StarOffice 8 or
OpenOffice.org 2.0, an iterative process was used, while in current versions a
straightforward process is used, which is similar to the same process in
Microsoft Word.</paragraph>
<paragraph role="paragraph" id="par_idN10943" xml-lang="en-US">If the option
is off, the old %PRODUCTNAME iterative process of object positioning is used.
If the option is on, the new straightforward process is used to ensure
compatibility with Microsoft Word documents.</paragraph>
-<paragraph role="heading" id="hd_id5240028" xml-lang="en-US" level="3">Expand
word space on lines with manual line breaks in justified
paragraphs<comment>UFI: i79041</comment></paragraph>
+<h3 id="hd_id5240028">Expand word space on lines with manual line breaks in
justified paragraphs<comment>UFI: i79041</comment></h3>
<paragraph role="paragraph" id="par_id8599810" xml-lang="en-US">If enabled,
Writer adds spacing between words, in lines that end with Shift+Enter in
justified paragraphs. If disabled, spacing between words will not be expanded
to justify the lines.</paragraph>
<paragraph role="paragraph" id="par_id8012634" xml-lang="en-US">This setting
is on by default for .odt text documents. It will be saved and loaded with the
document in the .odt text document format. This setting cannot be saved in old
.sxw text documents, so this setting is off for .sxw text documents.</paragraph>
-<paragraph role="heading" id="hd_id5241028" xml-lang="en-US"
level="3">Tolerate white lines of PDF page backgrounds for compatibility with
old documents</paragraph>
+<h3 id="hd_id5241028">Tolerate white lines of PDF page backgrounds for
compatibility with old documents</h3>
<paragraph role="paragraph" id="par_id8112634" xml-lang="en-US">Use
%PRODUCTNAME 4.3 anchoring paint order and tolerate white lines that may appear
in PDF page backgrounds created from legacy documents.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optcompatpage/default" id="bm_id4321726"
localize="false"/>
-<paragraph role="heading" id="par_idN10845" xml-lang="en-US" level="2">Use as
Default</paragraph>
+<h2 id="par_idN10845">Use as Default</h2>
<paragraph role="paragraph" id="par_idN10848" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/optcompatpage/default">Click to use the current
settings on this tab page as the default for further sessions with
%PRODUCTNAME.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10977" xml-lang="en-US">The factory
defaults are set as follows. Enabled are the following options, while all other
options are disabled:</paragraph>
<list type="ordered">
diff --git a/source/text/shared/optionen/01070500.xhp
b/source/text/shared/optionen/01070500.xhp
index 808bfdcf7a..4118fdc815 100644
--- a/source/text/shared/optionen/01070500.xhp
+++ b/source/text/shared/optionen/01070500.xhp
@@ -44,6 +44,14 @@
<embed href="text/shared/00/00000406.xhp#etopsonstiges"/>
</section>
<embed href="text/shared/06/simpress_screenshots.xhp#simpressgeneraldialog"/>
+<switch select="appl">
+ <case select="IMPRESS">
+ <bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/startwithwizard"
id="bm_id3152460" localize="false"/>
+ <h2 id="hd_id3155308">New document</h2>
+ <h3 id="hd_id3146986">Start with Template Selection</h3>
+ <paragraph role="paragraph" id="par_id3148646" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/startwithwizard">Specifies
whether to activate the <link
href="text/shared/guide/template_manager.xhp">Select a Template</link> window
when opening a presentation with <emph>File - New -
Presentation</emph>.</ahelp></paragraph>
+ </case>
+</switch>
<h2 id="hd_id3144511">Text objects</h2>
<bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/qickedit"
id="bm_id3156343" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id3147264"
localize="false"/>
@@ -67,10 +75,7 @@
</caseinline><caseinline select="CHART">
</caseinline><caseinline select="MATH">
</caseinline><defaultinline>In a presentation or drawing document, you can
also activate this mode through the<emph> Select Text Area Only </emph><link
href="text/simpress/02/13190000.xhp" name="icon">icon</link> in the
<emph>Options</emph> bar.</defaultinline></switchinline></paragraph>
-<h2 id="hd_id3155308">New document (only in presentations)</h2>
-<bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/startwithwizard"
id="bm_id3152460" localize="false"/>
-<h3 id="hd_id3146986">Start with Template Selection</h3>
-<paragraph role="paragraph" id="par_id3148646" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/startwithwizard">Specifies
whether to activate the <link
href="text/shared/guide/template_manager.xhp">Select a Template</link> window
when opening a presentation with <emph>File - New -
Presentation</emph>.</ahelp></paragraph>
+
<h2 id="hd_id3154638">Settings</h2>
<bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/backgroundback"
id="bm_id3145750" localize="false"/>
<h3 id="hd_id3146120">Use background cache</h3>
@@ -91,25 +96,37 @@
<h3 id="hd_id3152960">Tab stops</h3>
<paragraph role="paragraph" id="par_id3155443" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/metricFields">Defines the
spacing between tab stops.</ahelp></paragraph>
-<h2 id="hd_id3156383">Presentation (only in presentations)</h2>
-<bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/enremotcont"
id="bm_id3154757" localize="false"/>
-<h3 id="hd_id3155903">Enable remote control</h3>
-<paragraph role="paragraph" id="par_id3155963" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/enremotcont">Specifies that you
want to enable Bluetooth remote control while Impress is running.</ahelp>
Unmark<emph> Enable remote control</emph> to disable remote
controlling.</paragraph>
+<switch select="appl">
+ <case select="IMPRESS">
+ <h2 id="hd_id3156383">Presentation</h2>
+ <bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/enremotcont"
id="bm_id3154757" localize="false"/>
+ <h3 id="hd_id3155903">Enable remote control</h3>
+ <paragraph role="paragraph" id="par_id3155963" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/enremotcont">Specifies that you
want to enable Bluetooth remote control while Impress is running.</ahelp>
Unmark<emph> Enable remote control</emph> to disable remote
controlling.</paragraph>
+
+ <bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/enprsntcons"
id="bm_id3154757" localize="false"/>
+ <h3 id="hd_id3155904">Enable Presenter Console</h3>
+ <paragraph role="paragraph" id="par_id3155964" xml-lang="en-US"><ahelp
hid=".">Specifies that you want to enable the <link
href="text/simpress/guide/presenter_console.xhp">Presenter Console</link>
during slideshows.</ahelp></paragraph>
+ </case>
+</switch>
-<bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/enprsntcons"
id="bm_id3154757" localize="false"/>
-<h3 id="hd_id3155904">Enable Presenter Console</h3>
-<paragraph role="paragraph" id="par_id3155964" xml-lang="en-US"><ahelp
hid=".">Specifies that you want to enable the <link
href="text/simpress/guide/presenter_console.xhp">Presenter Console</link>
during slideshows.</ahelp></paragraph>
+<switch select="appl">
+ <case select="DRAW">
+ <h2 id="hd_id3163806">Scale</h2>
+ <bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/scaleBox"
id="bm_id3146317" localize="false"/>
+ <h3 id="hd_id3145147">Drawing scale</h3>
+ <paragraph role="paragraph" id="par_id3153965" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/scaleBox">Determines the drawing
scale on the status bar.</ahelp> Right-click on the scale factor in the status
bar to open a list of possible values.</paragraph>
+ </case>
+</switch>
-<h2 id="hd_id3163806">Scale (only in drawings)</h2>
-<bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/scaleBox"
id="bm_id3146317" localize="false"/>
-<h3 id="hd_id3145147">Drawing scale</h3>
-<paragraph role="paragraph" id="par_id3153965" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/scaleBox">Determines the drawing
scale on the status bar.</ahelp> Right-click on the scale factor in the status
bar to open a list of possible values.</paragraph>
<h2 id="hd_id3155177">Compatibility (document specific settings)</h2>
-<paragraph role="paragraph" id="par_id3155608" xml-lang="en-US">The settings
in this area are valid for the current document only.</paragraph>
-<embed href="text/shared/optionen/01041000.xhp#printermetrics"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/cbCompatibility"
id="bm_id3153788" localize="false"/>
-<h3 id="hd_id3145790">Add spacing between paragraphs and tables</h3>
-<paragraph role="paragraph" id="par_id3145768" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/cbCompatibility">Specifies that
$[officename] Impress calculates the paragraph spacing exactly like Microsoft
PowerPoint.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3146135" xml-lang="en-US">Microsoft
PowerPoint adds the bottom spacing of a paragraph to the top spacing of the
next paragraph to calculate the total spacing between both paragraphs.
$[officename] Impress utilizes only the larger of the two spacings.</paragraph>
+<switch select="appl">
+ <case select="IMPRESS">
+ <paragraph role="paragraph" id="par_id3155608" xml-lang="en-US">The
settings in this area are valid for the current document only.</paragraph>
+ <bookmark xml-lang="en-US"
branch="hid/modules/simpress/ui/optimpressgeneralpage/cbCompatibility"
id="bm_id3153788" localize="false"/>
+ <h3 id="hd_id3145790">Add spacing between paragraphs and tables</h3>
+ <paragraph role="paragraph" id="par_id3145768" xml-lang="en-US"><ahelp
hid="modules/simpress/ui/optimpressgeneralpage/cbCompatibility">Specifies that
$[officename] Impress calculates the paragraph spacing exactly like Microsoft
PowerPoint.</ahelp></paragraph>
+ <paragraph role="paragraph" id="par_id3146135"
xml-lang="en-US">Microsoft PowerPoint adds the bottom spacing of a paragraph to
the top spacing of the next paragraph to calculate the total spacing between
both paragraphs. $[officename] Impress utilizes only the larger of the two
spacings.</paragraph>
+ </case>
+</switch>
</body>
</helpdocument>
