tdf#112411 (related) No more More Controls toolbar

Show its content as part of the Form Controls toolbar page

Change-Id: I473d095b64a46cf3a7d45a73045215174223931f
Reviewed-on: https://gerrit.libreoffice.org/73712
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

3 files changed, 3 insertions, 78 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 4f51523b56..e1d6e12881 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -499,7 +499,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/02/flowcharts \
     helpcontent2/source/text/shared/02/fontwork \
     helpcontent2/source/text/shared/02/limit \
-    helpcontent2/source/text/shared/02/more_controls \
     helpcontent2/source/text/shared/02/paintbrush \
     helpcontent2/source/text/shared/02/querypropdlg \
     helpcontent2/source/text/shared/02/stars \
diff --git a/source/text/shared/02/01170000.xhp b/source/text/shared/02/01170000.xhp
index da6f4778ab..fca657909e 100644
--- a/source/text/shared/02/01170000.xhp
+++ b/source/text/shared/02/01170000.xhp
@@ -46,7 +46,6 @@
 <bookmark_value>controls; select mode</bookmark_value>
 </bookmark><comment>MW deleted "option field creation", changed "option button" to "push button" and "selections;" to "selecting;"</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id4029443" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id3153252" localize="false"/>
 <paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="1"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></paragraph>
 <paragraph role="paragraph" id="par_id3151378" xml-lang="en-US"><variable id="formulartext"><ahelp hid=".uno:Config">The <emph>Form Controls</emph> toolbar contains tools that you need to create an interactive form.</ahelp>
 </variable> You can use the toolbar to add controls to a form in a text, spreadsheet, presentation, or HTML document, for example a button that runs a macro.</paragraph>
@@ -235,10 +234,6 @@
   </tablerow>
 </table>
 </section>
-<bookmark xml-lang="en-US" branch="hid/.uno:MoreControls" id="bm_id1433643" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MoreControls" id="bm_id4851832" localize="false"/>
-<paragraph role="heading" id="par_idN10CC6" xml-lang="en-US" level="2">More Controls<comment>Controls bar</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10CDC" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/02/more_controls.xhp"><emph>More Controls</emph></link> toolbar.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:FormDesignTools" id="bm_id6078501" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FormDesignTools" id="bm_id3258766" localize="false"/>
 <paragraph role="heading" id="par_idN10CF7" xml-lang="en-US" level="2">Form Design<comment>Controls bar</comment></paragraph>
@@ -257,10 +252,7 @@
   </tablerow>
 </table>
 </section>
-<paragraph role="heading" id="hd_id3149436" xml-lang="en-US" level="2"><link href="text/shared/02/01170001.xhp" name="Context Menu Commands">Context Menu Commands</link></paragraph><comment>end of visible part of FORM CONTROLS file</comment>
-<switch select="sys">
-<case select="HIDE_HERE"><comment>now the MORE CONTROLS</comment>
-<section id="more_controls">
+<paragraph role="heading" id="hd_id3149436" xml-lang="en-US" level="2"><link href="text/shared/02/01170001.xhp" name="Context Menu Commands">Context Menu Commands</link></paragraph>
 <section id="Section22">
 <bookmark xml-lang="en-US" branch="hid/.uno:Spinbutton" id="bm_id8342120" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SpinButton" id="bm_id5568102" localize="false"/>
@@ -547,17 +539,13 @@
       <paragraph role="paragraph" id="par_idN11B2C" xml-lang="en-US"><image id="img_id5074922" src="cmd/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">Icon</alt></image></paragraph>
     </tablecell>
     <tablecell>
-       <paragraph role="paragraph" id="par_idN11B3D" xml-lang="en-US"><ahelp hid="SID_FM_NAVIGATIONBAR">Creates a <emph>Navigation</emph> bar.</ahelp></paragraph>
+       <paragraph role="paragraph" id="par_idN11B3D" xml-lang="en-US"><ahelp hid=".">Creates a <emph>Navigation</emph> bar.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
 <paragraph role="paragraph" id="par_idN11DB1" xml-lang="en-US">The <emph>Navigation</emph> bar allows you to move through the records of a database or a database form. The controls on this <emph>Navigation</emph> bar work the same way as the controls on the default <link href="text/shared/main0213.xhp"><emph>Navigation</emph> bar</link> in $[officename].</paragraph>
 </section>
-</section><comment>end of MORE CONTROLS bar</comment>
-</case>
-</switch>
-<switch select="sys">
-<case select="HIDE_HERE"><comment>now the Form Design bar</comment>
+<comment>now the Form Design bar</comment>
 <section id="Section1">
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoControlFocus" id="bm_id8170669" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoControlFocus" id="bm_id3149198" localize="false"/>
@@ -573,7 +561,5 @@
   </tablerow>
 </table>
 </section><comment>end of FORM DESIGN bar</comment>
-</case>
-</switch>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/more_controls.xhp b/source/text/shared/02/more_controls.xhp
deleted file mode 100644
index 21e6569b92..0000000000
--- a/source/text/shared/02/more_controls.xhp
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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="textshared02more_controlsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">More Controls</title>
-<filename>/text/shared/02/more_controls.xhp</filename>
-</topic>
-<history>
-<created date="2006-05-19T14:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="more_controls">
-<bookmark xml-lang="en-US" branch="index" id="bm_id5941343"><bookmark_value>more controls</bookmark_value>
-<bookmark_value>group box creation</bookmark_value>
-<bookmark_value>image button creation</bookmark_value>
-<bookmark_value>image control creation</bookmark_value>
-<bookmark_value>file selection button</bookmark_value>
-<bookmark_value>date fields; creating</bookmark_value>
-<bookmark_value>time fields; form functions</bookmark_value>
-<bookmark_value>numerical fields in forms</bookmark_value>
-<bookmark_value>formatted fields; form functions</bookmark_value>
-<bookmark_value>currency field creation</bookmark_value>
-<bookmark_value>pattern fields; form functions</bookmark_value>
-<bookmark_value>table controls; form functions</bookmark_value>
-<bookmark_value>grid controls; form functions</bookmark_value>
-<bookmark_value>controls; focus</bookmark_value>
-<bookmark_value>focus of controls</bookmark_value>
-<bookmark_value>forms; focus after opening</bookmark_value>
-<bookmark_value>automatic control focus</bookmark_value>
-<bookmark_value>spin button creation</bookmark_value>
-<bookmark_value>scrollbars;controls</bookmark_value>
-<bookmark_value>Navigation bar;controls</bookmark_value>
-</bookmark><comment>MW deleted "option field creation"</comment>
-<paragraph role="heading" id="hd_id8389233" xml-lang="en-US" level="1"><link href="text/shared/02/more_controls.xhp">More Controls</link></paragraph>
-<paragraph role="paragraph" id="par_id1146275" xml-lang="en-US"><ahelp hid=".">The More Controls toolbar opens when you click the More Controls icon on the <link href="text/shared/02/01170000.xhp">Form Controls</link> toolbar.</ahelp></paragraph>
-</section>
-<embed href="text/shared/02/01170000.xhp#more_controls"/>
-</body>
-</helpdocument>