source/text/shared/01/05020100.xhp | 2 ++
source/text/shared/01/05020200.xhp | 2 ++
source/text/shared/01/05020500.xhp | 2 ++
source/text/shared/01/05030500.xhp | 13 ++++++-------
source/text/shared/01/05210100.xhp | 3 +++
source/text/swriter/00/00000405.xhp | 7 ++++---
source/text/swriter/01/05030200.xhp | 3 ++-
source/text/swriter/01/05030800.xhp | 9 +++++----
8 files changed, 26 insertions(+), 15 deletions(-)
New commits:
commit a51da4ed164a09ce51bd92d3e99ddc9b70c6792d
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Mon Jan 20 23:55:04 2020 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Wed Jan 22 20:20:25 2020 +0100
Resolves: tdf#129497 help about reset for all help pages in paragraph
style tabs
-finishes adding help about "reset" to all tabs in Paragraph Style
-added some help about "apply" to some tabs (conditionally)
Change-Id: Ic2e5eccb331763d9f89b3e73ca7fd0b4e88e764b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87115
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/01/05020100.xhp
b/source/text/shared/01/05020100.xhp
index 5c728e852..ba3e24282 100644
--- a/source/text/shared/01/05020100.xhp
+++ b/source/text/shared/01/05020100.xhp
@@ -108,6 +108,8 @@
<embed href="text/shared/optionen/01140000.xhp#sprachmodul"/>
<embed href="text/shared/01/font_features.xhp#fontresourcesentry"/>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<embed href="text/shared/00/00000001.xhp#uebernehmen"/>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3145364" xml-lang="en-US"><link
href="text/shared/optionen/01140000.xhp" name="Asian languages support">Asian
languages support</link></paragraph>
<paragraph role="paragraph" id="par_id3147213" xml-lang="en-US"><link
href="text/shared/optionen/01140000.xhp" name="Complex text layout
support">Complex text layout support</link></paragraph>
diff --git a/source/text/shared/01/05020200.xhp
b/source/text/shared/01/05020200.xhp
index 593d82767..367d2c44a 100644
--- a/source/text/shared/01/05020200.xhp
+++ b/source/text/shared/01/05020200.xhp
@@ -179,6 +179,8 @@
<h2 id="hd_id3152460">Position</h2>
<paragraph xml-lang="en-US" id="par_id3147436" role="paragraph"><ahelp
hid="cui/ui/effectspage/positionlb">Specify where to display the emphasis
marks.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
+ <embed href="text/shared/00/00000001.xhp#zurueck"/>
+ <embed href="text/shared/00/00000001.xhp#uebernehmen"/>
<section id="relatedtopics">
<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
<embed href="text/shared/guide/text_color.xhp#text_color"/>
diff --git a/source/text/shared/01/05020500.xhp
b/source/text/shared/01/05020500.xhp
index ee4b38234..6402841bb 100644
--- a/source/text/shared/01/05020500.xhp
+++ b/source/text/shared/01/05020500.xhp
@@ -110,5 +110,7 @@
<paragraph role="paragraph" id="par_id3148616" xml-lang="en-US"><ahelp
hid="cui/ui/positionpage/pairkerning">Automatically adjust the character
spacing for specific letter combinations.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US">Kerning is
only available for certain font types and requires that your printer support
this option.</paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<embed href="text/shared/00/00000001.xhp#uebernehmen"/>
</body>
</helpdocument>
diff --git a/source/text/shared/01/05030500.xhp
b/source/text/shared/01/05030500.xhp
index 1b16330ec..31d86445e 100644
--- a/source/text/shared/01/05030500.xhp
+++ b/source/text/shared/01/05030500.xhp
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -20,12 +18,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
- <helpdocument version="1.0">
<meta>
<topic id="textshared0105030500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Borders</title>
-<filename>/text/shared/01/05030500.xhp</filename>
+ <title id="tit" xml-lang="en-US">Borders</title>
+ <filename>/text/shared/01/05030500.xhp</filename>
</topic>
</meta>
<body>
@@ -92,6 +88,9 @@
<paragraph role="note" id="par_idN109C1" xml-lang="en-US">The rules can be
condensed to the statement that the stronger attribute wins. If, for example,
one cell has a red border of 2 point width, and the adjacent cell has a blue
border of 3 point width, then the common border between these two cells will be
blue with 3 point width.<comment>UFI: see spec
"collapsing_table_borders"</comment></paragraph>
</case>
</switch>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<comment>Calc does not have an Apply button</comment>
+<switch select="appl"><case select="WRITER"><embed
href="text/shared/00/00000001.xhp#uebernehmen"/></case></switch>
<section id="relatedtopics">
<switch select="appl">
<case select="WRITER"><embed
href="text/swriter/guide/border_object.xhp#border_object"/><comment>UFI: moved
border_object into Writer switch</comment><embed
href="text/swriter/guide/border_page.xhp#border_page"/>
diff --git a/source/text/shared/01/05210100.xhp
b/source/text/shared/01/05210100.xhp
index 6c3a43a09..e94d8278d 100644
--- a/source/text/shared/01/05210100.xhp
+++ b/source/text/shared/01/05210100.xhp
@@ -78,5 +78,8 @@
<bookmark xml-lang="en-US" branch="hid/.uno:FillStyle" id="bm_id3154186"
localize="false"/>
<paragraph role="paragraph" id="par_id3154673" xml-lang="en-US"><variable
id="sytext"><ahelp hid=".uno:FillStyle">Select the type of fill that you want
to apply to the selected drawing object.</ahelp>
</variable></paragraph>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<comment>Chart does not have an Apply button</comment>
+<switch select="appl"><case select="WRITER"><embed
href="text/shared/00/00000001.xhp#uebernehmen"/></case></switch>
</body>
</helpdocument>
diff --git a/source/text/swriter/00/00000405.xhp
b/source/text/swriter/00/00000405.xhp
index 06b3fae73..d2067a141 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -49,10 +49,11 @@
<paragraph xml-lang="en-US" id="par_id3153536"
role="paragraph">Choose <menuitem>View - Styles</menuitem> - open context menu
<emph>New/Modify</emph> (for Page Styles).</paragraph>
</section>
<section id="abnumerierung">
- <paragraph xml-lang="en-US" id="par_id3154470"
role="paragraph">Choose <emph>Format - Paragraph - Outline &
Numbering</emph> tab.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147525"
role="paragraph">Choose <emph>View - Styles -</emph> open context menu
<emph>Modify/New - Outline & Numbering</emph> tab (Paragraph
Styles).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154470"
role="paragraph">Choose <menuitem>Format - Paragraph - Outline &
Numbering</menuitem> tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154413"
role="paragraph">Choose <menuitem>Styles - Edit Style - Outline &
Numbering</menuitem> tab (Paragraph Styles).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147525"
role="paragraph">Choose <menuitem>View - Styles -</menuitem> open context menu
<menuitem>Modify/New - Outline & Numbering</menuitem> tab (Paragraph
Styles).</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3152960"
role="paragraph"><variable id="spaltenber">Choose <emph>Format - Sections -
Options</emph> button.</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152960"
role="paragraph"><variable id="spaltenber">Choose <menuitem>Format - Sections -
Options</menuitem> button.</variable></paragraph>
<section id="spaltens">
<paragraph xml-lang="en-US" id="par_id3150836"
role="paragraph">Choose <emph>Format - Page - Columns</emph> tab.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149687"
role="paragraph">Choose <emph>Format - Frame and Object - Properties -
Columns</emph> tab.</paragraph>
diff --git a/source/text/swriter/01/05030200.xhp
b/source/text/swriter/01/05030200.xhp
index 68ec750c5..387b1daf6 100644
--- a/source/text/swriter/01/05030200.xhp
+++ b/source/text/swriter/01/05030200.xhp
@@ -93,8 +93,9 @@
<bookmark xml-lang="en-US" branch="hid/cui/ui/textflowpage/spinWidow"
id="bm_id3145784" localize="false"/>
<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3">Widow
control</paragraph>
<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US"><ahelp
hid="cui/ui/textflowpage/spinWidow">Specifies the minimum number of lines in a
paragraph in the first page after the break. Select this check box, and then
enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at
the top of the page is less than the amount specified in the <emph>Lines
</emph>box, the position of the break is adjusted.</paragraph>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<embed href="text/shared/00/00000001.xhp#uebernehmen"/>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US"><link
href="text/shared/00/00000005.xhp#schuster"
name="Orphans">Orphans</link>.</paragraph>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
</body>
</helpdocument>
diff --git a/source/text/swriter/01/05030800.xhp
b/source/text/swriter/01/05030800.xhp
index 2b20b2a83..7a35aa149 100644
--- a/source/text/swriter/01/05030800.xhp
+++ b/source/text/swriter/01/05030800.xhp
@@ -38,10 +38,10 @@
</section>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153536" role="listitem">To
change the numbering options for paragraphs that use the same paragraph style,
choose <emph>View - Styles</emph>, and then click the <emph>Paragraph
Styles</emph> icon. Right-click the style in the list, choose
<emph>Modify</emph>, and then click the <emph>Outline & Numbering</emph>
tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153536" role="listitem">To
change the numbering options for paragraphs that use the same paragraph style,
choose <menuitem>View - Styles</menuitem>, and then click the <emph>Paragraph
Styles</emph> icon. Right-click the style in the list, choose
<emph>Modify</emph>, and then click the <emph>Outline & Numbering</emph>
tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154470" role="listitem">To
change the numbering options for selected paragraphs, choose <emph>Format -
</emph><link href="text/shared/01/05030000.xhp"
name="Paragraph"><emph>Paragraph</emph></link>, and then click the
<emph>Outline & Numbering</emph> tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154470" role="listitem">To
change the numbering options for selected paragraphs, choose <menuitem>Format -
</menuitem><link href="text/shared/01/05030000.xhp"
name="Paragraph"><menuitem>Paragraph</menuitem></link>, and then click the
<emph>Outline & Numbering</emph> tab.</paragraph>
</listitem>
</list>
@@ -84,6 +84,7 @@
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/numparapage/spinNF_RESTART_PARA"
id="bm_id3155906" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="3">Start
with</paragraph>
<paragraph xml-lang="en-US" id="par_id3149355" role="paragraph"><ahelp
hid="modules/swriter/ui/numparapage/spinNF_RESTART_PARA">Enter the number at
which to restart the line numbering</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#zurueck"/>
- </body>
+<embed href="text/shared/00/00000001.xhp#zurueck"/>
+<embed href="text/shared/00/00000001.xhp#uebernehmen"/><comment>Appears in
Paragraph Style, but not Paragraph Dialog</comment>
+</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
