BASIC Toc cleanup

Relocated topics are
- Generating random numbers
- (deletion) Comparison operators
- Numeric functions
- Trigonometric functions
- Further statements

Change-Id: I2ed75e20f790273460be56fab62ad6cc6e357397
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/113366
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

4 files changed, 10 insertions, 53 deletions

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 0b2633a92e..c1bae31bb9 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -301,7 +301,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
     helpcontent2/source/text/sbasic/shared/03104500 \
     helpcontent2/source/text/sbasic/shared/03104600 \
     helpcontent2/source/text/sbasic/shared/03104700 \
-    helpcontent2/source/text/sbasic/shared/03110000 \
     helpcontent2/source/text/sbasic/shared/03110100 \
     helpcontent2/source/text/sbasic/shared/03120000 \
     helpcontent2/source/text/sbasic/shared/03120100 \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index fdd05f76fb..0f1d4cbd49 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -38,7 +38,7 @@
                 <topic id="sbasic/text/sbasic/shared/01020300.xhp">Using Procedures and Functions</topic>
                 <topic id="sbasic/text/sbasic/shared/01020500.xhp">Libraries, Modules and Dialogs</topic>
                 <topic id="sbasic/text/sbasic/shared/conventions.xhp">How to Read Syntax Diagrams</topic>
-                <node id="07010202" title="Functions, Statements, and Operators">
+                <node id="07010202" title="Functions, Statements and Operators">
                     <topic id="sbasic/text/sbasic/shared/03010000.xhp">Screen I/O Functions</topic>
                     <topic id="sbasic/text/sbasic/shared/03020000.xhp">File I/O Functions</topic>
                     <topic id="sbasic/text/sbasic/shared/03030000.xhp">Date and Time Functions</topic>
@@ -46,19 +46,22 @@
                     <topic id="sbasic/text/sbasic/shared/03060000.xhp">Logical Operators</topic>
                     <topic id="sbasic/text/sbasic/shared/03070000.xhp">Mathematical Operators</topic>
                     <topic id="sbasic/text/sbasic/shared/03080000.xhp">Numeric Functions</topic>
+                    <topic id="sbasic/text/sbasic/shared/03080100.xhp">Trigonometric Functions</topic>
+                    <topic id="sbasic/text/sbasic/shared/03080300.xhp">Generating Random Numbers</topic>
                     <topic id="sbasic/text/sbasic/shared/03090000.xhp">Controlling Program Execution</topic>
+                    <topic id="sbasic/text/sbasic/shared/03090400.xhp">Further Statements</topic>
                     <topic id="sbasic/text/sbasic/shared/03100000.xhp">Variables</topic>
                     <topic id="sbasic/text/sbasic/shared/03040000.xhp">Basic Constants</topic>
-                    <topic id="sbasic/text/sbasic/shared/03110000.xhp">Comparison Operators</topic>
+                    <topic id="sbasic/text/sbasic/shared/03110100.xhp">Comparison Operators</topic>
                     <topic id="sbasic/text/sbasic/shared/03120000.xhp">Strings</topic>
                     <topic id="sbasic/text/sbasic/shared/uno_objects.xhp">UNO Objects, Functions and Services</topic>
                     <topic id="sbasic/text/sbasic/shared/calc_functions.xhp">Calling Calc functions</topic>
                     <topic id="sbasic/text/sbasic/shared/special_vba_func.xhp">Exclusive VBA functions</topic>
                     <topic id="sbasic/text/sbasic/shared/03130000.xhp">Other Commands</topic>
                 </node>
-                <node id="07010201" title="Alphabetic List of Functions, Statements, and Operators">
+                <node id="07010201" title="Alphabetic List of Functions, Statements and Operators">
                     <topic id="sbasic/text/sbasic/shared/03080601.xhp">Abs Function</topic>
-                    <topic id="sbasic/text/sbasic/shared/03060100.xhp">AND Operator</topic>
+                    <topic id="sbasic/text/sbasic/shared/03060100.xhp">And Operator</topic>
                     <topic id="sbasic/text/sbasic/shared/03104200.xhp">Array Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03120101.xhp">Asc Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03120111.xhp">AscW Function [VBA]</topic>
@@ -93,7 +96,6 @@
                     <topic id="sbasic/text/sbasic/shared/03120102.xhp">Chr Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03120112.xhp">ChrW Function [VBA]</topic>
                     <topic id="sbasic/text/sbasic/shared/03020101.xhp">Close Statement</topic>
-                    <topic id="sbasic/text/sbasic/shared/03110100.xhp">Comparison Operators</topic>
                     <topic id="sbasic/text/sbasic/shared/03100700.xhp">Const Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03120313.xhp">ConvertFromURL Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03120312.xhp">ConvertToURL Function</topic>
