AllLangHelp_shared.mk                  |    1 
 source/text/scalc/00/00000406.xhp      |    2 +
 source/text/scalc/main0106.xhp         |    4 +++
 source/text/shared/02/01170400.xhp     |   23 +++++++++++---------
 source/text/shared/guide/dev_tools.xhp |    7 ++++--
 source/text/shared/menu/forms.xhp      |   37 +++++++++++++++++++++++++++++++++
 source/text/swriter/main0120.xhp       |   18 ++++++++++------
 7 files changed, 74 insertions(+), 18 deletions(-)

New commits:
commit 1e721d1ea84ec45e71ad7d218d9158542fa1b7f2
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue Mar 15 08:30:12 2022 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Mar 15 17:07:41 2022 +0100

    Update Calc Tools menu with Forms submenu
    
    Change-Id: I5524b4ba2674167a162133b9ff99677f2f59cfc3
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131607
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 2f3c9b40a..344f2bc4d 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -777,6 +777,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/main0800 \
     helpcontent2/source/text/shared/submenu_text \
     helpcontent2/source/text/shared/submenu_spacing \
+    helpcontent2/source/text/shared/menu/forms \
     helpcontent2/source/text/shared/menu/insert_chart \
     helpcontent2/source/text/shared/menu/insert_form_control \
     helpcontent2/source/text/shared/menu/insert_shape \
diff --git a/source/text/scalc/00/00000406.xhp 
b/source/text/scalc/00/00000406.xhp
index 6fee82076..64239b361 100644
--- a/source/text/scalc/00/00000406.xhp
+++ b/source/text/scalc/00/00000406.xhp
@@ -51,6 +51,8 @@
 <paragraph id="par_id8554338" role="paragraph" xml-lang="en-US"><variable 
id="solver_options">Choose <emph>Tools - Solver</emph>, click 
<emph>Options</emph> button.</variable></paragraph>
 <paragraph id="par_id3156277" role="paragraph" xml-lang="en-US"><variable 
id="exsze">Choose <emph>Tools - Scenarios</emph>.</variable></paragraph>
 
+<paragraph role="paragraph" id="par_id971647297529392"><variable 
id="tools_forms">Choose <emph>Tools - Forms</emph>.</variable></paragraph>
+
 <paragraph role="paragraph" id="par_id371647273694433"><variable 
id="share_spreadsheet">Choose <menuitem>Tools - Share 
Spreadsheet</menuitem></variable></paragraph>
 
 <paragraph id="par_id3149020" role="paragraph" xml-lang="en-US"><variable 
id="protect_sheet">Choose <emph>Tools - Protect 
Sheet</emph>.</variable></paragraph>
diff --git a/source/text/scalc/main0106.xhp b/source/text/scalc/main0106.xhp
index c1b38cb18..908491258 100644
--- a/source/text/scalc/main0106.xhp
+++ b/source/text/scalc/main0106.xhp
@@ -54,11 +54,15 @@
 <h2 id="hd_id3155768"><link href="text/scalc/01/06050000.xhp" 
name="Scenarios">Scenarios</link></h2>
 <embed href="text/scalc/01/06050000.xhp#szenariotext"/>
 
+<embed href="text/shared/menu/forms.xhp#forms_submenu_Head"/>
+
 <embed href="text/scalc/01/shared_spreadsheet.xhp#shared_spreadsheet_head"/>
 
 <embed href="text/scalc/01/06060000.xhp#protect_document"/>
 
 <embed href="text/shared/01/06130001.xhp#macro"/>
+<embed href="text/shared/guide/dev_tools.xhp#devtoolsHead"/>
+
 <embed href="text/shared/01/packagemanager.xhp#packagemanager"/>
 
 <h2 id="hd_id3150086"><link href="text/shared/01/06140000.xhp" 
name="Customize">Customize</link></h2>
diff --git a/source/text/shared/02/01170400.xhp 
b/source/text/shared/02/01170400.xhp
index 70ba11085..6df2946e5 100644
--- a/source/text/shared/02/01170400.xhp
+++ b/source/text/shared/02/01170400.xhp
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,9 +16,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">
+<helpdocument version="1.0">
 <meta>
 <topic id="textshared0201170400xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Add Field</title>
