summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2022-01-21 13:45:51 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2022-01-21 17:59:51 +0100
commit4eecbf9045ed866b0d716a45046f89b472dd3835 (patch)
tree86fe8a2e91607f2f287df2c82eb9280f7659cd04
parent66dc0fd6708f70b931f189d63ef140de7114dfa1 (diff)
Refactor database Help files
Change-Id: I8f8c96bf9cc9c401c38e3cc92f4c3b274b3f15e8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128740 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--AllLangHelp_sdatabase.mk7
-rw-r--r--AllLangHelp_shared.mk10
-rw-r--r--source/text/sdatabase/menuinsert.xhp2
-rw-r--r--source/text/sdatabase/rep_datetime.xhp (renamed from source/text/shared/explorer/database/rep_datetime.xhp)17
-rw-r--r--source/text/sdatabase/rep_insertfield.xhp (renamed from source/text/shared/explorer/database/rep_insertfield.xhp)14
-rw-r--r--source/text/sdatabase/rep_main.xhp (renamed from source/text/shared/explorer/database/rep_main.xhp)32
-rw-r--r--source/text/sdatabase/rep_navigator.xhp (renamed from source/text/shared/explorer/database/rep_navigator.xhp)17
-rw-r--r--source/text/sdatabase/rep_pagenumbers.xhp (renamed from source/text/shared/explorer/database/rep_pagenumbers.xhp)17
-rw-r--r--source/text/sdatabase/rep_prop.xhp (renamed from source/text/shared/explorer/database/rep_prop.xhp)8
-rw-r--r--source/text/sdatabase/rep_sort.xhp (renamed from source/text/shared/explorer/database/rep_sort.xhp)8
-rw-r--r--source/text/shared/guide/data_report.xhp2
-rw-r--r--source/text/shared/guide/data_reports.xhp2
12 files changed, 59 insertions, 77 deletions
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 6d607cb60..7f7ff77dd 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -89,6 +89,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
helpcontent2/source/text/sdatabase/tablewizard02 \
helpcontent2/source/text/sdatabase/tablewizard03 \
helpcontent2/source/text/sdatabase/tablewizard04 \
+ helpcontent2/source/text/sdatabase/rep_datetime \
+ helpcontent2/source/text/sdatabase/rep_insertfield \
+ helpcontent2/source/text/sdatabase/rep_main \
+ helpcontent2/source/text/sdatabase/rep_navigator \
+ helpcontent2/source/text/sdatabase/rep_pagenumbers \
+ helpcontent2/source/text/sdatabase/rep_prop \
+ helpcontent2/source/text/sdatabase/rep_sort \
))
# vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 77c368560..2f3c9b40a 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -873,14 +873,4 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/optionen/viewcertificate_g \
))
-$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
- helpcontent2/source/text/shared/explorer/database/rep_datetime \
- helpcontent2/source/text/shared/explorer/database/rep_insertfield \
- helpcontent2/source/text/shared/explorer/database/rep_main \
- helpcontent2/source/text/shared/explorer/database/rep_navigator \
- helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \
- helpcontent2/source/text/shared/explorer/database/rep_prop \
- helpcontent2/source/text/shared/explorer/database/rep_sort \
-,shared/explorer/database))
-
# vim: set noet sw=4 ts=4:
diff --git a/source/text/sdatabase/menuinsert.xhp b/source/text/sdatabase/menuinsert.xhp
index 1f9196bc0..14be6017b 100644
--- a/source/text/sdatabase/menuinsert.xhp
+++ b/source/text/sdatabase/menuinsert.xhp
@@ -31,7 +31,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:DBNewForm" id="bm_id4928739" localize="false"/><h2 id="par_idN10560">Form</h2>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"><ahelp hid=".">Opens a new text document in form mode.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBNewReport" id="bm_id4968413" localize="false"/><h2 id="par_idN1058B">Report</h2>
-<paragraph role="paragraph" id="par_idN1058F" xml-lang="en-US"><ahelp hid=".">Starts the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> window for the selected table, view, or query.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1058F" xml-lang="en-US"><ahelp hid=".">Starts the <link href="text/sdatabase/rep_main.xhp">Report Builder</link> window for the selected table, view, or query.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBNewQuery" id="bm_id1720023" localize="false"/><h2 id="par_idN105A0">Query (Design View)</h2>
<paragraph role="paragraph" id="par_idN105A4" xml-lang="en-US"><ahelp hid=".">Opens a new query in design mode.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBNewQuerySql" id="bm_id2862636" localize="false"/><h2 id="par_idN105A7">Query (SQL View)</h2>
diff --git a/source/text/shared/explorer/database/rep_datetime.xhp b/source/text/sdatabase/rep_datetime.xhp
index d45f7fe46..72a8dbbb3 100644
--- a/source/text/shared/explorer/database/rep_datetime.xhp
+++ b/source/text/sdatabase/rep_datetime.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,23 +16,21 @@
* 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="textsharedexplorerdatabaserep_datetimexml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Date and Time</title>
-<filename>/text/shared/explorer/database/rep_datetime.xhp</filename>
+<filename>/text/sdatabase/rep_datetime.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertDateTimeField" id="bm_id6520584" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/datetimedialog/DateTimeDialog" id="bm_id6520585" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/datetimedialog/@@nowidget@@" id="bm_id6520585" localize="false"/>
-<paragraph role="heading" id="hd_id2320932" xml-lang="en-US" level="1"><variable id="rep_datetime"><link href="text/shared/explorer/database/rep_datetime.xhp">Date and Time</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US"><ahelp hid=".">You can open the Date and Time dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Date and Time</item>.</ahelp></paragraph>
-<paragraph role="tip" id="par_id6278878" xml-lang="en-US">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
+<h1 id="hd_id2320932"><variable id="rep_datetime"><link href="text/sdatabase/rep_datetime.xhp">Date and Time</link>
+</variable></h1>
+<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US"><ahelp hid=".">You can open the Date and Time dialog of the <link href="text/sdatabase/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Date and Time</item>.</ahelp></paragraph>
+<tip id="par_id6278878">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</tip>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/datetimedialog/date" id="bm_id5607470" localize="false"/><paragraph role="paragraph" id="par_id393078" xml-lang="en-US"><ahelp hid=".">Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/datetimedialog/datelistbox" id="bm_id5607471" localize="false"/>
<paragraph role="paragraph" id="par_id1271401" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select a format to display the date.</ahelp></paragraph>
diff --git a/source/text/shared/explorer/database/rep_insertfield.xhp b/source/text/sdatabase/rep_insertfield.xhp
index 6080bfd83..739e5254d 100644
--- a/source/text/shared/explorer/database/rep_insertfield.xhp
+++ b/source/text/sdatabase/rep_insertfield.xhp
@@ -12,7 +12,7 @@
<meta>
<topic id="ReportInsertField" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Insert Fields</title>
- <filename>/text/shared/explorer/database/rep_insertfield.xhp</filename>
+ <filename>/text/sdatabase/rep_insertfield.xhp</filename>
</topic>
</meta>
<body>
@@ -23,7 +23,7 @@
<bookmark_value>add fields;in report design</bookmark_value>
<bookmark_value>report design;add fields to report</bookmark_value>
</bookmark>
- <paragraph id="hd_id361540562942432" role="heading" level="1" xml-lang="en-US"><variable id="addfields"><link href="text/shared/explorer/database/rep_insertfield.xhp" name="Add Fields">Add fields to report</link></variable></paragraph>
+ <h1 id="hd_id361540562942432"><variable id="addfields"><link href="text/sdatabase/rep_insertfield.xhp" name="Add Fields">Add fields to report</link></variable></h1>
<paragraph id="par_id3587145" role="paragraph" xml-lang="en-US"><ahelp hid=".">The Add Field window helps you to insert the table entries in the report.</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -37,7 +37,7 @@
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id121540674874655" role="paragraph" xml-lang="en-US" >Click the Add Field icon on the toolbar.</paragraph>
+ <paragraph id="par_id121540674874655" role="paragraph" xml-lang="en-US">Click the Add Field icon on the toolbar.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -54,7 +54,7 @@
<paragraph xml-lang="en-US" id="par_id3059785" role="paragraph">You can also insert text that should be the same on every page of the report. Click the Label Field icon <image id="img_id5605334" src="media/icon-themes/cmd/lc_addfield.svg" width="0.566cm" height="0.566cm" localize="true"><alt xml-lang="en-US" id="alt_id5605334">Icon</alt></image>, then drag a rectangle in the Page Header or Page Footer area. Edit the Label property to show the text you want.</paragraph>
</listitem>
</list>
- <paragraph role="heading" id="hd_id251540563929787" level="2" xml-lang="en-US">Sorting fields names</paragraph>
+ <h2 id="hd_id251540563929787">Sorting fields names</h2>
<table id="tab_id101540563992664">
<tablerow>
<tablecell>
@@ -63,7 +63,7 @@
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id401540563992665" role="paragraph" xml-lang="en-US" >Sort names ascending.</paragraph>
+ <paragraph id="par_id401540563992665" role="paragraph" xml-lang="en-US">Sort names ascending.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -73,7 +73,7 @@
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id401540563942665" role="paragraph" xml-lang="en-US" >Sort names descending,</paragraph>
+ <paragraph id="par_id401540563942665" role="paragraph" xml-lang="en-US">Sort names descending,</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -83,7 +83,7 @@
</paragraph>
</tablecell>
<tablecell>
- <paragraph id="par_id401540533942665" role="paragraph" xml-lang="en-US" >Restore original sorting</paragraph>
+ <paragraph id="par_id401540533942665" role="paragraph" xml-lang="en-US">Restore original sorting</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/source/text/shared/explorer/database/rep_main.xhp b/source/text/sdatabase/rep_main.xhp
index 04362579f..f69c6b589 100644
--- a/source/text/shared/explorer/database/rep_main.xhp
+++ b/source/text/sdatabase/rep_main.xhp
@@ -21,7 +21,7 @@
<meta>
<topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Report Builder</title>
- <filename>/text/shared/explorer/database/rep_main.xhp</filename>
+ <filename>/text/sdatabase/rep_main.xhp</filename>
</topic>
</meta>
@@ -30,11 +30,11 @@
<bookmark_value>Report Builder</bookmark_value>
<bookmark_value>Oracle Report Builder</bookmark_value>
</bookmark>
- <paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
-</variable></paragraph>
+ <h1 id="hd_id8773155"><variable id="rep_main"><link href="text/sdatabase/rep_main.xhp">Report Builder</link>
+</variable></h1>
<paragraph xml-lang="en-US" id="par_id5248573" role="paragraph">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7128818" role="note">To use the Report Builder, the Report Builder component must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2">To install the JRE software</paragraph>
+ <note id="par_id7128818">To use the Report Builder, the Report Builder component must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</note>
+ <h2 id="hd_id556047">To install the JRE software</h2>
<paragraph xml-lang="en-US" id="par_id4515823" role="paragraph">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
<list type="ordered">
<listitem>
@@ -52,7 +52,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id6317636" role="paragraph">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Advanced again.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id9759514" role="heading" level="2">To open the Report Builder</paragraph>
+ <h2 id="hd_id9759514">To open the Report Builder</h2>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id9076509" role="paragraph">Open a Base file or create a new database. The database must contain at least one table with at least one data field and a primary key field.</paragraph>
@@ -83,7 +83,7 @@
<paragraph xml-lang="en-US" id="par_id6042664" role="paragraph">Click the "-" icon in front of an area name to collapse that area to one line in the Report Builder view. The "-" icon changes to a "+" icon, and you can click this to expand the area again.</paragraph>
<paragraph xml-lang="en-US" id="par_id1589098" role="paragraph">You insert database fields by drag-and-drop into the Detail area. See the section "To insert fields into the report" below.</paragraph>
<paragraph xml-lang="en-US" id="par_id1278420" role="paragraph">In addition, you can click the Label Field or Text Box icon in the toolbar, then drag a rectangle in the Page Header or Page Footer area, to define a text that is the same on all pages. You enter the text in the Label box of the corresponding Properties window. You can also add graphics by using the Graphics icon.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7479476" role="heading" level="2">To connect the report to a database table</paragraph>
+ <h2 id="par_id7479476">To connect the report to a database table</h2>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id2218390" role="paragraph">Move the mouse to the Properties view. You see two tab pages General and Data.</paragraph>
@@ -98,8 +98,8 @@
<paragraph xml-lang="en-US" id="par_id7996459" role="paragraph">After selecting the table, press the Tab key to leave the Content box.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id2531815" role="paragraph">The <link href="text/shared/explorer/database/rep_insertfield.xhp" name="add_fields_link">Add fields to report</link> window opens automatically and shows all fields of the selected table.</paragraph>
- <embed href="text/shared/explorer/database/rep_insertfield.xhp#insertfieldstitle"/>
+ <paragraph xml-lang="en-US" id="par_id2531815" role="paragraph">The <link href="text/sdatabase/rep_insertfield.xhp" name="add_fields_link">Add fields to report</link> window opens automatically and shows all fields of the selected table.</paragraph>
+ <embed href="text/sdatabase/rep_insertfield.xhp#insertfieldstitle"/>
<comment>Align at Section toolbar</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignLeft" id="bm_id7889950" localize="false"/>
<paragraph xml-lang="en-US" id="par_id7657399" role="paragraph"><ahelp hid="." visibility="hidden">Select two or more objects and click this icon to align the objects at the left margin of the area.</ahelp></paragraph>
@@ -128,7 +128,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:SectionShrinkBottom" id="bm_id040920092223576" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0409200922242661" role="paragraph"><ahelp hid="." visibility="hidden">Shrinks the selected section to remove bottom empty space.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id1511581" role="paragraph">After inserting fields in the Detail view, the report is ready for execution.</paragraph>
- <paragraph xml-lang="en-US" id="par_id4881740" role="heading" level="2">To execute a report</paragraph>
+ <h2 id="par_id4881740">To execute a report</h2>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id8286385" role="paragraph">Click the Execute Report icon
@@ -137,7 +137,7 @@
</list>
<paragraph xml-lang="en-US" id="par_id2354197" role="paragraph">A Writer document opens and shows the report you have created, which contains all values of the database table which you have insert.</paragraph>
<paragraph xml-lang="en-US" id="par_id2485122" role="paragraph">If the database contents did change, execute the report again to update the result report.<comment>automatic? message?</comment></paragraph>
- <paragraph xml-lang="en-US" id="hd_id8746910" role="heading" level="2">To edit a report</paragraph>
+ <h2 id="hd_id8746910">To edit a report</h2>
<paragraph xml-lang="en-US" id="par_id9636524" role="paragraph">First decide if you want to edit the generated report, which is a static Writer document, or if you want to edit the Report Builder view and then generate a new report based on the new design.</paragraph>
<paragraph xml-lang="en-US" id="par_id5941648" role="paragraph">The Writer document is opened read-only. To edit the Writer document, click <emph>Edit Document</emph> on the information bar, or choose <emph>Edit - Edit Mode</emph>.<comment>saved automatically with the Base file?</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id8307138" role="paragraph">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
@@ -145,12 +145,12 @@
<paragraph xml-lang="en-US" id="par_id9869380" role="paragraph">After finishing, click the Execute Report icon
<image id="Graphic2" src="cmd/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt></image> to create a new report.</paragraph>
<paragraph xml-lang="en-US" id="par_id12512" role="paragraph">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id2676168" role="heading" level="2">Sorting the report</paragraph>
+ <h2 id="par_id2676168">Sorting the report</h2>
<paragraph xml-lang="en-US" id="par_id2626422" role="paragraph">Without sorting or grouping, the records will be inserted into the report in the order in which they are retrieved from the database.</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id1743827" role="paragraph">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="img_id9557786" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt></image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
+<image id="img_id9557786" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt></image> on the toolbar. You see the <link href="text/sdatabase/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id4331797" role="paragraph">In the Groups box, click the field which you want as the first sort field, and set the Sorting property.<comment>what meaning has the order of fields / move up down button?</comment></paragraph>
@@ -159,11 +159,11 @@
<paragraph xml-lang="en-US" id="par_id4191717" role="paragraph">Execute the report.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id2318796" role="heading" level="2">Grouping</paragraph>
+ <h2 id="par_id2318796">Grouping</h2>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id399182" role="paragraph">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="Graphic21" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt></image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
+<image id="Graphic21" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt></image> on the toolbar. You see the <link href="text/sdatabase/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id7588732" role="paragraph">In the Groups box, open the Group Header list box and select to show a group header.</paragraph>
@@ -180,7 +180,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id7599108" role="paragraph">If you like to sort and group, open the Report Builder view, then open the Sorting and Grouping dialog. Select to show a Group Header for the fields that you want to group, and select to hide the Group Header for the fields that you want to be sorted. Close the Sorting and Grouping window and execute the report.</paragraph>
- <paragraph xml-lang="en-US" id="par_id888698" role="heading" level="2">Updating and printing your data</paragraph>
+ <h2 id="par_id888698">Updating and printing your data</h2>
<paragraph xml-lang="en-US" id="par_id3394573" role="paragraph">When you insert some new data or edit data in the table, a new report will show the updated data.</paragraph>
<paragraph xml-lang="en-US" id="par_id7594225" role="paragraph">Click the Reports icon
<image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4678487">Icon</alt></image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
diff --git a/source/text/shared/explorer/database/rep_navigator.xhp b/source/text/sdatabase/rep_navigator.xhp
index 4a17ed8b8..3ab5bfaa2 100644
--- a/source/text/shared/explorer/database/rep_navigator.xhp
+++ b/source/text/sdatabase/rep_navigator.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,29 +16,27 @@
* 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="textsharedexplorerdatabaserep_navigatorxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Report Navigator</title>
-<filename>/text/shared/explorer/database/rep_navigator.xhp</filename>
+<filename>/text/sdatabase/rep_navigator.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id5823847"><bookmark_value>formulas in reports;editing</bookmark_value>
<bookmark_value>functions in reports;editing</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:ReportNavigator" id="bm_id8798791" localize="false"/><paragraph role="heading" id="hd_id1821955" xml-lang="en-US" level="1"><variable id="rep_navigator"><link href="text/shared/explorer/database/rep_navigator.xhp">Report Navigator</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id1150852" xml-lang="en-US">You can open the Report Navigator window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">View - Report Navigator</item>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:ReportNavigator" id="bm_id8798791" localize="false"/><h1 id="hd_id1821955"><variable id="rep_navigator"><link href="text/sdatabase/rep_navigator.xhp">Report Navigator</link>
+</variable></h1>
+<paragraph role="paragraph" id="par_id1150852" xml-lang="en-US">You can open the Report Navigator window of the <link href="text/sdatabase/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">View - Report Navigator</item>.</paragraph>
<paragraph role="paragraph" id="par_id1111484" xml-lang="en-US"><ahelp hid=".">The Report Navigator reveals the structure of the report. You can use the Report Navigator to insert functions into the report.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE" id="bm_id7007354" localize="false"/><paragraph role="paragraph" id="par_id8314157" xml-lang="en-US"><ahelp hid=".">Click an entry in the Report Navigator. The corresponding object or area is selected in the Report Builder view. Right-click an entry to open the context menu.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id2932828" xml-lang="en-US" level="2">To enter functions to the report</paragraph>
+<h2 id="hd_id2932828">To enter functions to the report</h2>
<bookmark xml-lang="en-US" branch="hid/.uno:NewFunction" id="bm_id974456" localize="false"/><paragraph role="paragraph" id="par_id5091708" xml-lang="en-US"><ahelp hid=".">In the context menu of the Report Navigator, you see the same commands as in the Report Builder view, plus additional commands to create new functions or to delete them.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id9449446" xml-lang="en-US">Functions can be entered using a syntax as specified by the <link href="https://en.wikipedia.org/wiki/OpenFormula" name="English Wikipedia: OpenFormula">OpenFormula</link> proposal.</paragraph>
<paragraph role="paragraph" id="par_id4095583" xml-lang="en-US">See <link href="https://wiki.documentfoundation.org/Database" name="wiki.documentfoundation.org Database">Wiki page about Base</link> for some more help regarding the functions in a report.</paragraph>
-<paragraph role="heading" id="hd_id311593" xml-lang="en-US" level="3">To calculate a sum for each client<comment>copied from a mail by Ocke - did not test</comment></paragraph>
+<h3 id="hd_id311593">To calculate a sum for each client<comment>copied from a mail by Ocke - did not test</comment></h3>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3948789" xml-lang="en-US">Open the Report Navigator.</paragraph>
diff --git a/source/text/shared/explorer/database/rep_pagenumbers.xhp b/source/text/sdatabase/rep_pagenumbers.xhp
index c0617b1a1..b6a4cb6b1 100644
--- a/source/text/shared/explorer/database/rep_pagenumbers.xhp
+++ b/source/text/sdatabase/rep_pagenumbers.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,22 +16,20 @@
* 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="textsharedexplorerdatabaserep_pagenumbersxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Page Numbers </title>
-<filename>/text/shared/explorer/database/rep_pagenumbers.xhp</filename>
+<filename>/text/sdatabase/rep_pagenumbers.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/pagenumberdialog/PageNumberDialog" id="bm_id7565844" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/pagenumberdialog/@@nowidget@@" id="bm_id7565844" localize="false"/>
-<paragraph role="heading" id="hd_id3674123" xml-lang="en-US" level="1"><variable id="rep_pagenumbers"><link href="text/shared/explorer/database/rep_pagenumbers.xhp">Page Numbers</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US"><ahelp hid=".">You can open the Page Numbers dialog of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Page Numbers</item>.</ahelp></paragraph>
-<paragraph role="tip" id="par_id1068758" xml-lang="en-US">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
+<h1 id="hd_id3674123"><variable id="rep_pagenumbers"><link href="text/sdatabase/rep_pagenumbers.xhp">Page Numbers</link>
+</variable></h1>
+<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US"><ahelp hid=".">You can open the Page Numbers dialog of the <link href="text/sdatabase/rep_main.xhp">Report Builder</link> by choosing <item type="menuitem">Insert - Page Numbers</item>.</ahelp></paragraph>
+<tip id="par_id1068758">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</tip>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/pagenumberdialog/pagen" id="bm_id7565843" localize="false"/><paragraph role="paragraph" id="par_id1559190" xml-lang="en-US"><ahelp hid="." visibility="hidden">Page N</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/pagenumberdialog/pagenofm" id="bm_id6649372" localize="false"/><paragraph role="paragraph" id="par_id9879146" xml-lang="en-US"><ahelp hid="." visibility="hidden">Page N of M</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/pagenumberdialog/toppage" id="bm_id7334208" localize="false"/><paragraph role="paragraph" id="par_id9404278" xml-lang="en-US"><ahelp hid="." visibility="hidden">Top of Page (Header)</ahelp></paragraph>
diff --git a/source/text/shared/explorer/database/rep_prop.xhp b/source/text/sdatabase/rep_prop.xhp
index 4817a595b..83736e6ac 100644
--- a/source/text/shared/explorer/database/rep_prop.xhp
+++ b/source/text/sdatabase/rep_prop.xhp
@@ -21,17 +21,17 @@
<meta>
<topic id="textsharedexplorerdatabaserep_propxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Properties </title>
- <filename>/text/shared/explorer/database/rep_prop.xhp</filename>
+ <filename>/text/sdatabase/rep_prop.xhp</filename>
</topic>
</meta>
<body>
- <h1 id="hd_id8836939"><variable id="rep_prop"><link href="text/shared/explorer/database/rep_prop.xhp">Properties</link></variable></h1>
- <paragraph id="par_id2711264" role="paragraph">The Properties window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> always shows the properties of the currently selected object in the Report Builder view.</paragraph>
+ <h1 id="hd_id8836939"><variable id="rep_prop"><link href="text/sdatabase/rep_prop.xhp">Properties</link></variable></h1>
+ <paragraph id="par_id2711264" role="paragraph">The Properties window of the <link href="text/sdatabase/rep_main.xhp">Report Builder</link> always shows the properties of the currently selected object in the Report Builder view.</paragraph>
<tip id="par_id1080660">Press Shift-F1 and point with the mouse at an input box to see a help text for this input box.</tip>
<paragraph id="par_id7175817" role="paragraph">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
<paragraph id="par_id9895931" role="paragraph">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
- <paragraph id="par_id3587145" role="paragraph"><ahelp hid=".">The <link href="text/shared/explorer/database/rep_insertfield.xhp" name="add_fields_link">Add fields to report</link> window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
+ <paragraph id="par_id3587145" role="paragraph"><ahelp hid=".">The <link href="text/sdatabase/rep_insertfield.xhp" name="add_fields_link">Add fields to report</link> window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
<paragraph id="par_id6993926" role="paragraph">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/>
<tip id="par_id3729361"><ahelp hid=".">To display the <emph>Data</emph> or <emph>General</emph> tab page for the whole report, choose <item type="menuitem">Edit - Select All - Select Report</item>.</ahelp></tip>
diff --git a/source/text/shared/explorer/database/rep_sort.xhp b/source/text/sdatabase/rep_sort.xhp
index 149c5ad38..98af2ca39 100644
--- a/source/text/shared/explorer/database/rep_sort.xhp
+++ b/source/text/sdatabase/rep_sort.xhp
@@ -23,7 +23,7 @@
<meta>
<topic id="textsharedexplorerdatabaserep_sortxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Sorting and Grouping</title>
- <filename>/text/shared/explorer/database/rep_sort.xhp</filename>
+ <filename>/text/sdatabase/rep_sort.xhp</filename>
</topic>
</meta>
<body>
@@ -31,9 +31,9 @@
<bookmark xml-lang="en-US" branch="hid/.uno:DbSortingAndGrouping" id="bm_id9569078" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/floatingsort/FloatingSort" id="bm_id9569079" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/dbreport/ui/floatingsort/@@nowidget@@" id="bm_id9569079" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3486434" role="heading" level="1"><variable id="rep_sort"><link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3068636" role="paragraph"><ahelp hid=".">In the Sorting and Grouping dialog of <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>, you can define the fields that should be sorted in your report, and the fields that should be kept together to form a group.</ahelp> If you group your report by a certain field, all records with the same value of that field will be kept together in one group.</paragraph>
+<h1 id="hd_id3486434"><variable id="rep_sort"><link href="text/sdatabase/rep_sort.xhp">Sorting and Grouping</link>
+</variable></h1>
+ <paragraph xml-lang="en-US" id="par_id3068636" role="paragraph"><ahelp hid=".">In the Sorting and Grouping dialog of <link href="text/sdatabase/rep_main.xhp">Report Builder</link>, you can define the fields that should be sorted in your report, and the fields that should be kept together to form a group.</ahelp> If you group your report by a certain field, all records with the same value of that field will be kept together in one group.</paragraph>
</section>
<paragraph xml-lang="en-US" id="par_id876186" role="paragraph">The Groups box shows the fields in an order from top to bottom. You can select any field, then click the Move Up or Move Down button to move this field up or down in the list. </paragraph>
<paragraph xml-lang="en-US" id="par_id3939634" role="paragraph">The sorting and grouping will be applied in the order of the list from top to bottom.</paragraph>
diff --git a/source/text/shared/guide/data_report.xhp b/source/text/shared/guide/data_report.xhp
index 9c214e430..91389473c 100644
--- a/source/text/shared/guide/data_report.xhp
+++ b/source/text/shared/guide/data_report.xhp
@@ -61,7 +61,7 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id8138065" xml-lang="en-US">The Report Builder window opens with the report's information loaded. </paragraph>
-<paragraph role="paragraph" id="par_id5086825" xml-lang="en-US">Use the toolbars and menu commands and drag-and-drop to edit the report as stated in the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> guide.</paragraph>
+<paragraph role="paragraph" id="par_id5086825" xml-lang="en-US">Use the toolbars and menu commands and drag-and-drop to edit the report as stated in the <link href="text/sdatabase/rep_main.xhp">Report Builder</link> guide.</paragraph>
<paragraph role="paragraph" id="par_id4747154" xml-lang="en-US">Execute the report to see the resulting report document.</paragraph>
<paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="2">Editing a Report Created by the Report Wizard</paragraph>
<list type="unordered">
diff --git a/source/text/shared/guide/data_reports.xhp b/source/text/shared/guide/data_reports.xhp
index 992c6725b..92dd0b9ce 100644
--- a/source/text/shared/guide/data_reports.xhp
+++ b/source/text/shared/guide/data_reports.xhp
@@ -115,7 +115,7 @@
<paragraph role="paragraph" id="par_id5758842" xml-lang="en-US">Click <emph>Create Report in Design View</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id4870754" xml-lang="en-US">Follow the instructions in the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> guide.</paragraph>
+<paragraph role="paragraph" id="par_id4870754" xml-lang="en-US">Follow the instructions in the <link href="text/sdatabase/rep_main.xhp">Report Builder</link> guide.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2">Creating a New Report With the Report Wizard</paragraph>