AllLangHelp_simpress.mk | 2
source/text/sdraw/01/page_properties.xhp | 8 +--
source/text/shared/01/05040200.xhp | 12 +++-
source/text/shared/01/05210100.xhp | 5 +
source/text/simpress/01/01180001.xhp | 70 ---------------------------
source/text/simpress/01/01180002.xhp | 39 ---------------
source/text/simpress/01/slide_properties.xhp | 8 +--
7 files changed, 20 insertions(+), 124 deletions(-)
New commits:
commit 4f452d1d8432a93eb41d5d0f90c2e0b5947e0e53
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Nov 9 12:29:19 2022 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Wed Nov 9 22:01:31 2022 +0100
tdf#146950 Clarify slide format "screen" and "on-screen show"
+ refactor page/slide format Help pages for slides and drawings
+ drop 2 now useless pages
Change-Id: If98458246f106da509d72a4087f365dbefd08607
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142493
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index db4e7f6c9b..7295d6968a 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
helpcontent2/source/text/simpress/00/slide_menu \
helpcontent2/source/text/simpress/01/01170000 \
helpcontent2/source/text/simpress/01/slide_properties \
- helpcontent2/source/text/simpress/01/01180001 \
- helpcontent2/source/text/simpress/01/01180002 \
helpcontent2/source/text/simpress/01/02110000 \
helpcontent2/source/text/simpress/01/02120000 \
helpcontent2/source/text/simpress/01/02130000 \
diff --git a/source/text/sdraw/01/page_properties.xhp
b/source/text/sdraw/01/page_properties.xhp
index 257f4f3d1d..1747bbd8a0 100644
--- a/source/text/sdraw/01/page_properties.xhp
+++ b/source/text/sdraw/01/page_properties.xhp
@@ -28,14 +28,14 @@
</meta>
<body>
<bookmark branch="hid/.uno:PageSetup" xml-lang="en-US"
id="bm_id891556823445094" localize="false"/>
- <paragraph role="heading" level="1" id="hd_id231556821873595"
xml-lang="en-US">Page</paragraph>
+ <h1 id="hd_id231556821873595">Page</h1>
<paragraph role="paragraph" id="par_id571556821811542"
xml-lang="en-US"><variable id="seiteeintext"><ahelp hid=".uno:PageSetup"
visibility="visible">Sets page orientation, page margins, background and other
layout options.</ahelp></variable></paragraph>
<section id="howtoget">
<embed href="text/sdraw/00/page_menu.xhp#frtite"/>
</section>
<embed href="text/simpress/guide/background.xhp#background"/>
- <embed href="text/simpress/01/01180001.xhp#page"/>
- <embed href="text/simpress/01/01180002.xhp#background"/>
- <paragraph xml-lang="en-US" role="tip" id="par_id691556822054550">To
change the background of all of the pages in the active file, select a
background, click <emph>OK</emph> and click <emph>Yes</emph> in the <emph>Page
Properties</emph> dialog.</paragraph>
+ <embed href="text/shared/01/05040200.xhp#page"/>
+ <embed href="text/shared/01/05210100.xhp#area"/>
+ <tip id="par_id691556822054550">To change the background of all of the
pages in the active file, select a background, click <emph>OK</emph> and click
<emph>Yes</emph> in the <emph>Page Properties</emph> dialog.</tip>
</body>
</helpdocument>
diff --git a/source/text/shared/01/05040200.xhp
b/source/text/shared/01/05040200.xhp
index 473fa35f9f..f9359b3eb2 100644
--- a/source/text/shared/01/05040200.xhp
+++ b/source/text/shared/01/05040200.xhp
@@ -25,7 +25,7 @@
</topic>
</meta>
<body>
-<section id="page">
+
<bookmark xml-lang="en-US" branch="index"
id="bm_id3150620"><bookmark_value>pages;formatting and
numbering</bookmark_value>
<bookmark_value>formatting;pages</bookmark_value>
<bookmark_value>paper formats</bookmark_value>
@@ -43,7 +43,8 @@
</bookmark><comment>mw made "binding space;" a one level entry and added
"gutter" and "margins;pages"</comment>
<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/PageFormatPage"
id="bm_id3149877" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/@@nowidget@@"
id="bm_id3149877" localize="false"/>
-<h1 id="hd_id3150620"><link href="text/shared/01/05040200.xhp"
name="Page">Page</link></h1>
+<section id="page">
+<h1 id="hd_id3150620"><link href="text/shared/01/05040200.xhp"
name="Page"><switchinline select="appl"><caseinline
select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></link></h1>
<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US"><ahelp
hid="cui/ui/pageformatpage/PageFormatPage">Allows you to define page layouts
for single and multiple-page documents, as well as a numbering and paper
formats.</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -55,7 +56,12 @@
<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US">Select from a
list of predefined paper sizes, or define a custom paper format.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/comboPageFormat"
id="bm_id3147834" localize="false"/>
<h3 id="hd_id3153394">Format</h3>
-<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US"><ahelp
hid="cui/ui/pageformatpage/comboPageFormat">Select a predefined paper size, or
create a custom format by entering the dimensions for the paper in the
<emph>Height </emph>and <emph>Width </emph>boxes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US"><ahelp
hid="cui/ui/pageformatpage/comboPageFormat">Select a predefined paper size, or
create a custom format by entering the dimensions for the paper in the
<emph>Height</emph> and <emph>Width</emph>boxes.</ahelp></paragraph>
+<switch select="appl">
+ <case select="IMPRESS">
+ <note id="par_id581668003824292">Slides formats "On Screen Show
(4:3)", "On Screen Show (16:9)" and "On Screen Show (16:10)" are used for
Microsoft PowerPoint interoperability.</note>
+ </case>
+</switch>
<bookmark xml-lang="en-US" branch="hid/cui/ui/pageformatpage/spinWidth"
id="bm_id3155893" localize="false"/>
<h3 id="hd_id3154823">Width</h3>
<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US"><ahelp
hid="cui/ui/pageformatpage/spinWidth">Displays the width of the selected paper
format. To define a custom format, enter a width here.</ahelp></paragraph>
diff --git a/source/text/shared/01/05210100.xhp
b/source/text/shared/01/05210100.xhp
index 9ba99f6b55..4fd88fdbe7 100644
--- a/source/text/shared/01/05210100.xhp
+++ b/source/text/shared/01/05210100.xhp
@@ -24,7 +24,7 @@
</topic>
</meta>
<body>
-<section id="area">
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3149999">
<bookmark_value>areas; styles</bookmark_value>
<bookmark_value>fill patterns for areas</bookmark_value>
@@ -40,8 +40,9 @@
<bookmark xml-lang="en-US" branch="hid/cui/ui/areatabpage/AreaTabPage"
id="bm_id3146959" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui/ui/areatabpage/@@nowidget@@"
id="bm_id3146959" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui/ui/areatabpage/tablelb"
id="bm_id3144245" localize="false"/>
+<section id="area">
<h1 id="hd_id3145759"><link href="text/shared/01/05210100.xhp"
name="Area"><switchinline select="appl">
-<caseinline
select="CALC">Background</caseinline><defaultinline>Area</defaultinline></switchinline></link></h1>
+<caseinline
select="WRITER">Area</caseinline><defaultinline>Background</defaultinline></switchinline></link></h1>
<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US"><ahelp
hid="cui/ui/areatabpage/AreaTabPage">Set the fill options for the selected
drawing object or document element.</ahelp></paragraph>
<comment>This is not only for drawing objects, but pages, paragraphs and
others too. Need better wording</comment>
</section>
diff --git a/source/text/simpress/01/01180001.xhp
b/source/text/simpress/01/01180001.xhp
deleted file mode 100644
index ac6717fe50..0000000000
--- a/source/text/simpress/01/01180001.xhp
+++ /dev/null
@@ -1,70 +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="textsimpress0101180001xml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Page </title>
- <filename>/text/simpress/01/01180001.xhp</filename>
- </topic>
- </meta>
- <body>
- <section id="page">
- <bookmark xml-lang="en-US" branch="index" id="bm_id3154011">
- <bookmark_value>slides; formatting</bookmark_value>
- <bookmark_value>formatting;slides</bookmark_value>
- </bookmark>
- <paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="1">
- <link href="text/simpress/01/01180001.xhp" name="Page">Page</link>
- </paragraph>
- <paragraph role="paragraph" id="par_id3153416" xml-lang="en-US">Sets
page orientation, page margins, background and other layout options.</paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/simpress/00/slide_menu.xhp#frtites"/>
- </section>
- <paragraph role="heading" id="hd_id3155445" xml-lang="en-US"
level="2">Paper format</paragraph>
- <paragraph role="heading" id="hd_id3154703" xml-lang="en-US"
level="3">Format</paragraph>
- <paragraph role="paragraph" id="par_id3150299" xml-lang="en-US">Select a
paper format supported by your printer. You can also create a custom page size
by selecting <emph>User </emph>and entering the size dimensions in the
<emph>Width</emph> and <emph>Height</emph> boxes.</paragraph>
- <paragraph role="heading" id="hd_id3154659" xml-lang="en-US"
level="3">Width</paragraph>
- <paragraph role="paragraph" id="par_id3152992" xml-lang="en-US">Shows the
width of the paper format you selected in the <emph>Format </emph>box. If you
selected the <emph>User </emph>format, enter a value for the width of the
page.</paragraph>
- <paragraph role="heading" id="hd_id3153816" xml-lang="en-US"
level="3">Height</paragraph>
- <paragraph role="paragraph" id="par_id3149945" xml-lang="en-US">Shows the
height of the paper format you selected in the <emph>Format </emph>box. If you
selected the <emph>User </emph>format, enter a value for the height of the
page.</paragraph>
- <paragraph role="heading" id="hd_id3159207" xml-lang="en-US"
level="3">Portrait</paragraph>
- <paragraph role="paragraph" id="par_id3153250" xml-lang="en-US">Page
orientation is vertical.</paragraph>
- <paragraph role="heading" id="hd_id3154766" xml-lang="en-US"
level="3">Landscape</paragraph>
- <paragraph role="paragraph" id="par_id3153812" xml-lang="en-US">Page
orientation is horizontal.</paragraph>
- <paragraph role="heading" id="hd_id3153075" xml-lang="en-US"
level="3">Paper tray</paragraph>
- <paragraph role="paragraph" id="par_id3145115" xml-lang="en-US">Select the
paper source for your printer.</paragraph>
- <paragraph role="tip" id="par_id3150652" xml-lang="en-US">If your document
uses more than one paper format, you can select a different tray for each
format.</paragraph>
- <embed href="text/shared/00/00000001.xhp#preview_field"/>
- <paragraph role="heading" id="hd_id3150746" xml-lang="en-US"
level="2">Margins</paragraph>
- <paragraph role="paragraph" id="par_id3153037" xml-lang="en-US">Specify
the distance between the edge of a printed page and the printable
area.</paragraph>
- <paragraph role="heading" id="hd_id3145591" xml-lang="en-US"
level="3">Left</paragraph>
- <paragraph role="paragraph" id="par_id3154561" xml-lang="en-US">Enter the
distance between the left edge of the page and the data. You can see the result
in the preview.</paragraph>
- <paragraph role="heading" id="hd_id3153084" xml-lang="en-US"
level="3">Right</paragraph>
- <paragraph role="paragraph" id="par_id3153001" xml-lang="en-US">Enter the
distance between the right edge of the page and the data. You can see the
result in the preview.</paragraph>
- <paragraph role="heading" id="hd_id3153565" xml-lang="en-US"
level="3">Top</paragraph>
- <paragraph role="paragraph" id="par_id3145167" xml-lang="en-US">Enter the
distance between the top edge of the page and the data. You can see the result
in the preview.</paragraph>
- <paragraph role="heading" id="hd_id3150335" xml-lang="en-US"
level="3">Bottom</paragraph>
- <paragraph role="paragraph" id="par_id3153736" xml-lang="en-US">Enter the
distance between the bottom edge of the page and the data. You can see the
result in the preview.</paragraph>
- <paragraph role="heading" id="hd_id3150018" xml-lang="en-US"
level="3">Format</paragraph>
- <paragraph role="paragraph" id="par_id3149877" xml-lang="en-US">Specify
the format for page numbering.</paragraph>
- <paragraph role="heading" id="hd_id3155439" xml-lang="en-US" level="3">Fit
object to paper format</paragraph>
- <paragraph role="paragraph" id="par_id3153042" xml-lang="en-US">Reduces
the scale of objects and the size of the font on the page so that they print on
the selected paper format.</paragraph>
- </body>
-</helpdocument>
diff --git a/source/text/simpress/01/01180002.xhp
b/source/text/simpress/01/01180002.xhp
deleted file mode 100644
index 3c48446552..0000000000
--- a/source/text/simpress/01/01180002.xhp
+++ /dev/null
@@ -1,39 +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="textsimpress0101180002xml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit">Background</title>
- <filename>/text/simpress/01/01180002.xhp</filename>
- </topic>
- <history>
- <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
- </history>
- </meta>
- <body>
- <section id="background">
- <paragraph id="hd_id3154253" role="heading" level="1"
xml-lang="en-US"><link href="text/simpress/01/01180002.xhp"
name="Background">Background</link></paragraph>
- <paragraph role="paragraph" id="par_id3155962" xml-lang="en-US">Defines
a background for a single page or for all of the pages in the active
file.</paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/simpress/00/slide_menu.xhp#frtiteh"/>
- </section>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3150297">The
options for this dialog are described <link href="text/shared/01/05210100.xhp"
name="here">here</link>.</paragraph>
- </body>
-</helpdocument>
diff --git a/source/text/simpress/01/slide_properties.xhp
b/source/text/simpress/01/slide_properties.xhp
index de4ef1daaa..00fa174737 100644
--- a/source/text/simpress/01/slide_properties.xhp
+++ b/source/text/simpress/01/slide_properties.xhp
@@ -29,15 +29,15 @@
<body>
<bookmark branch="hid/.uno:SlideSetup" xml-lang="en-US" id="bm_id3154492"
localize="false"/>
<section id="slideproperties">
- <paragraph role="heading" level="1" id="hd_id3149379"
xml-lang="en-US">Slide Properties</paragraph>
+ <h1 id="hd_id3149379">Slide Properties</h1>
<paragraph role="paragraph" id="par_id3150717"
xml-lang="en-US"><variable id="seiteeintext"><ahelp hid=".uno:SlideSetup"
visibility="visible">Sets slide orientation, slide margins, background and
other layout options.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/simpress/00/slide_menu.xhp#frtite"/>
</section>
<embed href="text/simpress/guide/background.xhp#background"/>
- <embed href="text/simpress/01/01180001.xhp#page"/>
- <embed href="text/simpress/01/01180002.xhp#background"/>
- <paragraph xml-lang="en-US" role="tip" id="par_id3145587">To change the
background of all of the slides in the active file, select a background, click
<emph>OK</emph> and click <emph>Yes</emph> in the <emph>Page Setup</emph>
dialog.</paragraph>
+ <embed href="text/shared/01/05040200.xhp#page"/>
+ <embed href="text/shared/01/05210100.xhp#area"/>
+ <tip id="par_id3145587">To change the background of all of the slides in
the active file, select a background, click <emph>OK</emph> and click
<emph>Yes</emph> in the <emph>Page Setup</emph> dialog.</tip>
</body>
</helpdocument>
