[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - source/text
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Aug 14 12:11:09 UTC 2018
source/text/shared/01/06050600.xhp | 1
source/text/shared/optionen/01040300.xhp | 3 +-
source/text/shared/optionen/01040500.xhp | 1
source/text/shared/optionen/01040600.xhp | 7 +++--
source/text/shared/optionen/01040700.xhp | 7 +++--
source/text/shared/optionen/01040900.xhp | 3 +-
source/text/shared/optionen/01041000.xhp | 1
source/text/shared/optionen/01041100.xhp | 37 +++++++++++++++----------------
source/text/swriter/01/06060100.xhp | 3 +-
9 files changed, 36 insertions(+), 27 deletions(-)
New commits:
commit 9979cc60ca9b38dff35bcc1bd8a2bf5dd4a2c121
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Jul 26 16:19:21 2018 -0300
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 14 14:10:48 2018 +0200
tdf#115254 Some branch bookmarks are'nt working 10
module sw, o-
Change-Id: I301f34529ee6c62018d8301d1d16a2cab908e829
Reviewed-on: https://gerrit.libreoffice.org/58144
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/source/text/shared/01/06050600.xhp b/source/text/shared/01/06050600.xhp
index 005f7711d..f8df9c5e9 100644
--- a/source/text/shared/01/06050600.xhp
+++ b/source/text/shared/01/06050600.xhp
@@ -28,6 +28,7 @@
</meta>
<body>
<section id="position_s">
+ <bookmark branch="hid/modules/swriter/ui/outlinepositionpage/@@nowidget@@" xml-lang="en-US" id="bm_@@nowidget@@" localize="false"/>
<bookmark branch="hid/modules/swriter/ui/outlinepositionpage/OutlinePositionPage" xml-lang="en-US" id="bm_id3150280" localize="false"/>
<bookmark branch="hid/cui/ui/numberingpositionpage/NumberingPositionPage" xml-lang="en-US" id="bm_id3150281" localize="false"/>
<paragraph role="heading" id="hd_id3150467" xml-lang="en-US" level="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
diff --git a/source/text/shared/optionen/01040300.xhp b/source/text/shared/optionen/01040300.xhp
index 99034ab5c..090ac769f 100644
--- a/source/text/shared/optionen/01040300.xhp
+++ b/source/text/shared/optionen/01040300.xhp
@@ -18,7 +18,7 @@
* 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="textsharedoptionen01040300xml" indexer="include" status="PUBLISH">
@@ -40,6 +40,7 @@
<bookmark_value>paragraph styles;modifying basic fonts</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optfonttabpage/OptFontTabPage" id="bm_id3154894" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optfonttabpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts">Basic Fonts</link></paragraph>
<paragraph role="paragraph" id="par_id3149786" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optfonttabpage/OptFontTabPage">Specifies the settings for the basic fonts in your documents.</ahelp></paragraph>
</section>
diff --git a/source/text/shared/optionen/01040500.xhp b/source/text/shared/optionen/01040500.xhp
index bd2eec335..e39049b33 100644
--- a/source/text/shared/optionen/01040500.xhp
+++ b/source/text/shared/optionen/01040500.xhp
@@ -37,6 +37,7 @@
<bookmark_value>number formats; recognition in text tables</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/opttablepage/OptTablePage" id="bm_id3148685" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/opttablepage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="1"><link href="text/shared/optionen/01040500.xhp" name="Table">Table</link></paragraph>
<paragraph role="paragraph" id="par_id3145674" xml-lang="en-US"><ahelp hid="modules/swriter/ui/opttablepage/OptTablePage">Defines the attributes of tables in text documents.</ahelp></paragraph>
</section>
diff --git a/source/text/shared/optionen/01040600.xhp b/source/text/shared/optionen/01040600.xhp
index f67e0b41b..47533f756 100644
--- a/source/text/shared/optionen/01040600.xhp
+++ b/source/text/shared/optionen/01040600.xhp
@@ -18,7 +18,7 @@
* 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="textsharedoptionen01040600xml" indexer="include" status="PUBLISH">
@@ -53,6 +53,7 @@
<bookmark_value>cursor; allowing in protected areas (Writer)</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/OptFormatAidsPage" id="bm_id3155388" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph role="heading" id="hd_id3154285" xml-lang="en-US" level="1"><link href="text/shared/optionen/01040600.xhp" name="Formatting Aids">Formatting Aids</link></paragraph>
<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optformataidspage/OptFormatAidsPage">In $[officename] text and HTML documents, defines the display for certain characters and for the direct cursor.</ahelp></paragraph>
</section>
@@ -66,14 +67,14 @@
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optformataidspage/paragraph">Specifies whether paragraph delimiters are displayed. The paragraph delimiters also contain paragraph format information.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/hyphens" id="bm_id3148453" localize="false"/>
<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="3">Soft hyphens</paragraph>
-<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optformataidspage/hyphens">Specifies whether soft hyphens (called also as optional or discretionary hyphens) are displayed. These are hidden user-defined delimiters that you enter within a word by pressing <switchinline select="sys"><caseinline select="MAC">Command+Hyphen(-)
+<paragraph role="paragraph" id="par_id3147230" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optformataidspage/hyphens">Specifies whether soft hyphens (called also as optional or discretionary hyphens) are displayed. These are hidden user-defined delimiters that you enter within a word by pressing <switchinline select="sys"><caseinline select="MAC">Command+Hyphen(-)
</caseinline><defaultinline>Ctrl+Hyphen(-).</defaultinline></switchinline> Words with soft hyphens are only separated at the end of a line at the point where a soft hyphen has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/spaces" id="bm_id3149562" localize="false"/>
<paragraph role="heading" id="hd_id3147287" xml-lang="en-US" level="3">Spaces</paragraph>
<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optformataidspage/spaces">Specifies whether to represent every space in the text with a dot.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/nonbreak" id="bm_id3148616" localize="false"/>
<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3">Non-breaking spaces</paragraph>
-<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optformataidspage/nonbreak">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the <switchinline select="sys"><caseinline select="MAC">Command+Shift+Spacebar
+<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optformataidspage/nonbreak">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the <switchinline select="sys"><caseinline select="MAC">Command+Shift+Spacebar
</caseinline><defaultinline>Ctrl+Shift+Spacebar</defaultinline></switchinline> shortcut keys.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optformataidspage/tabs" id="bm_id3152578" localize="false"/>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3">Tabs</paragraph>
diff --git a/source/text/shared/optionen/01040700.xhp b/source/text/shared/optionen/01040700.xhp
index 99f5e5971..f0d4defea 100644
--- a/source/text/shared/optionen/01040700.xhp
+++ b/source/text/shared/optionen/01040700.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="textsharedoptionen01040700xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Changes</title>
@@ -29,6 +29,7 @@
<body>
<section id="aenderungen">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optredlinepage/OptRedLinePage" id="bm_id3149795" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optredlinepage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153823" role="heading" level="1"><link href="text/shared/optionen/01040700.xhp" name="Changes">Changes</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3149416" role="paragraph"><ahelp hid="modules/swriter/ui/optredlinepage/OptRedLinePage">Defines the appearance of changes in the document.</ahelp></paragraph>
</section>
diff --git a/source/text/shared/optionen/01040900.xhp b/source/text/shared/optionen/01040900.xhp
index 658d3c3e6..f313abbf2 100644
--- a/source/text/shared/optionen/01040900.xhp
+++ b/source/text/shared/optionen/01040900.xhp
@@ -46,6 +46,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optgeneralpage/OptGeneralPage" id="bm_id3150443" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optgeneralpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph id="hd_id3155892" role="heading" level="1" xml-lang="en-US"><link href="text/shared/optionen/01040900.xhp" name="General">General</link></paragraph>
<paragraph id="par_id3145382" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optgeneralpage/OptGeneralPage">Specifies general settings for text documents.</ahelp></paragraph>
@@ -189,4 +190,4 @@
<paragraph id="par_id3166985" role="paragraph" xml-lang="en-US">Specifies the characters that are considered as word separators when counting words, in addition to spaces, tabs and line and paragraph breaks.</paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/optionen/01041000.xhp b/source/text/shared/optionen/01041000.xhp
index b34f397aa..4fa9aadb4 100644
--- a/source/text/shared/optionen/01041000.xhp
+++ b/source/text/shared/optionen/01041000.xhp
@@ -39,6 +39,7 @@
</bookmark>
<section id="compatibility">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcompatpage/OptCompatPage" id="bm_id2023987" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcompatpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10607" role="heading" level="1"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US"><ahelp hid="modules/swriter/ui/optcompatpage/OptCompatPage">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
diff --git a/source/text/shared/optionen/01041100.xhp b/source/text/shared/optionen/01041100.xhp
index a349bf393..cccc6474b 100644
--- a/source/text/shared/optionen/01041100.xhp
+++ b/source/text/shared/optionen/01041100.xhp
@@ -29,70 +29,71 @@
</topic>
</meta>
<body>
-
-
+
+
<section id="autocaption">
-
-
+
+
<bookmark xml-lang="en-US" branch="index" id="bm_id5164036"><bookmark_value>automatic captions (Writer)</bookmark_value>
<bookmark_value>AutoCaption function in %PRODUCTNAME Writer</bookmark_value>
<bookmark_value>captions;automatic captions (Writer)</bookmark_value>
</bookmark>
<comment>mw deleted "adding;"</comment>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/OptCaptionPage" id="bm_id1826838" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10561" role="heading" level="1"><link href="text/shared/optionen/01041100.xhp">AutoCaption</link></paragraph>
<paragraph xml-lang="en-US" id="par_idN10571" role="paragraph">Specifies the settings for captions that are automatically added to inserted objects.</paragraph>
-
+
</section>
<section id="howtoget">
-
+
<embed href="text/shared/00/00000406.xhp#einfuegenbeschriftung"/>
-
+
</section>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/objects" id="bm_id1826837" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10588" role="heading" level="2">Add captions automatically when inserting</paragraph>
<paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph"><ahelp hid=".">Select the object type for which the AutoCaption settings are to be valid.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1058F" role="heading" level="2">Caption</paragraph>
<paragraph xml-lang="en-US" id="par_idN10593" role="paragraph">Defines the options to be applied to the selected object type. These options are identical to those in the <emph>Insert - Caption</emph> menu, which is available when an object is selected. Below the settings is a preview of the object category, together with numbering type.</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/category" id="bm_id3156330" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="3">Category</paragraph>
<paragraph xml-lang="en-US" id="par_id3155419" role="paragraph"><ahelp hid="modules/swriter/ui/optcaptionpage/category">Specifies the category of the selected object.</ahelp><comment>UFI: copied text from optionen/01040801</comment></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/numbering" id="bm_id3149236" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155628" role="heading" level="3">Numbering</paragraph>
<paragraph xml-lang="en-US" id="par_id3149233" role="paragraph"><ahelp hid="modules/swriter/ui/optcaptionpage/numbering">Specifies the type of numbering required.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/separator" id="bm_id3154071" localize="false"/>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/numseparator" id="bm_id4456617" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149457" role="heading" level="3">Separator</paragraph>
<paragraph xml-lang="en-US" id="par_idN106E2" role="paragraph"><ahelp hid="modules/swriter/ui/optcaptionpage/separator">Defines the character to be displayed after the number of the heading or chapter level.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/position" id="bm_id3153627" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="3">Position</paragraph>
<paragraph xml-lang="en-US" id="par_id3151384" role="paragraph"><ahelp hid="modules/swriter/ui/optcaptionpage/position">Determines the position of the caption with respect to the object.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1064E" role="heading" level="2">Numbering captions by chapter</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/level" id="bm_id3145068" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145609" role="heading" level="3">Level</paragraph>
<paragraph xml-lang="en-US" id="par_id3153898" role="paragraph"><ahelp hid="modules/swriter/ui/optcaptionpage/level">Specifies the headings or chapter levels where you want the numbering to start.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3153524" role="paragraph"><ahelp hid="modules/swriter/ui/optcaptionpage/chapseparator">Defines the character to be displayed after the number of the heading or chapter level.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN106A8" role="heading" level="2">Category and frame format</paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/charstyle" id="bm_id2708517" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="3">Character style</paragraph>
<paragraph xml-lang="en-US" id="par_idN106B4" role="paragraph"><ahelp hid=".">Specifies the character style.</ahelp></paragraph>
-
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optcaptionpage/applyborder" id="bm_id346995" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3143280" role="heading" level="3">Apply border and shadow</paragraph>
<paragraph xml-lang="en-US" id="par_id3149826" role="paragraph"><ahelp hid="modules/swriter/ui/optcaptionpage/applyborder">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
<section id="relatedtopics">
-
+
<embed href="text/swriter/guide/captions.xhp#captions"/>
<embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
-
+
</section>
</body>
</helpdocument>
diff --git a/source/text/swriter/01/06060100.xhp b/source/text/swriter/01/06060100.xhp
index cadffd7d6..5ab9b7193 100644
--- a/source/text/swriter/01/06060100.xhp
+++ b/source/text/swriter/01/06060100.xhp
@@ -32,6 +32,7 @@
<paragraph id="hd_id3151387" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/06060100.xhp" name="Numbering">Numbering</link></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/OutlineNumberingPage" id="bm_id3150280" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
<paragraph id="par_id3155620" role="paragraph" xml-lang="en-US">Specifies the number format and the hierarchy for chapter numbering in the current document.</paragraph>
</section>
@@ -153,4 +154,4 @@
<paragraph id="par_id3151023" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/outlinenumberingpage/startat">Enter the number that you want to restart the chapter numbering at.</ahelp></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
More information about the Libreoffice-commits
mailing list