@@ -164,9 +166,7 @@
                     <topic id="sbasic/text/sbasic/shared/03020102.xhp">FreeFile Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03090405.xhp">FreeLibrary Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03090406.xhp">Function Statement</topic>
-                    <topic id="sbasic/text/sbasic/shared/03090400.xhp">Further Statements</topic>
                     <topic id="sbasic/text/sbasic/shared/03140001.xhp">FV Function [VBA]</topic>
-                    <topic id="sbasic/text/sbasic/shared/03080300.xhp">Generating Random Numbers</topic>
                     <topic id="sbasic/text/sbasic/shared/03020409.xhp">GetAttr Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03132500.xhp">GetDefaultContext Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03132100.xhp">GetGUIType Function</topic>
@@ -241,7 +241,7 @@
                     <topic id="sbasic/text/sbasic/shared/03103300.xhp">Option Explicit Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03103350.xhp">Option VBASupport Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03104100.xhp">Optional (in Function Statement)</topic>
-                    <topic id="sbasic/text/sbasic/shared/03060500.xhp">Or-Operator</topic>
+                    <topic id="sbasic/text/sbasic/shared/03060500.xhp">Or Operator</topic>
                     <topic id="sbasic/text/sbasic/shared/partition.xhp">Partition Function [VBA]</topic>
                     <topic id="sbasic/text/sbasic/shared/03140007.xhp">Pmt Function [VBA]</topic>
                     <topic id="sbasic/text/sbasic/shared/03140008.xhp">PPmt Function [VBA]</topic>
@@ -297,7 +297,6 @@
                     <topic id="sbasic/text/sbasic/shared/03030206.xhp">TimeValue Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03030302.xhp">Time Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03030303.xhp">Timer Function</topic>
-                    <topic id="sbasic/text/sbasic/shared/03080100.xhp">Trigonometric Functions</topic>
                     <topic id="sbasic/text/sbasic/shared/03120311.xhp">Trim Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03131300.xhp">TwipsPerPixelX Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03131400.xhp">TwipsPerPixelY Function</topic>
@@ -313,7 +312,7 @@
                     <topic id="sbasic/text/sbasic/shared/03090203.xhp">While...Wend Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03090411.xhp">With Statement</topic>
                     <topic id="sbasic/text/sbasic/shared/03020205.xhp">Write Statement</topic>
-                    <topic id="sbasic/text/sbasic/shared/03060600.xhp">Xor-Operator</topic>
+                    <topic id="sbasic/text/sbasic/shared/03060600.xhp">Xor Operator</topic>
                     <topic id="sbasic/text/sbasic/shared/03030106.xhp">Year Function</topic>
                     <topic id="sbasic/text/sbasic/shared/03070100.xhp">"-" Operator</topic>
                     <topic id="sbasic/text/sbasic/shared/03070200.xhp">"*" Operator</topic>
diff --git a/source/text/sbasic/shared/03000000.xhp b/source/text/sbasic/shared/03000000.xhp
index 51d6f6ed60..c9eff8c04c 100644
--- a/source/text/sbasic/shared/03000000.xhp
+++ b/source/text/sbasic/shared/03000000.xhp
@@ -43,7 +43,7 @@
 <embed href="text/sbasic/shared/03080000.xhp#numeric"/>
 <embed href="text/sbasic/shared/03090000.xhp#prog_execution"/>
 <embed href="text/sbasic/shared/03100000.xhp#variables"/>
-<embed href="text/sbasic/shared/03110000.xhp#comparison"/>
+<embed href="text/sbasic/shared/03110000.xhp#operators"/>
 <embed href="text/sbasic/shared/03120000.xhp#strings"/>
 <embed href="text/sbasic/shared/03130000.xhp#other"/>
 </body>
diff --git a/source/text/sbasic/shared/03110000.xhp b/source/text/sbasic/shared/03110000.xhp
deleted file mode 100644
index a512ec6f6e..0000000000
--- a/source/text/sbasic/shared/03110000.xhp
+++ /dev/null
@@ -1,41 +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="textsbasicshared03110000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Comparison Operators</title>
-<filename>/text/sbasic/shared/03110000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-  
-  
-  <section id="comparison">
-  <paragraph id="hd_id3155555" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03110000.xhp" name="Comparison Operators">Comparison Operators</link></paragraph>
-  <paragraph role="paragraph" id="par_id3153528" xml-lang="en-US">The available comparison operators are described here.</paragraph>
-  </section>
-  <embed href="text/sbasic/shared/03110100.xhp#operators"/>
- </body>
-</helpdocument>