summaryrefslogtreecommitdiff
path: root/source/text/sdraw/guide
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2023-03-23 19:36:05 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2023-03-24 14:25:58 +0000
commit742aa91199f41ef96f1b47bbc163b7c3bb6e2a9d (patch)
treeeef8ce0fe853277002468e5e3f4bc9446aa49c50 /source/text/sdraw/guide
parent35dca7d7e802b33da0f8c903f554f591eb239f03 (diff)
tdf#154335 Deprecate layer_new.xhp in favour of insert_layer.xhp
+ refactoring for XML simplification + #2 replace layer_new by insert_layer Change-Id: I12e7bac9da6652d5b3d98e8a4cee0eb40aa9c627 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149474 Tested-by: Jenkins Reviewed-by: Stéphane Guillou <stephane.guillou@libreoffice.org> Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source/text/sdraw/guide')
-rw-r--r--source/text/sdraw/guide/layer_move.xhp24
-rw-r--r--source/text/sdraw/guide/layer_new.xhp64
-rw-r--r--source/text/sdraw/guide/layer_tipps.xhp41
-rw-r--r--source/text/sdraw/guide/layers.xhp30
-rw-r--r--source/text/sdraw/guide/main.xhp13
5 files changed, 52 insertions, 120 deletions
diff --git a/source/text/sdraw/guide/layer_move.xhp b/source/text/sdraw/guide/layer_move.xhp
index b276c1f9af..ebd2ef7c85 100644
--- a/source/text/sdraw/guide/layer_move.xhp
+++ b/source/text/sdraw/guide/layer_move.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,11 +16,10 @@
* 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_movexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Moving Objects to a Different Layer</title>
+<title id="tit">Moving Objects to a Different Layer</title>
<filename>/text/sdraw/guide/layer_move.xhp</filename>
</topic>
<history>
@@ -30,27 +27,28 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150752"><bookmark_value>objects; moving in layers</bookmark_value>
+<bookmark branch="index" id="bm_id3150752"><bookmark_value>objects; moving in layers</bookmark_value>
<bookmark_value>layers; moving objects</bookmark_value>
<bookmark_value>moving; between layers</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150752" xml-lang="en-US" level="1"><variable id="layer_move"><link href="text/sdraw/guide/layer_move.xhp">Moving Objects to a Different Layer</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10622" xml-lang="en-US">Drawings in %PRODUCTNAME Draw support layers.</paragraph>
+<h1 id="hd_id3150752"><variable id="layer_move"><link href="text/sdraw/guide/layer_move.xhp">Moving Objects to a Different Layer</link>
+</variable></h1>
+<paragraph role="paragraph" id="par_idN10622">Drawings in %PRODUCTNAME Draw support layers.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3148488" xml-lang="en-US">Click and hold the object until its edges flash.</paragraph>
+<paragraph role="listitem" id="par_id3148488">Click and hold the object until its edges flash.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145587" xml-lang="en-US">Drag the object to the name tab of the layer you want to move it to.</paragraph>
+<paragraph role="listitem" id="par_id3145587">Drag the object to the name tab of the layer you want to move it to.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148868" xml-lang="en-US">Release the object.</paragraph>
+<paragraph role="listitem" id="par_id3148868">Release the object.</paragraph>
</listitem>
</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
<embed href="text/sdraw/guide/layers.xhp#layers"/>
-<embed href="text/sdraw/guide/layer_new.xhp#layer_new"/>
+<embed href="text/sdraw/01/insert_layer.xhp#h1"/>
<embed href="text/sdraw/guide/layer_tipps.xhp#layer_tipps"/>
+</section>
</body>
</helpdocument>
diff --git a/source/text/sdraw/guide/layer_new.xhp b/source/text/sdraw/guide/layer_new.xhp
deleted file mode 100644
index 7ed64aeeff..0000000000
--- a/source/text/sdraw/guide/layer_new.xhp
+++ /dev/null
@@ -1,64 +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="textsimpressguidelayer_newxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Layers</title>
-<filename>/text/sdraw/guide/layer_new.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_id3148797"><bookmark_value>layers; inserting and editing</bookmark_value>
-<bookmark_value>inserting; layers</bookmark_value>
-<bookmark_value>changing;layer properties</bookmark_value>
-</bookmark><comment>MW changed "modifying;..." to "changing;..."</comment>
-<h1 id="hd_id3148797"><variable id="layer_new"><link href="text/sdraw/guide/layer_new.xhp">Inserting Layers</link>
-</variable></h1>
-<paragraph role="paragraph" id="par_idN10614" xml-lang="en-US">Drawings in %PRODUCTNAME Draw support layers.</paragraph>
-<embed href="text/shared/06/sd_screenshots.xhp#insertlayer"/>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_idN10643" xml-lang="en-US">Right-click the layer tab area at the bottom.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153418" xml-lang="en-US">Choose <emph>Insert Layer</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155068" xml-lang="en-US">Type a name for the layer in the <emph>Name </emph>box.</paragraph>
-<embed href="text/sdraw/01/insert_layer.xhp#reservednames"/>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156382" xml-lang="en-US">In the <emph>Properties</emph> area, set the options for the layer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153964" xml-lang="en-US">Click <emph>OK</emph>. The new layer automatically becomes the active layer.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US">To change the properties of a layer, click the name tab of the layer, and then choose <emph>Format - Layer</emph>.</paragraph>
-<note id="par_id3153814">You cannot change the name of or delete a predefined <item type="productname">%PRODUCTNAME</item> Draw layer.</note>
-<section id="relatedtopics">
-<embed href="text/sdraw/guide/layers.xhp#layers"/>
-<embed href="text/sdraw/guide/layer_move.xhp#layer_move"/>
-<embed href="text/sdraw/guide/layer_tipps.xhp#layer_tipps"/>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/sdraw/guide/layer_tipps.xhp b/source/text/sdraw/guide/layer_tipps.xhp
index c82a77b6c7..adca672ae8 100644
--- a/source/text/sdraw/guide/layer_tipps.xhp
+++ b/source/text/sdraw/guide/layer_tipps.xhp
@@ -19,7 +19,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textsimpressguidelayer_tippsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Working With Layers</title>
+<title id="tit">Working With Layers</title>
<filename>/text/sdraw/guide/layer_tipps.xhp</filename>
</topic>
<history>
@@ -27,7 +27,7 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154013"><bookmark_value>layers;working with</bookmark_value>
+<bookmark branch="index" id="bm_id3154013"><bookmark_value>layers;working with</bookmark_value>
<bookmark_value>locking layers</bookmark_value>
<bookmark_value>hiding;layers</bookmark_value>
<bookmark_value>unlocking layers</bookmark_value>
@@ -36,65 +36,66 @@
</bookmark>
<h1 id="hd_id3154013"><variable id="layer_tipps"><link href="text/sdraw/guide/layer_tipps.xhp">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="paragraph" id="par_idN10706">Drawings in %PRODUCTNAME Draw support layers.</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="paragraph" id="par_id3154484">To select a layer, click the name tab of the layer at the bottom of the workspace.</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>
+<paragraph role="listitem" id="par_id3154702">Select a layer, and then choose <emph>Format - Layer</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145587" xml-lang="en-US">In the <emph>Properties </emph>area, clear the <emph>Visible </emph>check box.</paragraph>
+<paragraph role="listitem" id="par_id3145587">In the <emph>Properties </emph>area, clear the <emph>Visible </emph>check box.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153912" xml-lang="en-US">Click <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153912">Click <emph>OK</emph>.</paragraph>
</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="paragraph" id="par_id3154762">In the name tab of the layer, the text color of the name changes to blue.</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>
+<paragraph role="listitem" id="par_id3157871">Select a hidden layer, and then choose <emph>Format - Layer</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149352" xml-lang="en-US">In the <emph>Properties </emph>area, select the <emph>Visible </emph>check box.</paragraph>
+<paragraph role="listitem" id="par_id3149352">In the <emph>Properties </emph>area, select the <emph>Visible </emph>check box.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153036" xml-lang="en-US">Click <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153036">Click <emph>OK</emph>.</paragraph>
</listitem>
</list>
<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>
+<paragraph role="listitem" id="par_id3150864">Select a layer, and then choose <emph>Format - Layer</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150336" xml-lang="en-US">In the <emph>Properties</emph> area, select the <emph>Locked </emph>check box.</paragraph>
+<paragraph role="listitem" id="par_id3150336">In the <emph>Properties</emph> area, select the <emph>Locked </emph>check box.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153730" xml-lang="en-US">Click <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153730">Click <emph>OK</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3149883" xml-lang="en-US">You cannot edit objects on a locked layer.</paragraph>
+<paragraph role="paragraph" id="par_id3149883">You cannot edit objects on a locked layer.</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>
+<paragraph role="listitem" id="par_id3145354">Select a locked layer, and then choose <emph>Format - Layer</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148393" xml-lang="en-US">In the <emph>Properties</emph> area, clear the <emph>Locked </emph>check box.</paragraph>
+<paragraph role="listitem" id="par_id3148393">In the <emph>Properties</emph> area, clear the <emph>Locked </emph>check box.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150467" xml-lang="en-US">Click <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150467">Click <emph>OK</emph>.</paragraph>
</listitem>
</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
+<embed href="text/sdraw/01/insert_layer.xhp#h1"/>
<embed href="text/sdraw/guide/layers.xhp#layers"/>
-<embed href="text/sdraw/guide/layer_new.xhp#layer_new"/>
<embed href="text/sdraw/guide/layer_move.xhp#layer_move"/>
+</section>
</body>
</helpdocument>
diff --git a/source/text/sdraw/guide/layers.xhp b/source/text/sdraw/guide/layers.xhp
index 807882a691..87a36de2a6 100644
--- a/source/text/sdraw/guide/layers.xhp
+++ b/source/text/sdraw/guide/layers.xhp
@@ -19,7 +19,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textsimpressguidelayersxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">About Layers</title>
+<title id="tit">About Layers</title>
<filename>/text/sdraw/guide/layers.xhp</filename>
</topic>
<history>
@@ -27,33 +27,33 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3149018"><bookmark_value>layers; definition</bookmark_value>
+<bookmark branch="index" id="bm_id3149018"><bookmark_value>layers; definition</bookmark_value>
</bookmark>
<h1 id="hd_id3149018"><variable id="layers"><link href="text/sdraw/guide/layers.xhp">About Layers</link>
</variable></h1>
-<paragraph role="paragraph" id="par_id3146313" xml-lang="en-US">Layers allow you to assemble elements on a page that are related. Think of layers as individual workspaces that you can hide from view, hide from printing, or lock. </paragraph>
-<paragraph role="paragraph" id="par_id7036957" xml-lang="en-US">Layers do not determine the stacking order of objects on your page, except for the <emph>Controls</emph> layer which is always in front of other layers. </paragraph>
-<paragraph role="paragraph" id="par_id1614734" xml-lang="en-US">The stacking order of objects on your page is determined by the sequence in which you add the objects. You can rearrange the stacking order by <item type="menuitem">Shape - Arrange</item>. </paragraph>
-<paragraph role="paragraph" id="par_id398876" xml-lang="en-US">The areas on a layer that do not contain objects are transparent.</paragraph>
-<paragraph role="paragraph" id="par_id3146962" xml-lang="en-US">$[officename] Draw provides three default layers:</paragraph>
+<paragraph role="paragraph" id="par_id3146313">Layers allow you to assemble elements on a page that are related. Think of layers as individual workspaces that you can hide from view, hide from printing, or lock. </paragraph>
+<paragraph role="paragraph" id="par_id7036957">Layers do not determine the stacking order of objects on your page, except for the <emph>Controls</emph> layer which is always in front of other layers. </paragraph>
+<paragraph role="paragraph" id="par_id1614734">The stacking order of objects on your page is determined by the sequence in which you add the objects. You can rearrange the stacking order by <item type="menuitem">Shape - Arrange</item>. </paragraph>
+<paragraph role="paragraph" id="par_id398876">The areas on a layer that do not contain objects are transparent.</paragraph>
+<paragraph role="paragraph" id="par_id3146962">$[officename] Draw provides three default layers:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153073" xml-lang="en-US">Layout</paragraph>
+<paragraph role="listitem" id="par_id3153073">Layout</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149053" xml-lang="en-US">Controls</paragraph>
+<paragraph role="listitem" id="par_id3149053">Controls</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150391" xml-lang="en-US">Dimension Lines</paragraph>
+<paragraph role="listitem" id="par_id3150391">Dimension Lines</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3156397" xml-lang="en-US">You cannot delete or rename the default layers. You can add your own layers by <item type="menuitem">Insert - Layer</item>.</paragraph>
-<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US">The <emph>Layout</emph> layer is the default workspace. The <emph>Layout</emph> layer determines the location of title, text, and object placeholders on your page.</paragraph>
-<paragraph role="paragraph" id="par_id3150742" xml-lang="en-US">The <emph>Controls</emph> layer can be used for buttons that have been assigned an action, but that should not be printed. Set the layer's properties to not printable. Objects on the <emph>Controls</emph> layer are always in front of objects on other layers.</paragraph>
-<paragraph role="paragraph" id="par_id3153085" xml-lang="en-US">The <emph>Dimension Lines</emph> layer is where you draw, for example, the dimension lines. By switching the layer to show or hide, you can easily switch these lines on and off.</paragraph>
+<paragraph role="paragraph" id="par_id3156397">You cannot delete or rename the default layers. You can add your own layers by <item type="menuitem">Insert - Layer</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3150534">The <emph>Layout</emph> layer is the default workspace. The <emph>Layout</emph> layer determines the location of title, text, and object placeholders on your page.</paragraph>
+<paragraph role="paragraph" id="par_id3150742">The <emph>Controls</emph> layer can be used for buttons that have been assigned an action, but that should not be printed. Set the layer's properties to not printable. Objects on the <emph>Controls</emph> layer are always in front of objects on other layers.</paragraph>
+<paragraph role="paragraph" id="par_id3153085">The <emph>Dimension Lines</emph> layer is where you draw, for example, the dimension lines. By switching the layer to show or hide, you can easily switch these lines on and off.</paragraph>
<tip id="par_id3154507">You can lock a layer to protect its contents, or hide a layer and its contents from view or from printing. When you add a new layer to a page, the layer is added to all of the pages in your document. However, when you add an object to a layer, it is only added to the current page. If you want the object to appear on all of the pages, add the object to the master page (<menuitem>View - Master</menuitem>).</tip>
<section id="relatedtopics">
-<embed href="text/sdraw/guide/layer_new.xhp#layer_new"/>
+<embed href="text/sdraw/01/insert_layer.xhp#h1"/>
<embed href="text/sdraw/guide/layer_move.xhp#layer_move"/>
<embed href="text/sdraw/guide/layer_tipps.xhp#layer_tipps"/>
</section>
diff --git a/source/text/sdraw/guide/main.xhp b/source/text/sdraw/guide/main.xhp
index 72bda81106..56679df00e 100644
--- a/source/text/sdraw/guide/main.xhp
+++ b/source/text/sdraw/guide/main.xhp
@@ -22,17 +22,17 @@
<meta>
<topic id="textsdrawguidemainxml" indexer="include">
-<title id="tit" xml-lang="en-US">Instructions for Using $[officename] Draw</title>
+<title id="tit">Instructions for Using $[officename] Draw</title>
<filename>/text/sdraw/guide/main.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3146119"><bookmark_value>Draw instructions</bookmark_value>
+<bookmark branch="index" id="bm_id3146119"><bookmark_value>Draw instructions</bookmark_value>
<bookmark_value>instructions; $[officename] Draw</bookmark_value>
<bookmark_value>Howtos for Draw</bookmark_value>
</bookmark><comment>MW added an entry</comment>
-<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="1"><variable id="main"><link href="text/sdraw/guide/main.xhp">Instructions for Using $[officename] Draw</link>
-</variable></paragraph>
+<h1 id="hd_id3146119"><variable id="main"><link href="text/sdraw/guide/main.xhp">Instructions for Using $[officename] Draw</link>
+</variable></h1>
<embed href="text/shared/00/00000099.xhp#table"/>
<h2 id="hd_id3143218">Editing and Grouping Objects</h2>
<embed href="text/sdraw/guide/align_arrange.xhp#align_arrange"/>
@@ -55,7 +55,7 @@
<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
<embed href="text/simpress/guide/background.xhp#background"/>
<embed href="text/sdraw/guide/layers.xhp#layers"/>
-<embed href="text/sdraw/guide/layer_new.xhp#layer_new"/>
+<embed href="text/sdraw/01/insert_layer.xhp#h1"/>
<embed href="text/sdraw/guide/layer_move.xhp#layer_move"/>
<embed href="text/sdraw/guide/layer_tipps.xhp#layer_tipps"/>
<embed href="text/simpress/guide/move_object.xhp#move_object"/>
@@ -69,8 +69,5 @@
<embed href="text/shared/guide/lineend_define.xhp#lineend_define"/>
<embed href="text/shared/guide/linestyle_define.xhp#linestyle_define"/>
<embed href="text/simpress/guide/gluepoints.xhp#gluepoints"/>
-<section id="relatedtopics">
-<embed href="text/simpress/guide/main.xhp#main"/>
-</section>
</body>
</helpdocument>