From 0703d0cacd74d084009d7f8436fa833c77b56c1f Mon Sep 17 00:00:00 2001
From: Olivier Hallot <olivier.hallot@libreoffice.org>
Date: Mon, 11 Jan 2021 10:27:00 -0300
Subject: Refactor and fix links in database Help

Change-Id: Id6a6eabd496ca6c49979e6766081d78274217c4e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109096
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
---
 AllLangHelp_sdatabase.mk                          |  3 +
 AllLangHelp_shared.mk                             |  3 -
 source/text/sdatabase/05000000.xhp                | 42 ++++++++++
 source/text/sdatabase/05000001.xhp                | 44 ++++++++++
 source/text/sdatabase/05000003.xhp                | 45 +++++++++++
 source/text/shared/01/05340400.xhp                | 97 +++++++++++------------
 source/text/shared/explorer/database/05000000.xhp | 47 -----------
 source/text/shared/explorer/database/05000001.xhp | 49 ------------
 source/text/shared/explorer/database/05000003.xhp | 48 -----------
 9 files changed, 180 insertions(+), 198 deletions(-)
 create mode 100644 source/text/sdatabase/05000000.xhp
 create mode 100644 source/text/sdatabase/05000001.xhp
 create mode 100644 source/text/sdatabase/05000003.xhp
 delete mode 100644 source/text/shared/explorer/database/05000000.xhp
 delete mode 100644 source/text/shared/explorer/database/05000001.xhp
 delete mode 100644 source/text/shared/explorer/database/05000003.xhp

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 05c6b48a9c..591591974b 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -23,6 +23,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
     helpcontent2/source/text/sdatabase/02010101 \
     helpcontent2/source/text/sdatabase/04000000 \
     helpcontent2/source/text/sdatabase/04030000 \
+    helpcontent2/source/text/sdatabase/05000000 \
+    helpcontent2/source/text/sdatabase/05000001 \
+    helpcontent2/source/text/sdatabase/05000003 \
     helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 7f9a707524..5cf886e060 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,9 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-    helpcontent2/source/text/shared/explorer/database/05000000 \
-    helpcontent2/source/text/shared/explorer/database/05000001 \
-    helpcontent2/source/text/shared/explorer/database/05000003 \
     helpcontent2/source/text/shared/explorer/database/05010000 \
     helpcontent2/source/text/shared/explorer/database/05010100 \
     helpcontent2/source/text/shared/explorer/database/05020000 \
