summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2019-06-25 06:57:31 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2019-06-26 13:16:44 +0200
commita96a32ca8505d7f2bd5a763572c5624ae755e991 (patch)
tree67654bb4292e494a9b6fd52871d7e5b303005baf
parente2f8d201aab94bd153d3ff77d7d8066257059a7d (diff)
tdf#124606 Layers should be under sdraw/
Move layers relatated Help from simpress to sdraw. Change-Id: I1fce2a3a2cb03c522e153b0fd5949007631e31a3 Reviewed-on: https://gerrit.libreoffice.org/74685 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--AllLangHelp_sdraw.mk4
-rw-r--r--AllLangHelp_simpress.mk4
-rw-r--r--source/auxiliary/sdraw.tree8
-rw-r--r--source/text/sdraw/guide/layer_move.xhp (renamed from source/text/simpress/guide/layer_move.xhp)12
-rw-r--r--source/text/sdraw/guide/layer_new.xhp (renamed from source/text/simpress/guide/layer_new.xhp)12
-rw-r--r--source/text/sdraw/guide/layer_tipps.xhp (renamed from source/text/simpress/guide/layer_tipps.xhp)12
-rw-r--r--source/text/sdraw/guide/layers.xhp (renamed from source/text/simpress/guide/layers.xhp)16
-rw-r--r--source/text/sdraw/guide/main.xhp14
-rw-r--r--source/text/simpress/01/05150000.xhp2
-rw-r--r--source/text/simpress/02/10120000.xhp2
-rw-r--r--source/text/simpress/guide/background.xhp2
-rw-r--r--source/text/simpress/guide/footer.xhp2
12 files changed, 45 insertions, 45 deletions
diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index d22c7f05a4..0df12b7acc 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -37,6 +37,10 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
helpcontent2/source/text/sdraw/guide/join_objects \
helpcontent2/source/text/sdraw/guide/join_objects3d \
helpcontent2/source/text/sdraw/guide/keyboard \
+ helpcontent2/source/text/sdraw/guide/layers \
+ helpcontent2/source/text/sdraw/guide/layer_move \
+ helpcontent2/source/text/sdraw/guide/layer_new \
+ helpcontent2/source/text/sdraw/guide/layer_tipps \
helpcontent2/source/text/sdraw/guide/main \
helpcontent2/source/text/sdraw/guide/rotate_object \
helpcontent2/source/text/sdraw/guide/text_enter \
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 528db4b55a..24de6ae0d8 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -176,10 +176,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
helpcontent2/source/text/simpress/guide/impress_remote \
helpcontent2/source/text/simpress/guide/individual \
helpcontent2/source/text/simpress/guide/keyboard \
- helpcontent2/source/text/simpress/guide/layer_move \
- helpcontent2/source/text/simpress/guide/layer_new \
- helpcontent2/source/text/simpress/guide/layer_tipps \
- helpcontent2/source/text/simpress/guide/layers \
helpcontent2/source/text/simpress/guide/line_arrow_styles \
helpcontent2/source/text/simpress/guide/line_draw \
helpcontent2/source/text/simpress/guide/line_edit \
diff --git a/source/auxiliary/sdraw.tree b/source/auxiliary/sdraw.tree
index f1933efd37..5c33b999c7 100644
--- a/source/auxiliary/sdraw.tree
+++ b/source/auxiliary/sdraw.tree
@@ -82,10 +82,10 @@
</node>
<node id="1108" title="Groups and Layers">
<topic id="sdraw/text/sdraw/guide/groups.xhp">Grouping Objects</topic>
- <topic id="simpress/text/simpress/guide/layers.xhp">About Layers</topic>
- <topic id="simpress/text/simpress/guide/layer_new.xhp">Inserting Layers</topic>
- <topic id="simpress/text/simpress/guide/layer_tipps.xhp">Working With Layers</topic>
- <topic id="simpress/text/simpress/guide/layer_move.xhp">Moving Objects to a Different Layer</topic>
+ <topic id="simpress/text/sdraw/guide/layers.xhp">About Layers</topic>
+ <topic id="simpress/text/sdraw/guide/layer_new.xhp">Inserting Layers</topic>
+ <topic id="simpress/text/sdraw/guide/layer_tipps.xhp">Working With Layers</topic>
+ <topic id="simpress/text/sdraw/guide/layer_move.xhp">Moving Objects to a Different Layer</topic>
</node>
<node id="1109" title="Text in Drawings">
<topic id="sdraw/text/sdraw/guide/text_enter.xhp">Adding Text</topic>
diff --git a/source/text/simpress/guide/layer_move.xhp b/source/text/sdraw/guide/layer_move.xhp
index 7c155ce097..6367baa2c0 100644
--- a/source/text/simpress/guide/layer_move.xhp
+++ b/source/text/sdraw/guide/layer_move.xhp
@@ -18,12 +18,12 @@
* 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>
-<filename>/text/simpress/guide/layer_move.xhp</filename>
+<filename>/text/sdraw/guide/layer_move.xhp</filename>
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
@@ -34,7 +34,7 @@
<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/simpress/guide/layer_move.xhp" name="Moving Objects to a Different Layer">Moving Objects to a Different Layer</link>
+<paragraph role="heading" id="hd_id3150752" xml-lang="en-US" level="1"><variable id="layer_move"><link href="text/sdraw/guide/layer_move.xhp" name="Moving Objects to a Different Layer">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>
<list type="ordered">
@@ -49,8 +49,8 @@
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/simpress/guide/layers.xhp#layers"/>
-<embed href="text/simpress/guide/layer_new.xhp#layer_new"/>
-<embed href="text/simpress/guide/layer_tipps.xhp#layer_tipps"/>
+<embed href="text/sdraw/guide/layers.xhp#layers"/>
+<embed href="text/sdraw/guide/layer_new.xhp#layer_new"/>
+<embed href="text/sdraw/guide/layer_tipps.xhp#layer_tipps"/>
</body>
</helpdocument>
diff --git a/source/text/simpress/guide/layer_new.xhp b/source/text/sdraw/guide/layer_new.xhp
index 51d0e3c8ba..0966d1253b 100644
--- a/source/text/simpress/guide/layer_new.xhp
+++ b/source/text/sdraw/guide/layer_new.xhp
@@ -18,12 +18,12 @@
* 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/simpress/guide/layer_new.xhp</filename>
+<filename>/text/sdraw/guide/layer_new.xhp</filename>
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
@@ -34,7 +34,7 @@
<bookmark_value>inserting; layers</bookmark_value>
<bookmark_value>changing;layer properties</bookmark_value>
</bookmark><comment>MW changed "modifying;..." to "changing;..."</comment>
-<paragraph role="heading" id="hd_id3148797" xml-lang="en-US" level="1"><variable id="layer_new"><link href="text/simpress/guide/layer_new.xhp" name="Inserting Layers">Inserting Layers</link>
+<paragraph role="heading" id="hd_id3148797" xml-lang="en-US" level="1"><variable id="layer_new"><link href="text/sdraw/guide/layer_new.xhp" name="Inserting Layers">Inserting Layers</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10614" xml-lang="en-US">Drawings in %PRODUCTNAME Draw support layers.</paragraph>
<list type="ordered">
@@ -57,8 +57,8 @@
<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>
<paragraph role="note" id="par_id3153814" xml-lang="en-US">You cannot change the name of or delete a predefined <item type="productname">%PRODUCTNAME</item> Draw layer.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/simpress/guide/layers.xhp#layers"/>
-<embed href="text/simpress/guide/layer_move.xhp#layer_move"/>
-<embed href="text/simpress/guide/layer_tipps.xhp#layer_tipps"/>
+<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"/>
</body>
</helpdocument>
diff --git a/source/text/simpress/guide/layer_tipps.xhp b/source/text/sdraw/guide/layer_tipps.xhp
index ec2764eafe..3db00b8103 100644
--- a/source/text/simpress/guide/layer_tipps.xhp
+++ b/source/text/sdraw/guide/layer_tipps.xhp
@@ -18,12 +18,12 @@
* 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">
<title id="tit" xml-lang="en-US">Working With Layers</title>
-<filename>/text/simpress/guide/layer_tipps.xhp</filename>
+<filename>/text/sdraw/guide/layer_tipps.xhp</filename>
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
@@ -37,7 +37,7 @@
<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/simpress/guide/layer_tipps.xhp" name="Working With Layers">Working With Layers</link>
+<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>
<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>
@@ -95,8 +95,8 @@
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/simpress/guide/layers.xhp#layers"/>
-<embed href="text/simpress/guide/layer_new.xhp#layer_new"/>
-<embed href="text/simpress/guide/layer_move.xhp#layer_move"/>
+<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"/>
</body>
</helpdocument>
diff --git a/source/text/simpress/guide/layers.xhp b/source/text/sdraw/guide/layers.xhp
index 2896e3b905..46e0fd9dd8 100644
--- a/source/text/simpress/guide/layers.xhp
+++ b/source/text/sdraw/guide/layers.xhp
@@ -18,12 +18,12 @@
* 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="textsimpressguidelayersxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">About Layers</title>
-<filename>/text/simpress/guide/layers.xhp</filename>
+<filename>/text/sdraw/guide/layers.xhp</filename>
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
@@ -32,9 +32,9 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149018"><bookmark_value>layers; definition</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="1"><variable id="layers"><link href="text/simpress/guide/layers.xhp" name="About Layers">About Layers</link>
+<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="1"><variable id="layers"><link href="text/sdraw/guide/layers.xhp" name="About Layers">About Layers</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3146313" xml-lang="en-US">Layers are available in $[officename] Draw, not in $[officename] Impress. 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_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>
@@ -54,11 +54,11 @@
<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="tip" id="par_id3154507" xml-lang="en-US">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 slide (<item type="menuitem">View - Master Slide</item>).</paragraph>
+<paragraph role="tip" id="par_id3154507" xml-lang="en-US">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>).</paragraph>
<section id="relatedtopics">
-<embed href="text/simpress/guide/layer_new.xhp#layer_new"/>
-<embed href="text/simpress/guide/layer_move.xhp#layer_move"/>
-<embed href="text/simpress/guide/layer_tipps.xhp#layer_tipps"/>
+<embed href="text/sdraw/guide/layer_new.xhp#layer_new"/>
+<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/main.xhp b/source/text/sdraw/guide/main.xhp
index f3e1ff4cdc..5b7558edff 100644
--- a/source/text/sdraw/guide/main.xhp
+++ b/source/text/sdraw/guide/main.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textsdrawguidemainxml" indexer="include">
<title id="tit" xml-lang="en-US">Instructions for Using $[officename] Draw</title>
@@ -54,10 +54,10 @@
<paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="2">Working with Layers</paragraph>
<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
<embed href="text/simpress/guide/background.xhp#background"/>
-<embed href="text/simpress/guide/layers.xhp#layers"/>
-<embed href="text/simpress/guide/layer_new.xhp#layer_new"/>
-<embed href="text/simpress/guide/layer_move.xhp#layer_move"/>
-<embed href="text/simpress/guide/layer_tipps.xhp#layer_tipps"/>
+<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"/>
+<embed href="text/sdraw/guide/layer_tipps.xhp#layer_tipps"/>
<embed href="text/simpress/guide/move_object.xhp#move_object"/>
<paragraph role="heading" id="hd_id3145585" xml-lang="en-US" level="2">Miscellaneous</paragraph>
<embed href="text/sdraw/guide/keyboard.xhp#keyboard"/>
diff --git a/source/text/simpress/01/05150000.xhp b/source/text/simpress/01/05150000.xhp
index dfbb82134e..c8ec8e1e8d 100644
--- a/source/text/simpress/01/05150000.xhp
+++ b/source/text/simpress/01/05150000.xhp
@@ -40,7 +40,7 @@
<embed href="text/simpress/00/00000405.xhp#bemaszung"/>
<embed href="text/simpress/02/10120000.xhp#symasslinie"/>
</section>
-<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US">A Dimension Line is always inserted on the <link href="text/simpress/guide/layer_tipps.xhp" name="layer">layer</link> called <emph>Dimension Lines</emph>. If you set that layer to invisible, you will not see any Dimension Line in your drawing.</paragraph>
+<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US">A Dimension Line is always inserted on the <link href="text/sdraw/guide/layer_tipps.xhp" name="layer">layer</link> called <emph>Dimension Lines</emph>. If you set that layer to invisible, you will not see any Dimension Line in your drawing.</paragraph>
<paragraph role="heading" id="hd_id3166426" xml-lang="en-US" level="2">Line</paragraph>
<paragraph role="paragraph" id="par_id3159344" xml-lang="en-US">Sets the distance properties of the dimension line and the guides with respect to each other and to the baseline.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/dimensionlinestabpage/MTR_LINE_DIST" id="bm_id3155532" localize="false"/>
diff --git a/source/text/simpress/02/10120000.xhp b/source/text/simpress/02/10120000.xhp
index 07f7c9bc0c..600162db9e 100644
--- a/source/text/simpress/02/10120000.xhp
+++ b/source/text/simpress/02/10120000.xhp
@@ -164,7 +164,7 @@
<paragraph role="paragraph" id="par_id3146124" xml-lang="en-US"><ahelp hid=".uno:MeasureLine">Draws a line that displays the dimension length bounded by guides.</ahelp> Dimension lines automatically calculate and display linear dimensions. To draw a dimension line, open the <emph>Arrows</emph> toolbar, and click the <emph>Dimension Line</emph> icon. Move your pointer to where you want the line to start and drag to draw the dimension line. Release when finished.</paragraph>
<paragraph role="tip" id="par_id3148407" xml-lang="en-US">If you want the dimension line to be the same length as the side of a nearby object, hold down the <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while dragging. To constrain the dimension line to 45 degrees, hold down the Shift key while dragging.</paragraph>
-<paragraph role="paragraph" id="par_id3148986" xml-lang="en-US">In %PRODUCTNAME Draw, a dimension line is always inserted on the <link href="text/simpress/guide/layer_tipps.xhp" name="layer">layer</link> called <emph>Dimension Lines</emph>. If you set that layer to invisible, you will not see any dimension line in your drawing.</paragraph>
+<paragraph role="paragraph" id="par_id3148986" xml-lang="en-US">In %PRODUCTNAME Draw, a dimension line is always inserted on the <link href="text/sdraw/guide/layer_tipps.xhp" name="layer">layer</link> called <emph>Dimension Lines</emph>. If you set that layer to invisible, you will not see any dimension line in your drawing.</paragraph>
<section id="symasslinie">
<table id="tbl_id3143281">
<tablerow>
diff --git a/source/text/simpress/guide/background.xhp b/source/text/simpress/guide/background.xhp
index d469205a4d..d54b17d7a0 100644
--- a/source/text/simpress/guide/background.xhp
+++ b/source/text/simpress/guide/background.xhp
@@ -112,7 +112,7 @@
<paragraph role="paragraph" id="par_idN1084A" xml-lang="en-US">Now you can use the Templates window to open a new presentation or drawing based on your new template.</paragraph>
<section id="relatedtopics">
<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
- <embed href="text/simpress/guide/layers.xhp#layers"/>
+ <embed href="text/sdraw/guide/layers.xhp#layers"/>
<switch select="appl">
<case select="IMPRESS"><embed href="text/simpress/guide/footer.xhp#footer"/></case>
</switch>
diff --git a/source/text/simpress/guide/footer.xhp b/source/text/simpress/guide/footer.xhp
index c1c5929523..24fdae3bbc 100644
--- a/source/text/simpress/guide/footer.xhp
+++ b/source/text/simpress/guide/footer.xhp
@@ -104,7 +104,7 @@
<section id="relatedtopics">
<embed href="text/simpress/guide/background.xhp#background"/>
<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
- <embed href="text/simpress/guide/layers.xhp#layers"/>
+ <embed href="text/sdraw/guide/layers.xhp#layers"/>
<paragraph xml-lang="en-US" id="par_id3155848" role="paragraph"><link href="text/simpress/01/04990000.xhp" name="Insert Fields">Insert Fields</link></paragraph>
</section>
</body>