source/text/shared/00/00000406.xhp       |   15 ++++
 source/text/shared/optionen/01070500.xhp |   99 ++++++++++++-------------------
 2 files changed, 55 insertions(+), 59 deletions(-)

New commits:
commit 07e8db4df115a5662b5e28831cbc7049cd50c217
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Feb 10 14:59:39 2025 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Feb 11 15:55:44 2025 +0100

    tdf#165141 - Fix Draw - Scale Help page
    
    + Refactor
    + Improve how to get
    + Remove switches.
    
    Change-Id: I3649c9a87170b4d665c1766d211074fa519a8405
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/181373
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/shared/00/00000406.xhp 
b/source/text/shared/00/00000406.xhp
index dfbe2aacb4..cf5e795a7f 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -373,7 +373,20 @@
     <paragraph id="par_id3149527" role="paragraph"><variable 
id="listekopieren">Open a spreadsheet document, choose <switchinline 
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - Sort 
Lists - Copy</emph> button.</variable></paragraph>
     <paragraph id="par_id3154903" role="paragraph"><variable id="exopaen">Open 
a spreadsheet document, choose <switchinline select="sys"><caseinline 
select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc - 
Changes</emph>.</variable></paragraph>
     <paragraph id="par_id3152582" role="paragraph"><variable id="etotall">Open 
a presentation document, choose <switchinline select="sys"><caseinline 
select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME 
Impress</emph>.</variable></paragraph>
-    <paragraph id="par_id3148418" role="paragraph"><variable 
id="etopsonstiges">Open a presentation document, choose <switchinline 
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME 
Impress/%PRODUCTNAME Draw - General</emph>.</variable></paragraph>
+
+
+    <section id="etopsonstiges">
+        <paragraph role="paragraph" id="par_id21739206374124">Open a 
presentation or drawing document, then </paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+        <paragraph id="par_id3148418" role="paragraph">Choose <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Impress/%PRODUCTNAME Draw - General</menuitem>.</paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+        <paragraph role="paragraph" id="par_id841739206720044">Click the 
<menuitem>Options</menuitem> button on the right and choose 
<menuitem>%PRODUCTNAME Impress/%PRODUCTNAME Draw - 
General</menuitem>.</paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+        <paragraph role="paragraph" id="par_id171739206930248"><keycode>Alt + 
F12</keycode> and choose <menuitem>%PRODUCTNAME Impress/%PRODUCTNAME Draw - 
General</menuitem>.</paragraph>
+    </section>
+
+
+
     <paragraph id="par_id3150380" role="paragraph"><variable id="etopas">Open 
a presentation document, choose <switchinline select="sys"><caseinline 
select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME 
Impress/%PRODUCTNAME Draw - View</emph>.</variable></paragraph>
     <paragraph id="par_id3166423" role="paragraph"><variable id="etopfe">Open 
a presentation document, choose <switchinline select="sys"><caseinline 
select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME 
Impress/%PRODUCTNAME Draw - Grid</emph>.</variable></paragraph>
     <paragraph id="par_id3148873" role="paragraph"><variable id="etopdk">Open 
a presentation document, choose <switchinline select="sys"><caseinline 
select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME 
Impress/%PRODUCTNAME Draw - Print</emph>.</variable></paragraph>
diff --git a/source/text/shared/optionen/01070500.xhp 
b/source/text/shared/optionen/01070500.xhp
index e596d5223c..e6777b8106 100644
--- a/source/text/shared/optionen/01070500.xhp
+++ b/source/text/shared/optionen/01070500.xhp
@@ -22,97 +22,80 @@
 
 <meta>
 <topic id="textsharedoptionen01070500xml" indexer="include">
-<title id="tit" xml-lang="en-US">General</title>
+<title id="tit">General</title>
 <filename>/text/shared/optionen/01070500.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="general">
-<bookmark xml-lang="en-US" branch="index" 
id="bm_id3149295"><bookmark_value>presentations; starting with 
wizard</bookmark_value>
+<bookmark branch="index" id="bm_id3149295"><bookmark_value>presentations; 
starting with wizard</bookmark_value>
 <bookmark_value>objects; always moveable (Impress/Draw)</bookmark_value>
 <bookmark_value>distorting in drawings</bookmark_value>
 <bookmark_value>spacing; tabs in presentations</bookmark_value>
 <bookmark_value>tab stops; spacing in presentations</bookmark_value>
 <bookmark_value>text objects; in presentations and drawings</bookmark_value>