diff --git a/source/text/sdatabase/05000000.xhp b/source/text/sdatabase/05000000.xhp
new file mode 100644
index 0000000000..694dd0d92a
--- /dev/null
+++ b/source/text/sdatabase/05000000.xhp
@@ -0,0 +1,42 @@
+<?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="textsharedexplorerdatabase05000000xml" indexer="exclude" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Tables</title>
+<filename>/text/sdatabase/05000000.xhp</filename>
+</topic>
+<history>
+<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+</history>
+</meta>
+<body>
+<section id="tables">
+<h1 id="hd_id3148520"><link href="text/sdatabase/05000000.xhp" name="Tables">Tables</link></h1>
+<paragraph role="paragraph" id="par_id3147102" xml-lang="en-US">Table data edit mode allows you to see your data as rows of records, with optional filtering and sorting of that data. In this mode, you can also enter new records, make changes to, and delete existing records.</paragraph>
+</section>
+<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US">In the $[officename] Help, you will find further information on the following subjects:</paragraph>
+<h2 id="hd_id3152425"><link href="text/shared/explorer/database/05010000.xhp" name="Create new or edit table design">Create new or edit table design</link></h2>
+<embed href="text/shared/01/05340400.xhp#umgang"/>
+<embed href="text/shared/02/12100200.xhp#findrecord"/>
+<h2 id="hd_id3149095"><link href="text/shared/main0212.xhp" name="Sort and Filter Data">Sort and Filter Data</link></h2>
+<h2 id="hd_id3154288"><link href="text/shared/explorer/database/05020000.xhp" name="Relations, Primary and External Key">Relations, Primary and External Key</link></h2>
+<embed href="text/sdatabase/05000001.xhp#context"/>
+</body>
+</helpdocument>
diff --git a/source/text/sdatabase/05000001.xhp b/source/text/sdatabase/05000001.xhp
new file mode 100644
index 0000000000..6855b58153
--- /dev/null
+++ b/source/text/sdatabase/05000001.xhp
@@ -0,0 +1,44 @@
+<?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="textsharedexplorerdatabase05000001xml" indexer="exclude" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Table Context Menus</title>
+<filename>/text/sdatabase/05000001.xhp</filename>
+</topic>
+<history>
+<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+</history>
+</meta>
+<body>
+<section id="context">
+<h1 id="hd_id3148983"><link href="text/sdatabase/05000001.xhp" name="Table Context Menus">Table Context Menus</link></h1>
+<paragraph role="paragraph" id="par_id3163829" xml-lang="en-US">The context menu of the table container offers various functions that apply to all database tables. To edit a particular table within the database, select the corresponding table and open its context menu.</paragraph>
+</section>
+<section id="howtoget">
+  <embed href="text/shared/00/00000450.xhp#Tabellen"/>
+</section>
+<note id="par_id3146958">Depending on the context, it is possible that not all the functions for your current database will be listed in the context menus. For example, the <emph>Relationships</emph> command for defining relationships between various tables is only available with relational databases.</note>
+<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US">Depending on the database system used, you will find the following entries on the context menus:</paragraph>
+<embed href="text/shared/00/00000010.xhp#open"/>
+<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US">If a <link href="text/shared/01/05340400.xhp" name="table is open">table is open</link>, there are several functions available to edit the data.</paragraph>
+<embed href="text/shared/explorer/database/05020000.xhp#relations"/>
+<embed href="text/shared/00/00000010.xhp#verknuepfungerstellen"/>
+</body>
+</helpdocument>
diff --git a/source/text/sdatabase/05000003.xhp b/source/text/sdatabase/05000003.xhp
new file mode 100644
index 0000000000..8d41b96c09
--- /dev/null
+++ b/source/text/sdatabase/05000003.xhp
@@ -0,0 +1,45 @@
+<?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="textsharedexplorerdatabase05000003xml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Enter / change password</title>
+<filename>/text/sdatabase/05000003.xhp</filename>
+</topic>
+<history>
+<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+</history>
+</meta>
+<body>
+<h1 id="hd_id3163829">Enter / change password</h1>
+<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US">Allows you to enter and confirm a new or changed password. If you have defined a new user, enter the user name in this dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/password/usered" id="bm_id3149283" localize="false"/>
+<h2 id="hd_id3157898">User</h2>
+<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US"><ahelp hid="sfx/ui/password/usered">Specifies the name of the new user.</ahelp> This field is only visible if you have defined a new user.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/password/oldpassword" id="bm_id3145346" localize="false"/>
+<h2 id="hd_id3153681">Old password</h2>
+<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US"><ahelp hid="dbaccess/ui/password/oldpassword">Enter the old password here.</ahelp> This field is visible when you have opened the dialog via <emph>Change password</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/password/newpassword" id="bm_id3166411" localize="false"/>
+<h2 id="hd_id3153311">Password</h2>
+<paragraph role="paragraph" id="par_id3147243" xml-lang="en-US"><ahelp hid="dbaccess/ui/password/newpassword">Enter the new password.</ahelp></paragraph><comment>UFI: removed help id</comment>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/password/confirmpassword" id="bm_id3163802" localize="false"/>
+<h2 id="hd_id3147275">Confirm (password)</h2>
+<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US"><ahelp hid="dbaccess/ui/password/confirmpassword">Enter the new password again.</ahelp></paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/shared/01/05340400.xhp b/source/text/shared/01/05340400.xhp
index 68e722231f..3bb1dee26f 100644
--- a/source/text/shared/01/05340400.xhp
+++ b/source/text/shared/01/05340400.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="textshared0105340400xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Data Sources</title>
@@ -35,174 +30,174 @@
 <bookmark_value>databases; editing tables</bookmark_value>
 <bookmark_value>editing; database tables and queries</bookmark_value>
 <bookmark_value>queries; editing in data source view</bookmark_value>
