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

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


 source/text/shared/01/01010303.xhp           |    1 +
 source/text/shared/optionen/01040400.xhp     |    1 +
 source/text/shared/optionen/mailmerge.xhp    |    3 ++-
 source/text/swriter/01/01150000.xhp          |    1 +
 source/text/swriter/01/02110000.xhp          |    3 ++-
 source/text/swriter/01/02120100.xhp          |    1 +
 source/text/swriter/01/04090006.xhp          |    7 ++++---
 source/text/swriter/01/04120100.xhp          |    1 +
 source/text/swriter/01/05030800.xhp          |    1 +
 source/text/swriter/01/05060300.xhp          |    1 +
 source/text/swriter/01/05110100.xhp          |    3 ++-
 source/text/swriter/01/05150300.xhp          |    7 ++++---
 source/text/swriter/01/05200000.xhp          |    3 ++-
 source/text/swriter/01/06060000.xhp          |    2 ++
 source/text/swriter/01/mailmerge01.xhp       |    3 ++-
 source/text/swriter/01/mailmerge02.xhp       |    1 +
 source/text/swriter/01/mailmerge03.xhp       |    3 ++-
 source/text/swriter/01/mailmerge04.xhp       |    3 ++-
 source/text/swriter/01/mailmerge05.xhp       |    3 ++-
 source/text/swriter/01/mm_emabod.xhp         |    3 ++-
 source/text/swriter/01/mm_emailmergeddoc.xhp |    1 +
 source/text/swriter/01/mm_printmergeddoc.xhp |    1 +
 source/text/swriter/01/mm_savemergeddoc.xhp  |    1 +
 source/text/swriter/02/10070000.xhp          |    1 +
 24 files changed, 40 insertions(+), 15 deletions(-)

New commits:
commit f8b2927dfed4e72e547a0fae0f6026ba1e0aa8b7
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Jul 26 17:14:17 2018 -0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 14 13:52:16 2018 +0200

    tdf#115254 Some branch bookmarks are'nt working 11
    
    module sw m- n-
    
    Change-Id: I556041e33ce908d02e510676039370cdf79bc096
    Reviewed-on: https://gerrit.libreoffice.org/58147
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/58622
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/source/text/shared/optionen/mailmerge.xhp b/source/text/shared/optionen/mailmerge.xhp
index 5999a6bf4..e51a1e278 100644
--- a/source/text/shared/optionen/mailmerge.xhp
+++ b/source/text/shared/optionen/mailmerge.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="textsharedoptionenmailmergexhp" indexer="include" status="PUBLISH">
@@ -32,6 +32,7 @@
 <body>
 <section id="mailmerge">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/MailConfigPage" id="bm_id3323771" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1"><link href="text/shared/optionen/mailmerge.xhp">Mail Merge E-mail</link></paragraph>
 <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Specifies the user information and server settings for when you send form letters as e-mail messages.</ahelp></paragraph>
 </section>
diff --git a/source/text/swriter/01/01150000.xhp b/source/text/swriter/01/01150000.xhp
index a2d3c2384..f6cab9edd 100644
--- a/source/text/swriter/01/01150000.xhp
+++ b/source/text/swriter/01/01150000.xhp
@@ -30,6 +30,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/MailmergeDialog" id="bm_id3149687" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id3149687" localize="false"/>
 <paragraph role="heading" id="hd_id3150757" xml-lang="en-US" level="1">Mail Merge</paragraph>
 <paragraph role="paragraph" id="par_id3151187" xml-lang="en-US"><variable id="serienbrieftext"><ahelp hid=".">The <emph>Mail Merge</emph> dialog helps you in printing and saving form letters.</ahelp>
diff --git a/source/text/swriter/01/02110000.xhp b/source/text/swriter/01/02110000.xhp
index f0856ffc6..3369099f1 100644
--- a/source/text/swriter/01/02110000.xhp
+++ b/source/text/swriter/01/02110000.xhp
@@ -31,6 +31,7 @@
 <section id="navigator">
 <bookmark xml-lang="en-US" branch="hid/.uno:Navigator" id="bm_id4232254" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SW_HID_NAVIGATOR_TREELIST" id="bm_id4232255" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 
 <paragraph id="hd_id3151177" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link></paragraph>
 <paragraph id="par_id3149802" role="paragraph" xml-lang="en-US"><ahelp hid=".">Shows or hides the Navigator window, where you can quickly jump to different parts of your document. Navigator is also available as a deck of the Sidebar. You can also use the Navigator to insert elements from the current document or other open documents, and to organize master documents.</ahelp> To edit an item in the Navigator, right-click the item, and then choose a command from the context menu. If you want, you can <link href="text/shared/00/00000005.xhp#andocken" name="dock">dock</link> the Navigator at the edge of your workspace.</paragraph>