+<bookmark_value>scale; in drawings</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/@@nowidget@@" 
id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/OptSavePage" 
id="bm_id3153824" localize="false"/>
-<h1 id="hd_id3143270"><link 
href="text/shared/optionen/01070500.xhp">General</link></h1>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/OptSavePage">Defines the general 
options for drawing or presentation documents.</ahelp></paragraph>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/@@nowidget@@" 
id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/OptSavePage" 
id="bm_id3153824" localize="false"/>
+<h1 id="hd_id3143270"><link href="text/shared/optionen/01070500.xhp">General 
(Impress and Draw)</link></h1>
+<paragraph role="paragraph" id="par_id3149578"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/OptSavePage">Defines the general 
options for drawing or presentation documents.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <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>
+<bookmark 
branch="hid/modules/simpress/ui/optimpressgeneralpage/startwithwizard" 
id="bm_id3152460" localize="false"/>
+<h2 id="hd_id3155308">New document (Impress)</h2>
+<h3 id="hd_id3146986">Start with Template Selection</h3>
+<paragraph role="paragraph" id="par_id3148646"><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_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"/>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/qickedit" 
id="bm_id3156343" localize="false"/>
+<bookmark branch="hid/.uno:QuickEdit" id="bm_id3147264" localize="false"/>
 <h3 id="hd_id3149295">Allow quick editing</h3>
-<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US"><variable 
id="schnellbearb"><ahelp hid=".">If on, you can edit text immediately after 
clicking a text object. If off, you must double-click to edit text.</ahelp>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US"><switchinline 
select="appl"><caseinline select="WRITER">
-</caseinline><caseinline select="CALC">
-</caseinline><caseinline select="CHART">
-</caseinline><caseinline select="MATH">
-</caseinline><defaultinline>In a presentation or drawing document, you can 
also activate the text editing mode through the <emph>Allow Quick 
Editing</emph> <link href="text/simpress/02/13180000.xhp">icon</link> in the 
<emph>Options</emph> bar.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/textselected" 
id="bm_id3148920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id3153969" 
localize="false"/>
+<paragraph role="paragraph" id="par_id3148947"><variable 
id="schnellbearb"><ahelp hid=".">If on, you can edit text immediately after 
clicking a text object. If off, you must double-click to edit 
text.</ahelp></variable></paragraph>
+<paragraph role="paragraph" id="par_id3154138">In a presentation or drawing 
document, you can also activate the text editing mode through the <emph>Allow 
Quick Editing</emph> <link href="text/simpress/02/13180000.xhp">icon</link> in 
the <emph>Options</emph> bar.</paragraph>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/textselected" 
id="bm_id3148920" localize="false"/>
+<bookmark branch="hid/.uno:PickThrough" id="bm_id3153969" localize="false"/>
 <h3 id="hd_id3154686">Only text area selectable</h3>
-<paragraph role="paragraph" id="par_id3149808" xml-lang="en-US"><variable 
id="textbereich"><ahelp hid=".">Specifies whether to select a text box by 
clicking the text.</ahelp>
+<paragraph role="paragraph" id="par_id3149808"><variable 
id="textbereich"><ahelp hid=".">Specifies whether to select a text box by 
clicking the text.</ahelp>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155431" xml-lang="en-US"><variable 
id="textbereich2">In the area of the text box that is not filled with text, an 
object behind the text box can be selected.
+<paragraph role="paragraph" id="par_id3155431"><variable id="textbereich2">In 
the area of the text box that is not filled with text, an object behind the 
text box can be selected.
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153367" xml-lang="en-US"><switchinline 
select="appl"><caseinline select="WRITER">
-</caseinline><caseinline select="CALC">
-</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">icon</link> in the <emph>Options</emph> 
bar.</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153367">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">icon</link> in the 
<emph>Options</emph> bar.</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>
-<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/backgroundback">Specifies 
whether to use the cache for displaying objects on the master slide.</ahelp> 
This speeds up the display. Unmark the <emph>Use background cache</emph> option 
if you want to display changing contents on the master slide.</paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/copywhenmove" 
id="bm_id3150094" localize="false"/>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/copywhenmove" 
id="bm_id3150094" localize="false"/>
 <h3 id="hd_id3147428">Copy when moving</h3>