-</bookmark><comment>mw deleted "database tables," and changed "tables in databases;"</comment><paragraph role="paragraph" id="par_id3153116" xml-lang="en-US" localize="false"/>
-<paragraph role="heading" id="hd_id3153323" xml-lang="en-US" level="1"><link href="text/shared/01/05340400.xhp" name="Data Sources">Data Sources</link></paragraph>
+</bookmark><comment>mw deleted "database tables," and changed "tables in databases;"</comment>
+<h1 id="hd_id3153323"><link href="text/shared/01/05340400.xhp" name="Data Sources">Data Sources</link></h1>
 <paragraph role="paragraph" id="par_id3149511" xml-lang="en-US">This section contains information on browsing and editing database tables.</paragraph>
 </section>
 <embed href="text/shared/guide/database_main.xhp#database_main"/>
-<paragraph role="note" id="par_id3149150" xml-lang="en-US">You cannot use the data source browser on a database table that is open in Design view.</paragraph>
-<paragraph role="heading" id="hd_id3149235" xml-lang="en-US" level="2">Data source browser</paragraph>
+<note id="par_id3149150">You cannot use the data source browser on a database table that is open in Design view.</note>
+<h2 id="hd_id3149235">Data source browser</h2>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US"><ahelp hid=".">The commands for the data source browser are found on the <link href="text/shared/01/05340400.xhp" name="Database Bar">Table Data bar</link> and in <link href="text/shared/01/05340400.xhp" name="context menus">context menus</link>.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="3">Selecting records</paragraph>
+<h3 id="hd_id3154514">Selecting records</h3>
 <paragraph role="paragraph" id="par_id3149514" xml-lang="en-US">To select a record in a database table, click the row header, or click a row header, and then use the Up or Down arrow keys.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_CTL_TABBROWSER" id="bm_id6056703" localize="false"/><paragraph role="paragraph" id="par_id7812433001" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select database records. Drag-and-drop rows or cells to the document to insert contents. Drag-and-drop column headers to insert fields.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149578" xml-lang="en-US">The following table describes how to select individual elements in the data source browser:</paragraph>
 <table id="tbl_id3149795">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablehead" id="par_id3158432" xml-lang="en-US">Selection</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablehead" id="par_id3150670" xml-lang="en-US">Action</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153332" xml-lang="en-US">Record</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153700" xml-lang="en-US">Click the row header</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3149575" xml-lang="en-US">Several records or removing a selection</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3149295" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and click the row header</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3152360" xml-lang="en-US">Column</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153960" xml-lang="en-US">Click the column header</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3150541" xml-lang="en-US">Data field</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3150358" xml-lang="en-US">Click in the data field</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3154366" xml-lang="en-US">Entire table</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3156422" xml-lang="en-US">Click the row header of the column headings</paragraph>
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="heading" id="hd_id3154822" xml-lang="en-US" level="3">Table Data toolbar (editing table data)</paragraph>
+<h3 id="hd_id3154822">Table Data toolbar (editing table data)</h3>
 <table id="tbl_id3145608">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3151041" xml-lang="en-US">
 <image id="img_id3150740" src="cmd/sc_editdoc.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150740" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3158410" xml-lang="en-US">Allows you to edit, add, or delete records from the database table.<comment>removed 3  ancient paras</comment></paragraph>
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="heading" id="hd_id3152463" xml-lang="en-US" level="3">Cutting, copying and pasting data</paragraph>
+<h3 id="hd_id3152463">Cutting, copying and pasting data</h3>
 <paragraph role="paragraph" id="par_id3149287" xml-lang="en-US">You can cut, copy, and paste records in <emph>Data Source</emph> view. The Data Source browser also supports the dragging and dropping of records, or text and numbers from other $[officename] files.</paragraph>
 <paragraph role="paragraph" id="par_id3146921" xml-lang="en-US">You cannot drag and drop to Yes/No, binary, image, or counting table fields.</paragraph>