@@ -113,7 +114,7 @@
 
 <paragraph id="hd_id3148715" role="heading" level="2" xml-lang="en-US">Page number</paragraph>
 <paragraph id="par_id3155548" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/navigatorpanel/numericfield">Type the number of the page number that you want to jump to, and then press Enter.</ahelp></paragraph>
-<paragraph id="par_id3148933" role="tip" xml-lang="en-US">To quickly move the cursor to another page while you are in a document, press Shift+<switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph id="par_id3148933" role="tip" xml-lang="en-US">To quickly move the cursor to another page while you are in a document, press Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F5, type the number of the page that you want to jump to, and then wait a few moments.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/listbox" id="bm_id3155319" localize="false"/>
 
diff --git a/source/text/swriter/01/04120100.xhp b/source/text/swriter/01/04120100.xhp
index a5e6f4b76..64a97a249 100644
--- a/source/text/swriter/01/04120100.xhp
+++ b/source/text/swriter/01/04120100.xhp
@@ -32,6 +32,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertIndexesEntry" id="bm_id3666614" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/indexentry/IndexEntryDialog" id="bm_id3150014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/indexentry/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="hd_id3154508" xml-lang="en-US" level="1">Insert Index Entry</paragraph>
 <paragraph role="paragraph" id="par_id3150565" xml-lang="en-US"><variable id="eintrag"><ahelp hid=".uno:InsertIndexesEntry">Marks the selected text as index or table of contents entry.</ahelp>
 </variable></paragraph>
diff --git a/source/text/swriter/01/05030800.xhp b/source/text/swriter/01/05030800.xhp
index a05b8005e..187244253 100644
--- a/source/text/swriter/01/05030800.xhp
+++ b/source/text/swriter/01/05030800.xhp
@@ -29,6 +29,7 @@
    <body>
       <section id="numerierung">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/NumParaPage" id="bm_id3145415" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151173" role="heading" level="1"><link href="text/swriter/01/05030800.xhp" name="Numbering">Outline & Numbering</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3154100" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/NumParaPage">Adds or removes outline level, numbering, or bullets from the paragraph. You can also select the style of numbering to use, and reset the numbering in a numbered list.</ahelp></paragraph>
       </section>
diff --git a/source/text/swriter/01/05200000.xhp b/source/text/swriter/01/05200000.xhp
index 94c11c825..e3e449044 100644
--- a/source/text/swriter/01/05200000.xhp
+++ b/source/text/swriter/01/05200000.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="textswriter0105200000xml" indexer="include" status="PUBLISH">
@@ -36,6 +36,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:MergeTable" id="bm_id6690819" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mergetabledialog/MergeTableDialog" id="bm_id3149048" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mergetabledialog/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="1"><link href="text/swriter/01/05200000.xhp" name="Merge Table">Merge Table</link></paragraph>
 <paragraph role="paragraph" id="par_id3147401" xml-lang="en-US"><ahelp hid=".">Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph.</ahelp></paragraph>
 </section>
diff --git a/source/text/swriter/01/06060000.xhp b/source/text/swriter/01/06060000.xhp
index 0bb5f97af..1871f47e9 100644
--- a/source/text/swriter/01/06060000.xhp
+++ b/source/text/swriter/01/06060000.xhp
@@ -28,6 +28,8 @@
 <body>
 
 <bookmark xml-lang="en-US" branch="hid/.uno:ChapterNumberingDialog" id="bm_id6638326" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumbering/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numberingnamedialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumbering/OutlineNumberingDialog" id="bm_id6154506" localize="false"/>
 
 <paragraph id="hd_id3154561" role="heading" level="1" xml-lang="en-US">Chapter Numbering</paragraph>
