AllLangHelp_sdraw.mk | 1
source/text/sdraw/01/insert_layer.xhp | 29 ++++++++++++----
source/text/sdraw/01/modify_layer.xhp | 58 --------------------------------
source/text/sdraw/guide/layer_tipps.xhp | 22 +++++-------
source/text/simpress/00/00000404.xhp | 7 ++-
source/text/simpress/00/00000405.xhp | 8 ++--
6 files changed, 41 insertions(+), 84 deletions(-)
New commits:
commit 04549b13ac062594e2204a8f8da7bf92ec290995
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Oct 31 15:37:53 2022 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Oct 31 19:48:57 2022 +0100
Improve Help on Draw layers dialog
Remove modify_layer.xhp and merge with insert_layer.xhp
Change-Id: I6500aae19a7f4745ee94f7dffc664df724b568db
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142084
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index 80629f7eb2..8639173b2a 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
helpcontent2/source/text/sdraw/01/delete_page \
helpcontent2/source/text/sdraw/01/duplicate_page \
helpcontent2/source/text/sdraw/01/insert_layer \
- helpcontent2/source/text/sdraw/01/modify_layer \
helpcontent2/source/text/sdraw/01/new_page \
helpcontent2/source/text/sdraw/01/navigate_page \
helpcontent2/source/text/sdraw/01/page_properties \
diff --git a/source/text/sdraw/01/insert_layer.xhp
b/source/text/sdraw/01/insert_layer.xhp
index 04b37a7e66..31494607aa 100644
--- a/source/text/sdraw/01/insert_layer.xhp
+++ b/source/text/sdraw/01/insert_layer.xhp
@@ -25,18 +25,30 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertLayer" id="bm_id5317946"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ModifyLayer" id="bm_id3156326"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/sdraw/ui/insertlayer/@@nowidget@@" id="bm_@@nowidget@@"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/sdraw/ui/insertlayer/InsertLayerDialog" id="bm_id3150716"
localize="false"/>
-<h1 id="hd_id3151074">Insert Layer</h1>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US"><variable
id="ebenetext"><ahelp hid=".uno:InsertLayer">Inserts a new layer in the
document. Layers are only available in Draw, not in Impress.
</ahelp></variable></paragraph>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156329">
+ <bookmark_value>renaming layers</bookmark_value>
+<bookmark_value>layers; renaming</bookmark_value>
+<bookmark_value>layers; insert</bookmark_value>
+<bookmark_value>layers; modify</bookmark_value>
+<bookmark_value>modify layer</bookmark_value>
+<bookmark_value>insert layer</bookmark_value>
+</bookmark>
+<h1 id="hd_id3151074">Insert or Modify Layer</h1>
+<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US"><variable
id="ebenetext"><ahelp hid=".uno:InsertLayer">Inserts a new layer or modify a
layer in the document. Layers are only available in Draw, not in Impress.
</ahelp></variable></paragraph>
<section id="howtoget">
<embed href="text/simpress/00/00000404.xhp#insert_layer"/>
+ <embed href="text/simpress/00/00000405.xhp#modify_layer"/>
</section>
<note id="par_id3150205">To select a layer, click the corresponding tab at the
bottom of the workspace.</note>
<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/name"
id="bm_id3156449" localize="false"/>
<embed href="text/shared/06/sd_screenshots.xhp#insertlayer"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:RenameLayer" id="bm_id3145387"
localize="false"/>
<h2 id="hd_id3145588">Name</h2>
-<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/name">Enter a name for the new
layer.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/name">Enter a name for the new layer. To
rename the layer, enter the new name.</ahelp></paragraph>
+<tip id="par_id761667238910931">To rename the layer directly, right-click the
layer tab at the bottom, select <menuitem>Rename Layer</menuitem> in the
context menu and enter the new name in the tab.</tip>
<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/title"
id="bm_id301596204068375" localize="false"/>
<h2 id="hd_id641596204028276">Title</h2>
<paragraph role="paragraph" id="par_id271596204273624"><ahelp
hid="modules/sdraw/ui/insertlayer/title" >Enter the title of the
layer.</ahelp></paragraph>
@@ -44,12 +56,15 @@
<h2 id="hd_id791596204033460">Description</h2>
<paragraph role="paragraph" id="par_id471596204283656"><ahelp
hid="modules/sdraw/ui/insertlayer/textview">Enter a description of the
layer.</ahelp></paragraph>
<h2 id="hd_id3153820">Layer Properties</h2>
-<paragraph role="paragraph" id="par_id3151240" xml-lang="en-US">Set the
properties for the new layer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/visible"
id="bm_id3156017" localize="false"/><h3 id="hd_id3149945">Visible</h3>
+<paragraph role="paragraph" id="par_id3151240" xml-lang="en-US">Set the
properties for the layer.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/visible"
id="bm_id3156017" localize="false"/>
+<h3 id="hd_id3149945">Visible</h3>
<paragraph role="paragraph" id="par_id3157980" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/visible">Show or hide the
layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/printable"
id="bm_id3150046" localize="false"/><h3 id="hd_id3153246">Printable</h3>
+<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/printable"
id="bm_id3150046" localize="false"/>
+<h3 id="hd_id3153246">Printable</h3>
<paragraph role="paragraph" id="par_id3154762" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/printable">When printing, print or ignore
this particular layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/locked"
id="bm_id3149870" localize="false"/><h3 id="hd_id3146965">Locked</h3>
+<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/locked"
id="bm_id3149870" localize="false"/>
+<h3 id="hd_id3146965">Locked</h3>
<paragraph role="paragraph" id="par_id3149876" xml-lang="en-US"><ahelp
hid="modules/sdraw/ui/insertlayer/locked">Prevent elements on the layer from
being edited.</ahelp></paragraph>
<section id="relatedtopics">
<embed href="text/sdraw/guide/layers.xhp#layers"/>
diff --git a/source/text/sdraw/01/modify_layer.xhp
b/source/text/sdraw/01/modify_layer.xhp
deleted file mode 100644
index df0d198601..0000000000
--- a/source/text/sdraw/01/modify_layer.xhp
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textsimpress0105140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Modify Layer</title>
-<filename>/text/sdraw/01/modify_layer.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3156329"><bookmark_value>renaming layers</bookmark_value>
-<bookmark_value>layers; renaming</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:ModifyLayer" id="bm_id3156326"
localize="false"/>
-<paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="1">Modify
Layer</paragraph>
-<paragraph role="paragraph" id="par_id3147265" xml-lang="en-US"><variable
id="ebene"><ahelp hid=".uno:ModifyLayer">Changes the properties of the selected
layer.</ahelp>
-</variable></paragraph>
-<section id="howtoget">
- <embed href="text/simpress/00/00000405.xhp#modify_layer"/>
-</section>
-<paragraph role="heading" id="hd_id3155603" xml-lang="en-US"
level="2">Name</paragraph>
-<paragraph role="paragraph" id="par_id3155738" xml-lang="en-US">Enter a name
for the selected layer.</paragraph>
-<paragraph role="note" id="par_id3149126" xml-lang="en-US">You can only change
the name of a layer you created.</paragraph>
-<paragraph role="heading" id="hd_id3147345" xml-lang="en-US"
level="2">Properties</paragraph>
-<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US">Sets the
properties of the selected layer.</paragraph>
-<paragraph role="heading" id="hd_id3166423" xml-lang="en-US"
level="3">Visible</paragraph>
-<paragraph role="paragraph" id="par_id3159239" xml-lang="en-US">Shows or hides
the contents of the selected layer.</paragraph>
-<paragraph role="heading" id="hd_id3150208" xml-lang="en-US"
level="3">Printable</paragraph>
-<paragraph role="paragraph" id="par_id3152993" xml-lang="en-US">Prints the
contents of the selected layer.</paragraph>
-<paragraph role="heading" id="hd_id3145585" xml-lang="en-US"
level="3">Protected</paragraph>
-<paragraph role="paragraph" id="par_id3159488" xml-lang="en-US">Locks the
contents of the selected layer, so that they cannot be edited.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:RenameLayer" id="bm_id3145387"
localize="false"/>
-<paragraph role="heading" id="hd_id3156448" xml-lang="en-US" level="2">Rename
Layer</paragraph>
-<paragraph role="paragraph" id="par_id3163801" xml-lang="en-US"><ahelp
hid=".uno:RenameLayer">Renames the active layer.</ahelp> You can only change
the name of a layer you created.</paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/sdraw/guide/layer_tipps.xhp
b/source/text/sdraw/guide/layer_tipps.xhp
index 3db00b8103..8d7873475c 100644
--- a/source/text/sdraw/guide/layer_tipps.xhp
+++ b/source/text/sdraw/guide/layer_tipps.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsimpressguidelayer_tippsxml" indexer="include" status="PUBLISH">
@@ -37,13 +34,14 @@
<bookmark_value>showing;hidden layers</bookmark_value>
<bookmark_value>selecting;layers</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3154013" xml-lang="en-US"
level="1"><variable id="layer_tipps"><link
href="text/sdraw/guide/layer_tipps.xhp" name="Working With Layers">Working With
Layers</link>
-</variable></paragraph>
+<h1 id="hd_id3154013"><variable id="layer_tipps"><link
href="text/sdraw/guide/layer_tipps.xhp" name="Working With Layers">Working With
Layers</link>
+</variable></h1>
<paragraph role="paragraph" id="par_idN10706" xml-lang="en-US">Drawings in
%PRODUCTNAME Draw support layers.</paragraph>
-<paragraph role="heading" id="hd_id3154018" xml-lang="en-US"
level="2">Selecting a layer</paragraph>
+<embed href="text/shared/06/sd_screenshots.xhp#insertlayer"/>
+<h2 id="hd_id3154018">Selecting a layer</h2>
<paragraph role="paragraph" id="par_id3154484" xml-lang="en-US">To select a
layer, click the name tab of the layer at the bottom of the
workspace.</paragraph>
-<paragraph role="tip" id="par_idN10767" xml-lang="en-US">To edit the
properties of a layer, double-click a layer tab.</paragraph>
-<paragraph role="heading" id="hd_id3155445" xml-lang="en-US" level="2">Hiding
layers</paragraph>
+<tip id="par_idN10767">To edit the properties of a layer, double-click a layer
tab.</tip>
+<h2 id="hd_id3155445">Hiding layers</h2>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3154702" xml-lang="en-US">Select a layer,
and then choose <emph>Format - Layer</emph>.</paragraph>
@@ -56,8 +54,8 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id3154762" xml-lang="en-US">In the name
tab of the layer, the text color of the name changes to blue.</paragraph>
-<paragraph role="tip" id="par_id3156396" xml-lang="en-US">You can make a layer
visible or invisible by clicking on its tab while holding down the Shift
key.</paragraph>
-<paragraph role="heading" id="hd_id3146322" xml-lang="en-US" level="2">Showing
hidden layers</paragraph>
+<tip id="par_id3156396">You can make a layer visible or invisible by clicking
on its tab while holding down the Shift key.</tip>
+<h2 id="hd_id3146322">Showing hidden layers</h2>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3157871" xml-lang="en-US">Select a hidden
layer, and then choose <emph>Format - Layer</emph>.</paragraph>
@@ -69,7 +67,7 @@
<paragraph role="listitem" id="par_id3153036" xml-lang="en-US">Click
<emph>OK</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3154554" xml-lang="en-US" level="2">Locking
layers</paragraph>
+<h2 id="hd_id3154554">Locking layers</h2>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150864" xml-lang="en-US">Select a layer,
and then choose <emph>Format - Layer</emph>.</paragraph>
@@ -82,7 +80,7 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id3149883" xml-lang="en-US">You cannot
edit objects on a locked layer.</paragraph>
-<paragraph role="heading" id="hd_id3145244" xml-lang="en-US"
level="2">Unlocking layers</paragraph>
+<h2 id="hd_id3145244">Unlocking layers</h2>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145354" xml-lang="en-US">Select a locked
layer, and then choose <emph>Format - Layer</emph>.</paragraph>
diff --git a/source/text/simpress/00/00000404.xhp
b/source/text/simpress/00/00000404.xhp
index fe61c5e461..bdeca62875 100644
--- a/source/text/simpress/00/00000404.xhp
+++ b/source/text/simpress/00/00000404.xhp
@@ -34,10 +34,13 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154254" xml-lang="en-US"><variable
id="uebersicht">Choose <emph>Insert - Summary Slide</emph>
</variable></paragraph>
+
+<comment>Only for Draw (OH)</comment>
<section id="insert_layer">
-<paragraph role="paragraph" id="par_id3147002" xml-lang="en-US">Choose
<emph>Insert - Layer</emph> (<item type="productname">%PRODUCTNAME</item> Draw
only)</paragraph>
-<paragraph role="paragraph" id="par_id3150363" xml-lang="en-US">Open context
menu of layer tabs - choose <emph>Insert Layer</emph> (<item
type="productname">%PRODUCTNAME</item> Draw only)</paragraph>
+ <paragraph role="paragraph" id="par_id3147002" xml-lang="en-US">Choose
<menuitem>Insert - Layer</menuitem></paragraph>
+ <paragraph role="paragraph" id="par_id3150363" xml-lang="en-US">Open
context menu of layer tabs - choose <menuitem>Insert
Layer</menuitem></paragraph>
</section>
+
<section id="insert_snap_point_line">
<paragraph role="paragraph" id="par_id3155376" xml-lang="en-US">Choose
<emph>Insert - Insert Snap Point/Line</emph> (<item
type="productname">%PRODUCTNAME</item> Draw only)</paragraph>
<paragraph role="paragraph" id="par_id3154372" xml-lang="en-US">Open a context
menu and choose <emph>Insert Snap Point/Line</emph>
diff --git a/source/text/simpress/00/00000405.xhp
b/source/text/simpress/00/00000405.xhp
index 6fec0b6667..2a50467cd9 100644
--- a/source/text/simpress/00/00000405.xhp
+++ b/source/text/simpress/00/00000405.xhp
@@ -24,15 +24,15 @@
</topic>
</meta>
<body>
- <paragraph role="heading" id="hd_id3147001" xml-lang="en-US"
level="1">Format Menu</paragraph>
+ <h1 id="hd_id3147001">Format Menu</h1>
<section id="dimensions">
<paragraph role="paragraph" id="par_id3148489" xml-lang="en-US">In the
context menu of a dimension line, choose <emph>Dimensions</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US">On the
<emph>Lines and Arrows</emph> toolbar, click the <emph>Dimension Line</emph>
icon.</paragraph>
</section>
+ <comment>Only for Draw (OH)</comment>
<section id="modify_layer">
- <paragraph role="paragraph" id="par_id3152874" xml-lang="en-US">In a
Draw document, right-click a layer tab and choose <emph>Modify Layer</emph>
- </paragraph>
- <paragraph role="paragraph" id="par_id3154765" xml-lang="en-US">Choose
<emph>Format - Layer</emph> (only $[officename] Draw)</paragraph>
+ <paragraph role="paragraph" id="par_id3154765" xml-lang="en-US">Select
the layer and choose <menuitem>Format - Layer</menuitem></paragraph>
+ <paragraph role="paragraph" id="par_id3152874" xml-lang="en-US">Open
context menu of the layer tab - choose <menuitem>Modify
Layer</menuitem></paragraph>
</section>
<section id="interaction">
<paragraph role="paragraph" id="par_id3146316" xml-lang="en-US">Choose
<emph>Format - Interaction</emph>