-<paragraph role="note" id="par_id3149064" xml-lang="en-US">Drag and drop only works in <emph>Edit</emph> mode.</paragraph>
+<note id="par_id3149064">Drag and drop only works in <emph>Edit</emph> mode.</note>
 <embed href="text/shared/main0212.xhp#database"/>
-<paragraph role="heading" id="hd_id3147295" xml-lang="en-US" level="3">Navigating in the Data Source Browser</paragraph>
+<h3 id="hd_id3147295">Navigating in the Data Source Browser</h3>
 <paragraph role="paragraph" id="par_id3152598" xml-lang="en-US">Use the Form Navigation bar at the bottom of the Data Source view to navigate between different records.</paragraph>
-<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3">First record</paragraph>
+<h3 id="hd_id3145263">First record</h3>
 <table id="tbl_id3149260">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3149266" xml-lang="en-US">
 <image id="img_id3156060" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156060" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GRID_TRAVEL_FIRST" id="bm_id3152821005" localize="false"/>
 <paragraph role="paragraph" id="par_id3151173" xml-lang="en-US"><ahelp hid=".">Go to the first record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="heading" id="hd_id3149417" xml-lang="en-US" level="3">Previous record</paragraph>
+<h3 id="hd_id3149417">Previous record</h3>
 <table id="tbl_id3153223">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3147484" xml-lang="en-US">
 <image id="img_id3156736" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156736" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GRID_TRAVEL_PREV" id="bm_id3152821002" localize="false"/>
 <paragraph role="paragraph" id="par_id3153280" xml-lang="en-US"><ahelp hid=".">Go to the previous record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="heading" id="hd_id3153053" xml-lang="en-US" level="3">Record number</paragraph>
+<h3 id="hd_id3153053">Record number</h3>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GRID_TRAVEL_ABSOLUTE" id="bm_id3152821001" localize="false"/>
 <paragraph role="paragraph" id="par_id3155851" xml-lang="en-US"><ahelp hid=".">Type the number of the record that you want to display, and then press Enter.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3157876" xml-lang="en-US" level="3">Next record</paragraph>
+<h3 id="hd_id3157876">Next record</h3>
 <table id="tbl_id3148880">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3151075" xml-lang="en-US">
 <image id="img_id3153214" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153214" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GRID_TRAVEL_NEXT" id="bm_id3152821003" localize="false"/>
 <paragraph role="paragraph" id="par_id3166414" xml-lang="en-US"><ahelp hid=".">Go to the next record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="heading" id="hd_id3154015" xml-lang="en-US" level="3">Last record</paragraph>