diff --git a/source/text/swriter/01/mailmerge01.xhp b/source/text/swriter/01/mailmerge01.xhp
index 5057a8fda..fe9a4c8b3 100644
--- a/source/text/swriter/01/mailmerge01.xhp
+++ b/source/text/swriter/01/mailmerge01.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="textswriter01mailmerge01xml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <section id="startingdocument">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/MMSelectPage" id="bm_id9740592.00000000" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Select starting document</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specify the document that you want to use as a base for the mail merge document.</ahelp></paragraph>
diff --git a/source/text/swriter/01/mailmerge02.xhp b/source/text/swriter/01/mailmerge02.xhp
index 26208d9c9..440f211c2 100644
--- a/source/text/swriter/01/mailmerge02.xhp
+++ b/source/text/swriter/01/mailmerge02.xhp
@@ -31,6 +31,7 @@
 <body>
 <section id="documenttype">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/MMOutputTypePage" id="bm_id2589191" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard - Select document type</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specify the type of mail merge document to create.</ahelp></paragraph>
 </section>
diff --git a/source/text/swriter/01/mailmerge03.xhp b/source/text/swriter/01/mailmerge03.xhp
index 85a45cbf9..ec1edbacd 100644
--- a/source/text/swriter/01/mailmerge03.xhp
+++ b/source/text/swriter/01/mailmerge03.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="textswriter01mailmerge03xml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <section id="addresses">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage" id="bm_id8489027" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/swriter/01/mailmerge03.xhp">Mail Merge Wizard - Addresses</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specify the recipients for the mail merge document as well as the layout of the address block.</ahelp></paragraph>
diff --git a/source/text/swriter/01/mailmerge04.xhp b/source/text/swriter/01/mailmerge04.xhp
index da2124c30..387ad7204 100644
--- a/source/text/swriter/01/mailmerge04.xhp
+++ b/source/text/swriter/01/mailmerge04.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="textswriter01mailmerge04xml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <section id="greetingline">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/MMSalutationPage" id="bm_id8489029" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/swriter/01/mailmerge04.xhp">Mail Merge Wizard - Create salutation</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specify the properties for the salutation.</ahelp> If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient.</paragraph>
diff --git a/source/text/swriter/01/mailmerge05.xhp b/source/text/swriter/01/mailmerge05.xhp
index 44a9229c9..2dabe402f 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.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="textswriter01mailmerge05xml" indexer="include" status="PUBLISH">
@@ -32,6 +32,7 @@
 <body>
 <section id="layout">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/MMLayoutPage" id="bm_id8489030" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard - Adjust layout</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specify the position of the address blocks and salutations on the documents.</ahelp></paragraph>
 </section>
diff --git a/source/text/swriter/01/mm_emabod.xhp b/source/text/swriter/01/mm_emabod.xhp
index 02c7dd517..d4cbc638e 100644
--- a/source/text/swriter/01/mm_emabod.xhp
+++ b/source/text/swriter/01/mm_emabod.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_emabodxml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/MailBodyDialog" id="bm_id495011" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1">E-Mail Message</paragraph>
 <paragraph role="paragraph" id="par_idN10540" xml-lang="en-US"><ahelp hid=".">Type the message and the salutation for files that you send as <link href="text/swriter/01/mailmerge08.xhp">e-mail</link> attachments.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/greeting" id="bm_id1831110" localize="false"/>
diff --git a/source/text/swriter/01/mm_emailmergeddoc.xhp b/source/text/swriter/01/mm_emailmergeddoc.xhp
index 387ee4602..1639784e1 100644
--- a/source/text/swriter/01/mm_emailmergeddoc.xhp
+++ b/source/text/swriter/01/mm_emailmergeddoc.xhp
@@ -30,6 +30,7 @@
 
 <section id="send_merged_document_as_email">
 <bookmark xml-lang="en-US" branch="hid/.uno:MailMergeEmailDocuments" id="bm_id201703192214544668" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/MMResultEmailDialog" id="bm_id201703192214544668" localize="false"/>
 <paragraph id="hd_id201703192214041173" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/mm_emailmergeddoc.xhp">Send merged document as e-mail</link></paragraph>
 <paragraph id="par_id201703192214161498" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sends the mail merge output as e-mail messages to all or some recipients.</ahelp></paragraph>
