[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - 3 commits - source/text

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Aug 14 11:52:04 UTC 2018


 source/text/shared/01/01010202.xhp          |    4 +++-
 source/text/shared/01/01020103.xhp          |    1 +
 source/text/shared/01/01100400.xhp          |   10 ++++++----
 source/text/shared/01/06040500.xhp          |    8 +++++---
 source/text/shared/01/password_dlg.xhp      |    2 ++
 source/text/shared/01/password_main.xhp     |    1 +
 source/text/shared/01/ref_epub_export.xhp   |    1 +
 source/text/shared/01/securitywarning.xhp   |    1 +
 source/text/shared/optionen/01040200.xhp    |    1 +
 source/text/shared/optionen/testaccount.xhp |    3 ++-
 source/text/swriter/01/02160000.xhp         |    2 ++
 source/text/swriter/01/04020100.xhp         |    2 ++
 source/text/swriter/01/04120201.xhp         |    3 ++-
 source/text/swriter/01/04120211.xhp         |    3 ++-
 source/text/swriter/01/04120220.xhp         |    8 +++++---
 source/text/swriter/01/05040800.xhp         |    1 +
 source/text/swriter/01/05060200.xhp         |    2 ++
 source/text/swriter/01/05090200.xhp         |    3 ++-
 source/text/swriter/01/05090300.xhp         |    3 ++-
 source/text/swriter/01/05150101.xhp         |    1 +
 source/text/swriter/01/05190000.xhp         |    3 ++-
 source/text/swriter/01/06040000.xhp         |    1 +
 source/text/swriter/01/06100000.xhp         |    1 +
 source/text/swriter/01/mm_seladdblo.xhp     |    3 ++-
 source/text/swriter/01/mm_seladdlis.xhp     |    3 ++-
 source/text/swriter/01/mm_seltab.xhp        |    1 +
 source/text/swriter/01/title_page.xhp       |    1 +
 source/text/swriter/01/watermark.xhp        |    1 +
 source/text/swriter/guide/indices_toc.xhp   |    3 ++-
 29 files changed, 57 insertions(+), 20 deletions(-)

New commits:
commit 5c4e10b45521e96f46764839d9e9644bc48026ac
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Wed Jul 25 19:04:26 2018 -0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 14 13:51:55 2018 +0200

    tdf#115254 Some branch bookmarks are not working 8
    
    module sw s-
    
    Change-Id: I8a8c40c6506f57caeb6de2d55181b4af91a28fce
    Reviewed-on: https://gerrit.libreoffice.org/58027
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/58621
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/source/text/shared/01/01010202.xhp b/source/text/shared/01/01010202.xhp
index 3f4837eb8..cd390a81a 100644
--- a/source/text/shared/01/01010202.xhp
+++ b/source/text/shared/01/01010202.xhp
@@ -32,6 +32,7 @@
 <body>
 <section id="format">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/LabelFormatPage" id="bm_id3147588" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="1"><link href="text/shared/01/01010202.xhp" name="Format">Format</link></paragraph>
 <paragraph role="paragraph" id="par_id3153255" xml-lang="en-US"><ahelp hid="modules/swriter/ui/labelformatpage/LabelFormatPage">Set paper formatting options.</ahelp></paragraph>
 </section>
@@ -64,7 +65,8 @@
 <paragraph role="paragraph" id="par_id3145119" xml-lang="en-US"><ahelp hid="modules/swriter/ui/labelformatpage/rows">Enter the number of labels or business cards that you want to span the height of the page.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/save" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2">Save</paragraph>
-<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US"><ahelp hid="modules/swriter/ui/labelformatpage/save">Saves the current label or business card format.</ahelp></paragraph>
+  <paragraph role="paragraph" id="par_id3156152" xml-lang="en-US"><ahelp hid="modules/swriter/ui/labelformatpage/save">Saves the current label or business card format.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/savelabeldialog/@@nowidget@@" id="bm_id@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/savelabeldialog/SaveLabelDialog" id="bm_id3158431" localize="false"/>
 <paragraph role="heading" id="hd_id3146773" xml-lang="en-US" level="2">Save Label Format</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/savelabeldialog/brand" id="bm_id3158430" localize="false"/>
diff --git a/source/text/shared/01/01100400.xhp b/source/text/shared/01/01100400.xhp
index 6af2a39cb..5d05962d4 100644
--- a/source/text/shared/01/01100400.xhp
+++ b/source/text/shared/01/01100400.xhp
@@ -41,10 +41,12 @@
 <bookmark_value>pictures;number of</bookmark_value>
 <bookmark_value>OLE objects;number of</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/statisticsinfopage/StatisticsInfoPage" id="bm_id3145356" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/statisticsinfopage/StatisticsInfoPage" id="bm_id3147294" localize="false"/>
-<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="1"><link href="text/shared/01/01100400.xhp" name="Statistics">Statistics</link></paragraph>
-<paragraph role="paragraph" id="par_id3156045" xml-lang="en-US"><ahelp hid=".">Displays statistics for the current file.</ahelp></paragraph>
+<bookmark branch="hid/modules/scalc/ui/statisticsinfopage/StatisticsInfoPage" id="bm_id3145356" xml-lang="en-US" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/statisticsinfopage/@@nowidget@@" id="bm_@@nowidget@@" xml-lang="en-US" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/statisticsinfopage/StatisticsInfoPage" id="bm_id3147294" xml-lang="en-US" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/statisticsinfopage/@@nowidget@@" id="bm_@@nowidget@@" xml-lang="en-US" localize="false"/>
+<paragraph role="heading" level="1" id="hd_id3149962" xml-lang="en-US"><link href="text/shared/01/01100400.xhp" name="Statistics">Statistics</link></paragraph>
+  <paragraph role="paragraph" id="par_id3156045" xml-lang="en-US"><ahelp hid=".">Displays statistics for the current file.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#info5"/>
diff --git a/source/text/shared/01/06040500.xhp b/source/text/shared/01/06040500.xhp
index 2fe9431ea..f3f628b43 100644
--- a/source/text/shared/01/06040500.xhp
+++ b/source/text/shared/01/06040500.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="textshared0106040500xml" indexer="include">
 <title id="tit" xml-lang="en-US">AutoCorrect context menu</title>
@@ -35,8 +35,10 @@
 <bookmark xml-lang="en-US" branch="hid/SW_HID_LINGU_REPLACE" id="bm_id3151097" localize="false"/>
 <paragraph role="heading" id="hd_id3153899" xml-lang="en-US" level="2"><Replacement Suggestions></paragraph>
 <paragraph role="paragraph" id="par_id3147000" xml-lang="en-US"><ahelp hid="HID_LINGU_REPLACE">Click the word to replace the highlighted word. Use the AutoCorrect submenu for permanent replacement.</ahelp><comment>UFI: see i60431</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/editeng/ui/spellmenu/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/editeng/ui/spellmenu/check" id="bm_id3155934" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/spellmenu/spelldialog" id="bm_id3155351" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/spellmenu/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="2">Spellcheck</paragraph>
 <paragraph role="paragraph" id="par_id3154497" xml-lang="en-US"><ahelp hid="modules/swriter/ui/spellmenu/spelldialog">Opens the <link href="text/shared/01/06010000.xhp" name="Spellcheck">Spellcheck</link> dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/editeng/ui/spellmenu/insert" id="bm_id3154422" localize="false"/>
diff --git a/source/text/swriter/01/02160000.xhp b/source/text/swriter/01/02160000.xhp
index 9aa7c396b..dc7ce767c 100644
--- a/source/text/swriter/01/02160000.xhp
+++ b/source/text/swriter/01/02160000.xhp
@@ -28,8 +28,10 @@
 <body>
 
 <bookmark xml-lang="en-US" branch="hid/.uno:IndexEntryDialog" id="bm_id5051951" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/indexentry/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/indexentry/IndexEntryDialog" id="bm_id3154489" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectindexdialog/SelectIndexDialog" id="bm_id3154490" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectindexdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 
 <paragraph id="hd_id3154567" role="heading" level="1" xml-lang="en-US">Edit Index Entry</paragraph>
 <paragraph id="par_id3151314" role="paragraph" xml-lang="en-US"><variable id="index_entry_text"><variable id="verzeichniseintragtext"><ahelp hid=".uno:IndexEntryDialog">Edits the selected index entry. Click in front of or in the index entry, and then choose this command.</ahelp> </variable></variable></paragraph>
diff --git a/source/text/swriter/01/04020100.xhp b/source/text/swriter/01/04020100.xhp
index ca36186ad..824be672f 100644
--- a/source/text/swriter/01/04020100.xhp
+++ b/source/text/swriter/01/04020100.xhp
@@ -34,8 +34,10 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id5941038"><bookmark_value>sections;inserting sections by DDE</bookmark_value>
 <bookmark_value>DDE; command for inserting sections</bookmark_value>
 </bookmark>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/sectionpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/sectionpage/SectionPage" id="bm_id3145414" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/editsectiondialog/EditSectionDialog" id="bm_id3145415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/editsectiondialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="hd_id3157557" xml-lang="en-US" level="1"><link href="text/swriter/01/04020100.xhp" name="Section">Section</link></paragraph>
 <paragraph role="paragraph" id="par_id3154644" xml-lang="en-US"><ahelp hid=".">Sets the properties of the section.</ahelp></paragraph>
 </section>
diff --git a/source/text/swriter/01/05150101.xhp b/source/text/swriter/01/05150101.xhp
index d48308e79..742cafecb 100644
--- a/source/text/swriter/01/05150101.xhp
+++ b/source/text/swriter/01/05150101.xhp
@@ -28,6 +28,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id3150343" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/autoformattable/AutoFormatTableDialog" id="bm_id3150249" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2655415"><bookmark_value>tables;AutoFormat function</bookmark_value>
       <bookmark_value>styles;table styles</bookmark_value>
diff --git a/source/text/swriter/01/05190000.xhp b/source/text/swriter/01/05190000.xhp
index 653690139..e784db86f 100644
--- a/source/text/swriter/01/05190000.xhp
+++ b/source/text/swriter/01/05190000.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="textswriter0105190000xml" indexer="include" status="PUBLISH">
@@ -36,6 +36,7 @@
 <bookmark_value>dividing tables</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:SplitTable" id="bm_id3037041" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/splittable/SplitTableDialog" id="bm_id3154654" localize="false"/>
 <paragraph role="heading" id="hd_id3153246" xml-lang="en-US" level="1"><link href="text/swriter/01/05190000.xhp" name="Split Table">Split Table</link></paragraph>
 <paragraph role="paragraph" id="par_id3083450" xml-lang="en-US"><ahelp hid=".uno:SplitTable">Splits the current table into two separate tables at the cursor position.</ahelp> You can also access this command by right-clicking in a table cell.</paragraph>
diff --git a/source/text/swriter/01/06100000.xhp b/source/text/swriter/01/06100000.xhp
index abfeb31c7..48f41ab73 100644
--- a/source/text/swriter/01/06100000.xhp
+++ b/source/text/swriter/01/06100000.xhp
@@ -37,6 +37,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:SortDialog" id="bm_id849221" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TableSort" id="bm_id6670125" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/sortdialog/SortDialog" id="bm_id66701251" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/sortdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149353" role="heading" level="1">Sort</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150015" role="paragraph"><variable id="sort"><ahelp hid=".uno:SortDialog">Sorts the selected paragraphs or table rows alphabetically or numerically.</ahelp> You can define up to three sort keys as well as combine alphanumeric and numeric sort keys.
 </variable></paragraph>
diff --git a/source/text/swriter/01/mm_seladdblo.xhp b/source/text/swriter/01/mm_seladdblo.xhp
index e99f771d7..919594e4b 100644
--- a/source/text/swriter/01/mm_seladdblo.xhp
+++ b/source/text/swriter/01/mm_seladdblo.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="textswriter01mm_seladdbloxml" indexer="include" status="PUBLISH">
@@ -30,6 +30,7 @@
 </history>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/SelectBlockDialog" id="bm_id6604815" localize="false"/>
 <paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1">Select Address Block</paragraph>
 <paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US"><ahelp hid=".">Select, edit, or delete an address block layout for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>.</ahelp></paragraph>
diff --git a/source/text/swriter/01/mm_seladdlis.xhp b/source/text/swriter/01/mm_seladdlis.xhp
index a2fb36781..73a05ae81 100644
--- a/source/text/swriter/01/mm_seladdlis.xhp
+++ b/source/text/swriter/01/mm_seladdlis.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="textswriter01mm_seladdlisxml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectaddressdialog/SelectAddressDialog" id="bm_id119937" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectaddressdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1">Select Address List</paragraph>
 <paragraph role="paragraph" id="par_idN10549" xml-lang="en-US"><ahelp hid=".">Select the address list that you want to use for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>, then click <emph>OK</emph>.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectaddressdialog/add" id="bm_id7303689" localize="false"/>
diff --git a/source/text/swriter/01/mm_seltab.xhp b/source/text/swriter/01/mm_seltab.xhp
index 46f90d997..94941febb 100644
--- a/source/text/swriter/01/mm_seltab.xhp
+++ b/source/text/swriter/01/mm_seltab.xhp
@@ -29,6 +29,7 @@
 </topic>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selecttabledialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selecttabledialog/SelectTableDialog" id="bm_id6627093" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selecttabledialog/table" id="bm_id6627094" localize="false"/><paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1">Select Table</paragraph>
 <paragraph role="paragraph" id="par_idN10546" xml-lang="en-US"><ahelp hid=".">Select the table that you want to use for <link href="text/swriter/01/mm_seladdlis.xhp">mail merge</link> addresses.</ahelp></paragraph>
commit ef755086c52950deb9bb3551bbe2847f45c3d4aa
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Wed Jul 25 18:41:20 2018 -0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 14 13:51:49 2018 +0200

    tdf#115254 Some branch bookmarks are not working 7
    
    Module sw , t- to w-
    
    Change-Id: Ic307998cd8f2080c3c0a98a114308e30394362d9
    Reviewed-on: https://gerrit.libreoffice.org/58026
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    (cherry picked from commit 3fb1fda6051fafe343fde842a344192dbc5abe99)
    Reviewed-on: https://gerrit.libreoffice.org/58140
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/source/text/shared/optionen/01040200.xhp b/source/text/shared/optionen/01040200.xhp
index 74bd8141b..813f29d20 100644
--- a/source/text/shared/optionen/01040200.xhp
+++ b/source/text/shared/optionen/01040200.xhp
@@ -50,6 +50,7 @@
 <bookmark_value>displaying; comments in text documents</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/viewoptionspage/ViewOptionsPage" id="bm_id3151111" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/viewoptionspage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="1"><link href="text/shared/optionen/01040200.xhp" name="View">View</link></paragraph>
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US"><ahelp hid=".">Defines the default settings for displaying objects in your text documents and also the default settings for the window elements.</ahelp></paragraph>
 </section>
diff --git a/source/text/shared/optionen/testaccount.xhp b/source/text/shared/optionen/testaccount.xhp
index 3001bfb00..9ff89f58e 100644
--- a/source/text/shared/optionen/testaccount.xhp
+++ b/source/text/shared/optionen/testaccount.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="textsharedoptionentestaccountxhp" indexer="include" status="PUBLISH">
@@ -27,6 +27,7 @@
 </topic>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/TestMailSettings" id="bm_id3895380" localize="false"/>
 <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1"><link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link></paragraph>
 <paragraph role="paragraph" id="par_idN10557" xml-lang="en-US">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
diff --git a/source/text/swriter/01/04120201.xhp b/source/text/swriter/01/04120201.xhp
index 65fa08619..1d234a3c9 100644
--- a/source/text/swriter/01/04120201.xhp
+++ b/source/text/swriter/01/04120201.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="textswriter0104120201xml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <section id="vorlagen">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocstylespage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocstylespage/TocStylesPage" id="bm_id3154643" localize="false"/>
 <paragraph role="heading" id="hd_id3145825" xml-lang="en-US" level="1"><link href="text/swriter/01/04120201.xhp" name="Styles">Styles</link></paragraph>
 <paragraph role="paragraph" id="par_id3154505" xml-lang="en-US">You can assign different paragraph styles to change the formatting of index titles, separators and index entries. You can also modify paragraph styles in this dialog.</paragraph>
diff --git a/source/text/swriter/01/04120211.xhp b/source/text/swriter/01/04120211.xhp
index 0b5ac572f..09db02277 100644
--- a/source/text/swriter/01/04120211.xhp
+++ b/source/text/swriter/01/04120211.xhp
@@ -27,9 +27,10 @@
       </topic>
    </meta>
    <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/TocIndexPage" id="bm_id3145247" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3150018" role="heading" level="1"><link href="text/swriter/01/04120211.xhp" name="Index">Index</link></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150570" role="paragraph"><variable id="verzeichnis">The following options are available when you select <emph>Table of Contents </emph>as the <link href="text/swriter/01/04120210.xhp" name="index">index</link> type. 
+      <paragraph xml-lang="en-US" id="par_id3150570" role="paragraph"><variable id="verzeichnis">The following options are available when you select <emph>Table of Contents </emph>as the <link href="text/swriter/01/04120210.xhp" name="index">index</link> type.
 </variable></paragraph>
       <section id="howtoget">
          <embed href="text/swriter/00/00000404.xhp#verz21"/>
diff --git a/source/text/swriter/01/04120220.xhp b/source/text/swriter/01/04120220.xhp
index 21a6e3a89..97425e882 100644
--- a/source/text/swriter/01/04120220.xhp
+++ b/source/text/swriter/01/04120220.xhp
@@ -30,10 +30,12 @@
 </history>
 </meta>
 <body>
-  
-  
+
+
   <section id="eintraege">
-  <bookmark branch="hid/modules/swriter/ui/tocentriespage/TocEntriesPage" xml-lang="en-US" id="bm_id3145824" localize="false"/><paragraph id="hd_id3149349" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/04120220.xhp" name="Entries (indexes/tables)">Entries (indexes/tables)</link></paragraph>
+  <bookmark branch="hid/modules/swriter/ui/tocentriespage/@@nowidget@@" xml-lang="en-US" id="bm_@@nowidget@@" localize="false"/>
+  <bookmark branch="hid/modules/swriter/ui/tocentriespage/TocEntriesPage" xml-lang="en-US" id="bm_id3145824" localize="false"/>
+  <paragraph id="hd_id3149349" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/04120220.xhp" name="Entries (indexes/tables)">Entries (indexes/tables)</link></paragraph>
   <paragraph role="paragraph" id="par_id3154504" xml-lang="en-US"><ahelp visibility="visible" hid="modules/swriter/ui/tocentriespage/TocEntriesPage">Specify the format of the index or table entries. The appearance of this tab changes to reflect the type of index that you selected on the <link href="text/swriter/01/04120210.xhp" name="Type">Type</link> tab.</ahelp></paragraph>
   </section>
   <section id="howtoget">
diff --git a/source/text/swriter/01/05040800.xhp b/source/text/swriter/01/05040800.xhp
index 067754e76..91786af12 100644
--- a/source/text/swriter/01/05040800.xhp
+++ b/source/text/swriter/01/05040800.xhp
@@ -28,6 +28,7 @@
 </meta>
 <body>
 <section id="textraster">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/textgridpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/textgridpage/TextGridPage" id="bm_id3145580" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150760"><bookmark_value>text grid for Asian layout</bookmark_value>
 </bookmark>
diff --git a/source/text/swriter/01/05060200.xhp b/source/text/swriter/01/05060200.xhp
index ea0860746..936a4a93c 100644
--- a/source/text/swriter/01/05060200.xhp
+++ b/source/text/swriter/01/05060200.xhp
@@ -28,6 +28,8 @@
 </meta>
 <body>
 <section id="umlauf">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrapdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/WrapPage" id="bm_id3153538" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrapdialog/WrapDialog" id="bm_id3153539" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TextWrap" id="bm_id6339381" localize="false"/>
diff --git a/source/text/swriter/01/05090200.xhp b/source/text/swriter/01/05090200.xhp
index bbee06516..d34adea03 100644
--- a/source/text/swriter/01/05090200.xhp
+++ b/source/text/swriter/01/05090200.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="textswriter0105090200xml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <section id="spalten">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/TableColumnPage" id="bm_id7831292" localize="false"/>
 <paragraph role="heading" id="hd_id3150756" xml-lang="en-US" level="1"><link href="text/swriter/01/05090200.xhp" name="Columns">Columns</link></paragraph>
 <paragraph role="paragraph" id="par_id3149294" xml-lang="en-US">Specify the column width properties.</paragraph>
diff --git a/source/text/swriter/01/05090300.xhp b/source/text/swriter/01/05090300.xhp
index c961def5e..9d4879274 100644
--- a/source/text/swriter/01/05090300.xhp
+++ b/source/text/swriter/01/05090300.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="textswriter0105090300xml" indexer="include" status="PUBLISH">
@@ -39,6 +39,7 @@
 <bookmark_value>page breaks; tables</bookmark_value>
 <bookmark_value>splitting tables;row breaks</bookmark_value>
 </bookmark>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tabletextflowpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tabletextflowpage/TableTextFlowPage" id="bm_id3154507" localize="false"/>
 <paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="1"><link href="text/swriter/01/05090300.xhp" name="Text Flow">Text Flow</link></paragraph>
 <paragraph role="paragraph" id="par_id3145245" xml-lang="en-US"><ahelp hid="modules/swriter/ui/tabletextflowpage/TableTextFlowPage">Set the text flow options for the text before and after the table.</ahelp></paragraph>
diff --git a/source/text/swriter/01/06040000.xhp b/source/text/swriter/01/06040000.xhp
index ffdf09684..9416ae6c4 100644
--- a/source/text/swriter/01/06040000.xhp
+++ b/source/text/swriter/01/06040000.xhp
@@ -28,6 +28,7 @@
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wordcount/WordCountDialog" id="bm_id6469313" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wordcount/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wordcount/help" id="bm_id6469314" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wordcount/close" id="bm_id6469315" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WordCountDialog" id="bm_id1483504" localize="false"/>
diff --git a/source/text/swriter/01/title_page.xhp b/source/text/swriter/01/title_page.xhp
index 49ead178f..7aaeeda52 100644
--- a/source/text/swriter/01/title_page.xhp
+++ b/source/text/swriter/01/title_page.xhp
@@ -30,6 +30,7 @@
 
 <section id="using_title_pages_in_your_document">
 <bookmark xml-lang="en-US" branch="hid/.uno:TitlePageDialog" id="bm_id300920161429511761" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/titlepage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/titlepage/DLG_TITLEPAGE" id="bm_id301920161429511761" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id300920161717389897">
   <bookmark_value>page;title page</bookmark_value>
diff --git a/source/text/swriter/01/watermark.xhp b/source/text/swriter/01/watermark.xhp
index 209655bd9..08b8a9a84 100644
--- a/source/text/swriter/01/watermark.xhp
+++ b/source/text/swriter/01/watermark.xhp
@@ -22,6 +22,7 @@
         <paragraph id="hd_id781516897374563" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/watermark.xhp" name="Watermark">Page Watermark</link></paragraph>
         <paragraph id="par_id121516897374563" role="paragraph" xml-lang="en-US"><variable id="waterm01"><ahelp hid=".">Insert a watermark text in the current page style background.</ahelp></variable></paragraph>
         <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/watermarkdialog/WatermarkDialog" id="bm_id3155897" localize="false"/>
+        <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/watermarkdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
         <bookmark xml-lang="en-US" branch="index" id="bm_id171516897713635">
             <bookmark_value>watermark;text documents</bookmark_value>
             <bookmark_value>watermark;page background</bookmark_value>
diff --git a/source/text/swriter/guide/indices_toc.xhp b/source/text/swriter/guide/indices_toc.xhp
index 5d3712c3d..7689e12b4 100644
--- a/source/text/swriter/guide/indices_toc.xhp
+++ b/source/text/swriter/guide/indices_toc.xhp
@@ -32,6 +32,7 @@
   <bookmark_value>updating; tables of contents</bookmark_value>
 </bookmark>
 
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocdialog/TocDialog" id="bm_id3154749" localize="false"/>
 
 <paragraph id="hd_id3147104" role="heading" level="1" xml-lang="en-US"><variable id="indices_toc"><link href="text/swriter/guide/indices_toc.xhp" name="Creating a Table of Contents">Creating a Table of Contents</link></variable></paragraph>
@@ -82,4 +83,4 @@
 <embed href="text/swriter/guide/indices_multidoc.xhp#indices_multidoc"/>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 826b575dac648932b7c9c684a59c811d9e32362a
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Wed Jul 18 17:32:15 2018 -0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 14 13:51:43 2018 +0200

    tdf#115254 Some branch bookmarks are not working 6
    
    writerperfect and uui modules
    
    Change-Id: Ic5534fc23a8f631c82e39def337a867d355cb93f
    Reviewed-on: https://gerrit.libreoffice.org/57702
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    (cherry picked from commit faeb714c09f7420d6ed0c55097de2467e211a13d)
    Reviewed-on: https://gerrit.libreoffice.org/58368
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/source/text/shared/01/01020103.xhp b/source/text/shared/01/01020103.xhp
index 4f803974f..4781532c5 100644
--- a/source/text/shared/01/01020103.xhp
+++ b/source/text/shared/01/01020103.xhp
@@ -37,6 +37,7 @@
 </section>
 <!-- removed HID SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX -->
 <bookmark xml-lang="en-US" branch="hid/uui/ui/filterselect/filters" id="bm_id1646778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui/ui/filterselect/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="2">Filter list</paragraph>
 <paragraph role="paragraph" id="par_id3159201" xml-lang="en-US"><ahelp hid="SFX2:LISTBOX:DLG_FILTER_SELECT:LB_DLG_LISTBOX">Select the import filter for the file that you want to open.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152918" xml-lang="en-US">If $[officename] does not recognize the file type of the document that your want to open, try any of the following:</paragraph>
diff --git a/source/text/shared/01/password_dlg.xhp b/source/text/shared/01/password_dlg.xhp
index 20fad3081..5e04cf60a 100644
--- a/source/text/shared/01/password_dlg.xhp
+++ b/source/text/shared/01/password_dlg.xhp
@@ -29,6 +29,8 @@
  <body>
  <section id="passwort">
      <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+     <bookmark xml-lang="en-US" branch="hid/uui/ui/password/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+     <bookmark xml-lang="en-US" branch="hid/cui/ui/password/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
      <bookmark xml-lang="en-US" branch="hid/sfx/ui/password/PasswordDialog" id="bm_id3152877" localize="false"/>
      <paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="1"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
      <paragraph xml-lang="en-US" id="par_id3154350" role="paragraph">Assigns a password to prevent users from making unauthorized changes.</paragraph>
diff --git a/source/text/shared/01/password_main.xhp b/source/text/shared/01/password_main.xhp
index 901ae4097..17c9b26f2 100644
--- a/source/text/shared/01/password_main.xhp
+++ b/source/text/shared/01/password_main.xhp
@@ -28,6 +28,7 @@
    </meta>
    <body>
       <section id="password_main">
+          <bookmark xml-lang="en-US" branch="hid/uui/ui/setmasterpassworddlg/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
          <bookmark xml-lang="en-US" branch="hid/uui/ui/setmasterpassworddlg/SetMasterPasswordDialog" id="bm_id098200904183274" localize="false"/>
          <paragraph xml-lang="en-US" id="hd_id3154183" role="heading" level="1">Set Master Password</paragraph>
          <paragraph xml-lang="en-US" id="par_id3154841" role="paragraph"><ahelp hid=".">Assign a master password to protect the access to a saved password.</ahelp></paragraph>
diff --git a/source/text/shared/01/ref_epub_export.xhp b/source/text/shared/01/ref_epub_export.xhp
index 849c5c300..12eed9725 100644
--- a/source/text/shared/01/ref_epub_export.xhp
+++ b/source/text/shared/01/ref_epub_export.xhp
@@ -35,6 +35,7 @@
 </bookmark>
 
 <bookmark xml-lang="en-US" branch="hid/writerperfect/ui/exportepub/EpubDialog" id="bm_id1033968" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/writerperfect/ui/exportepub/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 
 <paragraph id="hd_id3149532" role="heading" level="1" xml-lang="en-US"><variable id="ref_epub_export"><link href="text/shared/01/ref_epub_export.xhp" name="Export as EPUB">Export as EPUB</link></variable></paragraph>
 <paragraph id="par_id3154044" role="paragraph" xml-lang="en-US">Export the current file to <link href="text/shared/00/00000002.xhp#epub" name="epub">EPUB</link>.</paragraph>
diff --git a/source/text/shared/01/securitywarning.xhp b/source/text/shared/01/securitywarning.xhp
index 7f0cdc5b8..5ce927cd3 100644
--- a/source/text/shared/01/securitywarning.xhp
+++ b/source/text/shared/01/securitywarning.xhp
@@ -36,6 +36,7 @@
 <bookmark_value>macros;security warning dialog</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SFX2_HID_WARNING_SECURITY_HYPERLINK" id="bm_id5382854" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui/ui/macrowarnmedium/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/uui/ui/macrowarnmedium/MacroWarnMedium" id="bm_id7777947" localize="false"/>
 <paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><variable id="securitywarning"><link href="text/shared/01/securitywarning.xhp">Security Warning</link>
 </variable></paragraph>


More information about the Libreoffice-commits mailing list