@@ -30,13 +25,21 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:AddField" id="bm_id2298449" 
localize="false"/>
-<paragraph role="heading" id="hd_id3144436" xml-lang="en-US" level="1"><link 
href="text/shared/02/01170400.xhp" name="Add Field">Add Field</link></paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><variable 
id="text"><ahelp hid=".uno:AddField">Opens a window where you can select a 
database field to add to the form or report.</ahelp>
-</variable><comment>same help id used for forms and 
reports</comment></paragraph>
+<bookmark xml-lang="en-US" branch="index" id="bm_id871647297744020">
+<bookmark_value>database field;add to form</bookmark_value>
+<bookmark_value>forms;add database field</bookmark_value>
+<bookmark_value>database field;add to report</bookmark_value>
+<bookmark_value>report;add database field</bookmark_value>
+</bookmark>
+<section id="add_field_Head">
+    <h1 id="hd_id3144436"><link href="text/shared/02/01170400.xhp" name="Add 
Field">Add Field</link></h1>
+    <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><variable 
id="text"><ahelp hid=".uno:AddField">Opens a window where you can select a 
database field to add to the form or report.</ahelp></variable><comment>same 
help id used for forms and reports</comment></paragraph>
+</section>
 <section id="howtoget">
   <embed href="text/shared/00/00040501.xhp#add_field"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_FIELD_SEL" id="bm_id3155503" 
localize="false"/><paragraph role="paragraph" id="par_id3156114" 
xml-lang="en-US"><ahelp hid="HID_FIELD_SEL">The field selection window lists 
all database fields of the table or query that was specified as the data source 
in the <link href="text/shared/02/01170201.xhp" name="Form Properties">Form 
Properties</link>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FIELD_SEL" id="bm_id3155503" 
localize="false"/>
+<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US"><ahelp 
hid="HID_FIELD_SEL">The field selection window lists all database fields of the 
table or query that was specified as the data source in the <link 
href="text/shared/02/01170201.xhp" name="Form Properties">Form 
Properties</link>.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3147620" xml-lang="en-US">You can insert 
a field into the current document by dragging and dropping. A field is then 
inserted which contains a link to the database.</paragraph>
 <paragraph role="paragraph" id="par_id3153541" xml-lang="en-US">If you add 
fields to a form and you switch off the <link 
href="text/shared/02/01170500.xhp" name="Design Mode">Design Mode</link>, you 
can see that $[officename] adds a labeled input field for every inserted 
database field.<comment>may be different for reports</comment></paragraph>
 </body>
diff --git a/source/text/shared/guide/dev_tools.xhp 
b/source/text/shared/guide/dev_tools.xhp
index 1b905c3f0..5463a7312 100644
--- a/source/text/shared/guide/dev_tools.xhp
+++ b/source/text/shared/guide/dev_tools.xhp
@@ -31,8 +31,11 @@
   </bookmark>
   <bookmark branch="hid/.uno:DevelopmentToolsDockingWindow" id="bm_id5584892" 
localize="false"/>
   <bookmark branch="hid/.uno:InspectSelectedObject" id="bm_id2672962" 
localize="false"/>
-  <h1 id="hd_id951627860296699"><variable id="DevTools_h1"><link 
href="text/shared/guide/dev_tools.xhp" name="DevTools_help">Development 
Tools</link></variable></h1>
-  <paragraph role="paragraph" id="par_id3155069"><variable 
id="DevTools_intro"><ahelp hid=".uno:LoadToolBox">Inspects objects in 
%PRODUCTNAME documents and shows supported UNO services, as well as available 
methods, properties and implemented interfaces. This feature also allows to 
explore the document structure using the Document Object Model 
(DOM).</ahelp></variable></paragraph>
+<section id="devtoolsHead">
+    <h1 id="hd_id951627860296699"><variable id="DevTools_h1"><link 
href="text/shared/guide/dev_tools.xhp" name="DevTools_help">Development 
Tools</link></variable></h1>
+    <paragraph role="paragraph" id="par_id3155069"><variable 
id="DevTools_intro"><ahelp hid=".uno:LoadToolBox">Inspects objects in 
%PRODUCTNAME documents and shows supported UNO services, as well as available 
methods, properties and implemented interfaces.</ahelp></variable></paragraph>
+</section>
+    <paragraph role="paragraph" id="par_id791647281944610">This feature also 
allows to explore the document structure using the Document Object Model 
(DOM).</paragraph>
   <section id="howtoget">
     <paragraph role="paragraph" id="par_id961562795750725">Choose 
<menuitem>Tools - Development Tools</menuitem></paragraph>
     <table id="tab_id11637079282585">