diff --git a/source/text/swriter/01/mm_printmergeddoc.xhp b/source/text/swriter/01/mm_printmergeddoc.xhp
index 0e08d7d1a..6bf857598 100644
--- a/source/text/swriter/01/mm_printmergeddoc.xhp
+++ b/source/text/swriter/01/mm_printmergeddoc.xhp
@@ -30,6 +30,7 @@
 
 <section id="print_merged_document">
 <bookmark xml-lang="en-US" branch="hid/.uno:MailMergePrintDocuments" id="bm_id201703192012291723" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultprintdialog/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultprintdialog/MMResultPrintDialog" id="bm_id201703192012291724" localize="false"/>
 <paragraph id="hd_id201703192010597215" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/mm_printmergeddoc.xhp">Print merged document</link></paragraph>
 <paragraph id="par_id201703192012043766" role="paragraph" xml-lang="en-US"><ahelp hid=".">Prints the mail merge output for all or some recipients.</ahelp></paragraph>
diff --git a/source/text/swriter/01/mm_savemergeddoc.xhp b/source/text/swriter/01/mm_savemergeddoc.xhp
index c3b841357..92c9e83c3 100644
--- a/source/text/swriter/01/mm_savemergeddoc.xhp
+++ b/source/text/swriter/01/mm_savemergeddoc.xhp
@@ -30,6 +30,7 @@
 
 <section id="save_merged_document">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultsavedialog/MMResultSaveDialog" id="bm_id201703191638233298" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultsavedialog/@@nowidget@@" id="@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MailMergeSaveDocuments" id="bm_id201703191638233299" localize="false"/>
 <paragraph id="hd_id201703191634335977" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/mm_savemergeddoc.xhp">Save merged document</link></paragraph>
 <paragraph id="par_id201703191635403846" role="paragraph" xml-lang="en-US"><ahelp hid=".">Save the mail merge output to file.</ahelp></paragraph>
commit 8fd523672739359ff08eddd330de5a62841a1532
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Jul 26 15:20:06 2018 -0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 14 13:52:05 2018 +0200

    tdf#115254 Some branch bookmarks are not working 9
    
    module sw,  p- to r-
    
    Change-Id: I7772ab8ac360f00df6e914ea509118eacca7270d
    Reviewed-on: https://gerrit.libreoffice.org/58139
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    (cherry picked from commit e055db0a26c7fab3d624fef7e726e61cb1e8f032)
    Reviewed-on: https://gerrit.libreoffice.org/58145
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/source/text/shared/01/01010303.xhp b/source/text/shared/01/01010303.xhp
index ee7d5c562..7d15d2c24 100644
--- a/source/text/shared/01/01010303.xhp
+++ b/source/text/shared/01/01010303.xhp
@@ -30,6 +30,7 @@
 </meta>
 <body>
 <section id="privat">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/privateuserpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/privateuserpage/PrivateUserPage" id="bm_id3145313" localize="false"/>
 <paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="1"><link href="text/shared/01/01010303.xhp" name="Private">Private</link></paragraph>
 <paragraph role="paragraph" id="par_id3148731" xml-lang="en-US"><ahelp hid=".">Contains personal contact information for business cards. Business card layouts are selected on the <emph>Business Cards</emph> tab.</ahelp></paragraph><comment>removed switched note about autotext not supplied with OOo</comment></section>
diff --git a/source/text/shared/optionen/01040400.xhp b/source/text/shared/optionen/01040400.xhp
index 0dae62dbf..5eff473ac 100644
--- a/source/text/shared/optionen/01040400.xhp
+++ b/source/text/shared/optionen/01040400.xhp
@@ -47,6 +47,7 @@
 <bookmark_value>printing; creating individual jobs</bookmark_value>
 <bookmark_value>faxes;selecting a fax machine</bookmark_value>
 </bookmark><comment>mw made "fax machine selection" a two level entry</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/PrintOptionsPage" id="bm_id3153750" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
 <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph"><ahelp hid="modules/swriter/ui/printoptionspage/PrintOptionsPage">Specifies print settings within a text or HTML document.</ahelp></paragraph>
diff --git a/source/text/swriter/01/02120100.xhp b/source/text/swriter/01/02120100.xhp
index 2cd55141f..26ffb84cf 100644
--- a/source/text/swriter/01/02120100.xhp
+++ b/source/text/swriter/01/02120100.xhp
@@ -31,6 +31,7 @@
 </meta>
 <body>
   <bookmark branch="hid/modules/swriter/ui/renameautotextdialog/RenameAutoTextDialog" xml-lang="en-US" id="bm_id3155920" localize="false"/>