+<h3 id="hd_id3154015">Last record</h3>
 <table id="tbl_id3153512">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3153838" xml-lang="en-US">
 <image id="img_id3156320" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156320" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GRID_TRAVEL_LAST" id="bm_id3152821004" localize="false"/>
 <paragraph role="paragraph" id="par_id3147175" xml-lang="en-US"><ahelp hid=".">Go to the last record in the table.</ahelp></paragraph>
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="heading" id="hd_id3145162" xml-lang="en-US" level="3">New record</paragraph>
+<h3 id="hd_id3145162">New record</h3>
 <table id="tbl_id3147496">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3151019" xml-lang="en-US">
 <image id="img_id3154636" src="svtools/res/ed03.png" width="0.1528inch" height="0.1528inch"><alt id="alt_id3154636" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GRID_TRAVEL_NEW" id="bm_id3152821006" localize="false"/>
 <paragraph role="paragraph" id="par_id3146913" xml-lang="en-US"><ahelp hid=".">Inserts a new record into the current table.</ahelp> To create a record, click the asterisk (*) button at the bottom of the table view. An empty row is added at the end of the table.</paragraph>
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="heading" id="hd_id3150656" xml-lang="en-US" level="3">Number of records</paragraph>
+<h3 id="hd_id3150656">Number of records</h3>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GRID_NUMBEROFRECORDS" id="bm_id3152821013" localize="false"/>
 <paragraph role="paragraph" id="par_id3148483" xml-lang="en-US"><ahelp hid=".">Displays the number of records. For example, "Record 7 of 9(2)" indicates that two records (2) are selected in a table containing 9 records, and that the cursor is in record number 7.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151357" xml-lang="en-US" level="3">Organizing tables</paragraph>
+<h3 id="hd_id3151357">Organizing tables</h3>
 <paragraph role="paragraph" id="par_id3153357" xml-lang="en-US">To access the commands for formatting the table, right-click a column header, or a row header.</paragraph>
-<paragraph role="heading" id="hd_id3148405" xml-lang="en-US" level="2"><link href="text/shared/01/05340402.xhp" name="Table Format">Table Format</link></paragraph>
+<h2 id="hd_id3148405"><link href="text/shared/01/05340402.xhp" name="Table Format">Table Format</link></h2>
 <embed href="text/shared/01/05340402.xhp#tabformtext"/>
-<paragraph role="heading" id="hd_id3083283" xml-lang="en-US" level="2"><link href="text/shared/01/05340100.xhp" name="Row Height">Row Height</link></paragraph>
+<h2 id="hd_id3083283"><link href="text/shared/01/05340100.xhp" name="Row Height">Row Height</link></h2>
 <embed href="text/shared/01/05340100.xhp#zeilenhoehetext"/>
 <embed href="text/shared/01/05340404.xhp#delete_rows"/>
-<paragraph role="heading" id="hd_id3150321" xml-lang="en-US" level="2"><link href="text/shared/01/05340405.xhp" name="Column Format">Column Format</link></paragraph>
+<h2 id="hd_id3150321"><link href="text/shared/01/05340405.xhp" name="Column Format">Column Format</link></h2>
 <embed href="text/shared/01/05340405.xhp#spaltformtext"/>
-<paragraph role="heading" id="hd_id3147341" xml-lang="en-US" level="2"><link href="text/shared/01/05340200.xhp" name="Column Width">Column Width</link></paragraph>
+<h2 id="hd_id3147341"><link href="text/shared/01/05340200.xhp" name="Column Width">Column Width</link></h2>
 <embed href="text/shared/01/05340200.xhp#spaltetext"/>
 <embed href="text/shared/01/05340500.xhp#hide_columns"/>
 <embed href="text/shared/01/05340600.xhp#alleeinblenden"/>