diff --git a/source/text/shared/menu/forms.xhp 
b/source/text/shared/menu/forms.xhp
new file mode 100644
index 000000000..dfb906c58
--- /dev/null
+++ b/source/text/shared/menu/forms.xhp
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="formssubmenu" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Forms submenu</title>
+            <filename>/text/shared/menu/forms.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="forms_submenu_Head">
+        <bookmark id="bm_id381647289210347" xml-lang="en-US" branch="hid/zzzz" 
localize="false"/>
+        <h1 id="hd_id491647289210348"><variable id="h1"><link 
href="text/shared/menu/forms.xhp" name="Forms Submenu">Forms 
Submenu</link></variable></h1>
+        <embed href="text/swriter/main0120.xhp#form_intro"/>
+    </section>
+    <section id="howtoget">
+        <embed href="text/scalc/00/00000406.xhp#tools_forms"/>
+    </section>
+    <embed href="text/swriter/main0120.xhp#form_design_mode"/>
+    <embed href="text/swriter/main0120.xhp#form_control_wizard"/>
+    <embed href="text/shared/02/01170100.xhp#control"/>
+    <embed href="text/shared/02/01170200.xhp#form_properties"/>
+    <embed href="text/shared/02/01170600.xhp#form_navigator"/>
+    <embed href="text/shared/02/01170300.xhp#taborder"/>
+    <embed href="text/shared/02/01170400.xhp#add_field_Head"/>
+    <embed href="text/shared/02/01171000.xhp#open_in_design_mode"/>
+    <embed href="text/swriter/main0120.xhp#activation_order"/>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/main0120.xhp b/source/text/swriter/main0120.xhp
index d0571c0b0..61582ff91 100644
--- a/source/text/swriter/main0120.xhp
+++ b/source/text/swriter/main0120.xhp
@@ -19,12 +19,16 @@
     <section id="form">
         <bookmark id="bm_id601529755027114" xml-lang="en-US" 
branch="hid/.uno:FormMenu" localize="false"/>
         <h1 id="hd_id111529755027117"><link href="text/swriter/main0120.xhp" 
name="Form menu">Form</link></h1>
-        <paragraph id="par_id991529755027118" role="paragraph" 
xml-lang="en-US"><variable id="variable name"><ahelp hid="hid path or 
command">Contains commands for activate form design mode, open control wizards 
and insert form controls in your text document.</ahelp></variable></paragraph>
+        <paragraph id="par_id991529755027118" role="paragraph" 
xml-lang="en-US"><variable id="form_intro"><ahelp hid=".">Contains commands for 
activate form design mode, open control wizards and insert form controls in 
your document.</ahelp></variable></paragraph>
     </section>
-    <h2 id="hd_id551529758534136">Design Mode</h2>
-    <paragraph role="paragraph" id="par_id791529758540932" 
xml-lang="en-US">Enable or disable form design mode.</paragraph>
-    <h2 id="hd_id121529758546072">Control Wizards</h2>
+    <section id="form_design_mode">
+        <h2 id="hd_id551529758534136">Design Mode</h2>
+        <paragraph role="paragraph" id="par_id791529758540932" 
xml-lang="en-US">Enable or disable form design mode.</paragraph>
+    </section>
+    <section id="form_control_wizard">
+        <h2 id="hd_id121529758546072">Control Wizards</h2>
     <paragraph role="paragraph" id="par_id271529758552229" 
xml-lang="en-US">Enable or disable control wizards.</paragraph>
+    </section>
     <embed href="text/shared/02/01170000.xhp#labelfield"/>
     <embed href="text/shared/02/01170000.xhp#textbox"/>
     <embed href="text/shared/02/01170000.xhp#checkbox"/>
@@ -47,8 +51,10 @@
 <embed href="text/shared/02/01170600.xhp#form_navigator"/>
 <embed href="text/shared/02/01170300.xhp#taborder"/>
 <embed href="text/shared/02/01171000.xhp#open_in_design_mode"/>
-<h2 id="hd_id811529763403256">Automatic Control Focus</h2>
-<paragraph role="paragraph" id="par_id281529763411414" xml-lang="en-US">Enable 
or disable Automatic Control Focus</paragraph>
+<section id="activation_order">
+    <h2 id="hd_id811529763403256">Automatic Control Focus</h2>
+    <paragraph role="paragraph" id="par_id281529763411414" 
xml-lang="en-US">Enable or disable Automatic Control Focus</paragraph>
+</section>
 
 </body>
 </helpdocument>

Reply via email to