+  <bookmark branch="hid/modules/swriter/ui/renameautotextdialog/@@nowidget@@" xml-lang="en-US" id="bm_@@nowidget@@" localize="false"/>
   <paragraph role="heading" level="1" id="hd_id3155144" xml-lang="en-US">Rename AutoText</paragraph>
   <paragraph role="paragraph" id="par_id3149171" xml-lang="en-US">Allows you to change the name of an AutoText entry.</paragraph>
   <section id="howtoget">
diff --git a/source/text/swriter/01/04090006.xhp b/source/text/swriter/01/04090006.xhp
index 06629ea98..47a29f5e8 100644
--- a/source/text/swriter/01/04090006.xhp
+++ b/source/text/swriter/01/04090006.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="textswriter0104090006xml" indexer="include">
 <title id="tit" xml-lang="en-US">Database</title>
@@ -28,6 +28,7 @@
 </meta>
 <body>
 <section id="datenbank">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/FldDbPage" id="bm_id3151315" localize="false"/>
 <paragraph role="heading" id="hd_id3153536" xml-lang="en-US" level="1"><link href="text/swriter/01/04090006.xhp" name="Database">Database</link></paragraph>
 <paragraph role="paragraph" id="par_id3154471" xml-lang="en-US"><ahelp hid=".">You can insert fields from any database, for example, address fields, into your document.</ahelp></paragraph>
diff --git a/source/text/swriter/01/05060300.xhp b/source/text/swriter/01/05060300.xhp
index 42c1d81d3..43e20edee 100644
--- a/source/text/swriter/01/05060300.xhp
+++ b/source/text/swriter/01/05060300.xhp
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <section id="grafik">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/picturepage/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/picturepage/PicturePage" id="bm_id3152952" localize="false"/>
 <paragraph role="heading" id="hd_id3154473" xml-lang="en-US" level="1"><link href="text/swriter/01/05060300.xhp" name="Graphics">Image</link></paragraph>
 <paragraph role="paragraph" id="par_id3152961" xml-lang="en-US"><ahelp hid="modules/swriter/ui/picturepage/PicturePage">Specify the flip and the link options for the selected image.</ahelp></paragraph>
diff --git a/source/text/swriter/01/05110100.xhp b/source/text/swriter/01/05110100.xhp
index c2922d9b0..95e181034 100644
--- a/source/text/swriter/01/05110100.xhp
+++ b/source/text/swriter/01/05110100.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="textswriter0105110100xml" indexer="include" status="PUBLISH">
@@ -31,6 +31,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:SetRowHeight" id="bm_id3310623" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/rowheight/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/rowheight/RowHeightDialog" id="bm_id3154653" localize="false"/>
 <paragraph role="heading" id="hd_id3149871" xml-lang="en-US" level="1">Row Height</paragraph>
 <paragraph role="paragraph" id="par_id3149053" xml-lang="en-US"><variable id="hoehetext"><ahelp hid=".uno:SetRowHeight">Changes the height of the selected row(s).</ahelp>
diff --git a/source/text/swriter/01/05150300.xhp b/source/text/swriter/01/05150300.xhp
index de07faa57..e637f85a5 100644
--- a/source/text/swriter/01/05150300.xhp
+++ b/source/text/swriter/01/05150300.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="textswriter0105150300xml" indexer="include">
 <title id="tit" xml-lang="en-US">Apply and Edit Changes</title>
@@ -27,6 +27,7 @@
 </topic>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/queryredlinedialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <section id="ananbe">
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatRedlineApply" id="bm_id766634" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormatRedlineApply" id="bm_id3145829" localize="false"/>
diff --git a/source/text/swriter/02/10070000.xhp b/source/text/swriter/02/10070000.xhp
index 7f46ef716..c11eecc8b 100644
--- a/source/text/swriter/02/10070000.xhp
+++ b/source/text/swriter/02/10070000.xhp
@@ -31,6 +31,7 @@
 <body>
 <section id="massstab">
 <bookmark xml-lang="en-US" branch="hid/.uno:PreviewZoom" id="bm_id2536826" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/previewzoomdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/previewzoomdialog/PreviewZoomDialog" id="bm_id3145243" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ShowMultiplePages" id="bm_id2980921" localize="false"/>
 <paragraph role="paragraph" id="par_id3148771" xml-lang="en-US"><ahelp hid=".uno:PreviewZoom">Defines the number of pages displayed on screen. Click the arrow next to the icon to open a grid to select the number of pages to be displayed as rows and columns in the preview.</ahelp></paragraph>


More information about the Libreoffice-commits mailing list