-<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US"><ahelp 
hid=".">If enabled, a copy is created when you move an object while holding 
down the <switchinline select="sys"><caseinline 
select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>
 key.</ahelp> The same will apply for rotating and resizing the object. The 
original object will remain in its current position and size.</paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/objalwymov" 
id="bm_id3150592" localize="false"/>
+<paragraph role="paragraph" id="par_id3154730"><ahelp hid=".">If enabled, a 
copy is created when you move an object while holding down the <switchinline 
select="sys"><caseinline 
select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>
 key.</ahelp> The same will apply for rotating and resizing the object. The 
original object will remain in its current position and size.</paragraph>
+<bookmark 
branch="hid/modules/simpress/ui/optimpressgeneralpage/backgroundback" 
id="bm_id3145750" localize="false"/>
+<h3 id="hd_id3146120">Use background cache</h3>
+<paragraph role="paragraph" id="par_id3152940"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/backgroundback">Specifies 
whether to use the cache for displaying objects on the master slide.</ahelp> 
This speeds up the display. Unmark the <emph>Use background cache</emph> option 
if you want to display changing contents on the master slide.</paragraph>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/objalwymov" 
id="bm_id3150592" localize="false"/>
 <h3 id="hd_id3148457">Objects always moveable</h3>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/objalwymov">Specifies that you 
want to move an object with the <emph>Rotate</emph> tool enabled. If<emph> 
Object always moveable </emph>is not marked, the <emph>Rotate</emph> tool can 
only be used to rotate an object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/distrotcb" 
id="bm_id3151207" localize="false"/>
+<paragraph role="paragraph" id="par_id3149413"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/objalwymov">Specifies that you 
want to move an object with the <emph>Rotate</emph> tool enabled. If<emph> 
Object always moveable </emph>is not marked, the <emph>Rotate</emph> tool can 
only be used to rotate an object.</ahelp></paragraph>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/distrotcb" 
id="bm_id3151207" localize="false"/>
 <h3 id="hd_id3154512">Do not distort objects in curve (only in drawings)</h3>
-<paragraph role="paragraph" id="par_id3154270" xml-lang="en-US"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/distrotcb">Maintains relative 
alignment of Bézier points and 2D drawing objects to each other when you 
distort the object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/units" id="bm_id3153709" 
localize="false"/>
+<paragraph role="paragraph" id="par_id3154270"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/distrotcb">Maintains relative 
alignment of Bézier points and 2D drawing objects to each other when you 
distort the object.</ahelp></paragraph>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/units" 
id="bm_id3153709" localize="false"/>
 <h3 id="hd_id3154163">Unit of measurement</h3>
-<paragraph role="paragraph" id="par_id3155066" xml-lang="en-US"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/units">Determines the <link 
href="text/shared/00/00000003.xhp#measurement_units">Unit of measurement</link> 
for presentations.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/modules/simpress/ui/optimpressgeneralpage/metricFields" 
id="bm_id3154757" localize="false"/>
+<paragraph role="paragraph" id="par_id3155066"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/units">Determines the <link 
href="text/shared/00/00000003.xhp#measurement_units">Unit of measurement</link> 
for presentations and drawings.</ahelp></paragraph>
+<bookmark branch="hid/modules/simpress/ui/optimpressgeneralpage/metricFields" 
id="bm_id3154757" localize="false"/>
 <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>
+<paragraph role="paragraph" id="par_id3155443"><ahelp 
hid="modules/simpress/ui/optimpressgeneralpage/metricFields">Defines the 
spacing between tab stops.</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 (Draw documents)</h2>
+<bookmark 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"><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>
 <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"/>
+        <paragraph role="paragraph" id="par_id3155608">The settings in this 
area are valid for the current document only.</paragraph>
+        <bookmark 
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>
+        <paragraph role="paragraph" id="par_id3145768"><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">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>

Reply via email to