diff --git a/source/text/shared/explorer/database/05000000.xhp b/source/text/shared/explorer/database/05000000.xhp
deleted file mode 100644
index 990465d2c7..0000000000
--- a/source/text/shared/explorer/database/05000000.xhp
+++ /dev/null
@@ -1,47 +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="textsharedexplorerdatabase05000000xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Tables</title>
-<filename>/text/shared/explorer/database/05000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="tables">
-<paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/05000000.xhp" name="Tables">Tables</link></paragraph>
-<paragraph role="paragraph" id="par_id3147102" xml-lang="en-US">Table data edit mode allows you to see your data as rows of records, with optional filtering and sorting of that data. In this mode, you can also enter new records, make changes to, and delete existing records.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US">In the $[officename] Help, you will find further information on the following subjects:</paragraph>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="2"><link href="text/shared/explorer/database/05010000.xhp" name="Create new or edit table design">Create new or edit table design</link></paragraph>
-<embed href="text/shared/01/05340400.xhp#umgang"/>
-<embed href="text/shared/02/12100200.xhp#datensatzsuche"/>
-<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2"><link href="text/shared/main0212.xhp" name="Sort and Filter Data">Sort and Filter Data</link></paragraph>
-<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="2"><link href="text/shared/explorer/database/05020000.xhp" name="Relations, Primary and External Key">Relations, Primary and External Key</link></paragraph>
-<embed href="text/shared/explorer/database/05000001.xhp#context"/>
-</body>
-</helpdocument>
diff --git a/source/text/shared/explorer/database/05000001.xhp b/source/text/shared/explorer/database/05000001.xhp
deleted file mode 100644
index 74cb325489..0000000000
--- a/source/text/shared/explorer/database/05000001.xhp
+++ /dev/null
@@ -1,49 +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="textsharedexplorerdatabase05000001xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Context Menus</title>
-<filename>/text/shared/explorer/database/05000001.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<section id="context">
-<paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/05000001.xhp" name="Table Context Menus">Table Context Menus</link></paragraph>
-<paragraph role="paragraph" id="par_id3163829" xml-lang="en-US">The context menu of the table container offers various functions that apply to all database tables. To edit a particular table within the database, select the corresponding table and open its context menu.</paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000450.xhp#Tabellen"/>
-</section>
-<paragraph role="note" id="par_id3146958" xml-lang="en-US">Depending on the context, it is possible that not all the functions for your current database will be listed in the context menus. For example, the <emph>Relationships</emph> command for defining relationships between various tables is only available with relational databases.</paragraph>
-<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US">Depending on the database system used, you will find the following entries on the context menus:</paragraph>
-<embed href="text/shared/00/00000010.xhp#open"/>
-<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US">If a <link href="text/shared/01/05340400.xhp" name="table is open">table is open</link>, there are several functions available to edit the data.</paragraph>
-<embed href="text/shared/explorer/database/05020000.xhp#relations"/>
-<embed href="text/shared/00/00000010.xhp#verknuepfungerstellen"/>
-</body>
-</helpdocument>
diff --git a/source/text/shared/explorer/database/05000003.xhp b/source/text/shared/explorer/database/05000003.xhp
deleted file mode 100644
index 56227495a9..0000000000
--- a/source/text/shared/explorer/database/05000003.xhp
+++ /dev/null
@@ -1,48 +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="textsharedexplorerdatabase05000003xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Enter / change password</title>
-<filename>/text/shared/explorer/database/05000003.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1">Enter / change password</paragraph>
-<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US">Allows you to enter and confirm a new or changed password. If you have defined a new user, enter the user name in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/password/usered" id="bm_id3149283" localize="false"/>
-<paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="2">User</paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US"><ahelp hid="sfx/ui/password/usered">Specifies the name of the new user.</ahelp> This field is only visible if you have defined a new user.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/password/oldpassword" id="bm_id3145346" localize="false"/>
-<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2">Old password</paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US"><ahelp hid="dbaccess/ui/password/oldpassword">Enter the old password here.</ahelp> This field is visible when you have opened the dialog via <emph>Change password</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/password/newpassword" id="bm_id3166411" localize="false"/>
-<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="2">Password</paragraph>
-<paragraph role="paragraph" id="par_id3147243" xml-lang="en-US"><ahelp hid="dbaccess/ui/password/newpassword">Enter the new password.</ahelp></paragraph><comment>UFI: removed help id</comment>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/password/confirmpassword" id="bm_id3163802" localize="false"/>
-<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2">Confirm (password)</paragraph>
-<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US"><ahelp hid="dbaccess/ui/password/confirmpassword">Enter the new password again.</ahelp></paragraph>
-</body>
-</helpdocument>
-- 
cgit