AllLangHelp_scalc.mk | 1
source/text/scalc/01/12010000.xhp | 29 +++++++++++++---
source/text/scalc/01/12010100.xhp | 49 ----------------------------
source/text/scalc/guide/database_define.xhp | 34 +++++++++----------
4 files changed, 41 insertions(+), 72 deletions(-)
New commits:
commit ffbbfc987819e0bb37eb58c8faa3554acc77b685
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Jul 31 17:47:58 2024 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Aug 1 20:41:14 2024 +0200
Review Calc Define database range Help page
+ Merge database range option page into main database range page
+ drop extra page
+ Add description for Operations in options
+ Add description for Totals row
+ in preparation for tdf#162275
Change-Id: Ifd0e3b36375b7db97bf77ce3f6baa0ae5bc37e84
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/171379
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 67cc5038e7..a3dc974a75 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -138,7 +138,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
helpcontent2/source/text/scalc/01/07090000 \
helpcontent2/source/text/scalc/01/07090100 \
helpcontent2/source/text/scalc/01/12010000 \
- helpcontent2/source/text/scalc/01/12010100 \
helpcontent2/source/text/scalc/01/12020000 \
helpcontent2/source/text/scalc/01/12030000 \
helpcontent2/source/text/scalc/01/12030100 \
diff --git a/source/text/scalc/01/12010000.xhp
b/source/text/scalc/01/12010000.xhp
index 5c8e76d85b..5a7721a4fc 100644
--- a/source/text/scalc/01/12010000.xhp
+++ b/source/text/scalc/01/12010000.xhp
@@ -32,13 +32,13 @@
<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/@@nowidget@@"
id="bm_id3147335" localize="false"/>
<bookmark branch="hid/modules/scalc/ui/notebookbar/MenuData-DefineDBName"
id="bm_id631703673605853" localize="false"/>
<section id="defineDBrangeheader">
-<h1 id="hd_id3157909"><link href="text/scalc/01/12010000.xhp">Define
Range</link></h1>
-<paragraph role="paragraph" id="par_id3155922"><variable
id="bereichtext"><ahelp hid=".uno:DefineDBName">Defines a database range based
on the selected cells in your sheet.</ahelp></variable></paragraph>
+ <h1 id="hd_id3157909"><link href="text/scalc/01/12010000.xhp">Define
Range</link></h1>
+ <paragraph role="paragraph" id="par_id3155922"><variable
id="bereichtext"><ahelp hid=".uno:DefineDBName">Defines a database range based
on the selected cells in your sheet.</ahelp></variable></paragraph>
</section>
<note id="par_id3149456">You can only select a rectangular cell range.</note>
<section id="howtoget">
-<embed href="text/scalc/00/00000412.xhp#definerange"/>
+ <embed href="text/scalc/00/00000412.xhp#definerange"/>
</section>
<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/entry"
id="bm_id3150868" localize="false"/>
<h2 id="hd_id3156422">Name</h2>
@@ -52,7 +52,26 @@
<paragraph role="paragraph" id="par_id3153726"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/add">Adds the selected cell
range to the database range list, or modifies an existing database
range.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#delete"/>
<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/more"
id="bm_id3152596" localize="false"/>
-<h2 id="hd_id3150010">More >></h2>
-<paragraph role="paragraph" id="par_id3153144"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/more">Shows additional <link
href="text/scalc/01/12010100.xhp">options</link>.</ahelp></paragraph>
+
+<h2 id="hd_id3154760">Options</h2>
+<bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/ContainsColumnLabels"
id="bm_id3150399" localize="false"/>
+<h3 id="hd_id3153379">Contains column labels</h3>
+<paragraph role="paragraph" id="par_id3148798"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/ContainsColumnLabels"
visibility="visible">Selected cell ranges contains labels.</ahelp></paragraph>
+<bookmark
branch="hid/hid/modules/scalc/ui/definedatabaserangedialog/ContainsTotalsRow"
id="bm_id81722524194567" localize="false"/>
+<h3 id="hd_id411722523496992">Contains totals row</h3>
+<paragraph role="paragraph" id="par_id301722523732163">The database range has
a row for totals.</paragraph>
+<bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/InsertOrDeleteCells"
id="bm_id3156422" localize="false"/>
+<h3 id="hd_id3153970">Insert or delete cells</h3>
+<paragraph role="paragraph" id="par_id3154684"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/InsertOrDeleteCells"
visibility="visible">Automatically inserts new rows and columns into the
database range in your document when new records are added to the
database.</ahelp> To manually update the database range, choose <emph>Data -
Refresh Range</emph>.</paragraph>
+<bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/KeepFormatting"
id="bm_id3151117" localize="false"/>
+<h3 id="hd_id3153768">Keep formatting</h3>
+<paragraph role="paragraph" id="par_id3147435"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/KeepFormatting"
visibility="visible">Applies the existing cell format of headers and first data
row to the whole database range.</ahelp></paragraph>
+<bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/DontSaveImportedData"
id="bm_id3145748" localize="false"/>
+<h3 id="hd_id3155856">Don't save imported data</h3>
+<paragraph role="paragraph" id="par_id3153363"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/DontSaveImportedData"
visibility="visible">Only saves a reference to the database, and not the
contents of the cells.</ahelp></paragraph>
+<h3 id="hd_id3147428">Source:</h3>
+<paragraph role="paragraph" id="par_id3148576">Displays information about the
current database source and any existing operators.</paragraph>
+<h3 id="hd_id251722457576536">Operations:</h3>
+<paragraph role="paragraph" id="par_id461722457896244">Denotes what operations
(if any) have been applied to the database range. For example, “Sort”,
“Filter”, or “Subtotals”.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/12010100.xhp
b/source/text/scalc/01/12010100.xhp
deleted file mode 100644
index f0beaef45a..0000000000
--- a/source/text/scalc/01/12010100.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="textscalc0112010100xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Options</title>
-<filename>/text/scalc/01/12010100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-
-
- <h1 id="hd_id3154760">Options</h1>
- <bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/ContainsColumnLabels"
xml-lang="en-US" id="bm_id3150399" localize="false"/><h3
id="hd_id3153379">Contains column labels</h3>
- <paragraph role="paragraph" id="par_id3148798" xml-lang="en-US"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/ContainsColumnLabels"
visibility="visible">Selected cell ranges contains labels.</ahelp></paragraph>
- <bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/InsertOrDeleteCells"
xml-lang="en-US" id="bm_id3156422" localize="false"/><h3
id="hd_id3153970">Insert or delete cells</h3>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3154684"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/InsertOrDeleteCells"
visibility="visible">Automatically inserts new rows and columns into the
database range in your document when new records are added to the
database.</ahelp> To manually update the database range, choose <emph>Data -
Refresh Range</emph>.</paragraph>
- <bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/KeepFormatting"
xml-lang="en-US" id="bm_id3151117" localize="false"/><h3 id="hd_id3153768">Keep
formatting</h3>
- <paragraph role="paragraph" id="par_id3147435" xml-lang="en-US"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/KeepFormatting"
visibility="visible">Applies the existing cell format of headers and first data
row to the whole database range.</ahelp></paragraph>
- <bookmark
branch="hid/modules/scalc/ui/definedatabaserangedialog/DontSaveImportedData"
xml-lang="en-US" id="bm_id3145748" localize="false"/><h3
id="hd_id3155856">Don't save imported data</h3>
- <paragraph role="paragraph" id="par_id3153363" xml-lang="en-US"><ahelp
hid="modules/scalc/ui/definedatabaserangedialog/DontSaveImportedData"
visibility="visible">Only saves a reference to the database, and not the
contents of the cells.</ahelp></paragraph>
- <h3 id="hd_id3147428">Source:</h3>
- <paragraph role="paragraph" id="par_id3148576" xml-lang="en-US">Displays
information about the current database source and any existing
operators.</paragraph>
- <h2 id="hd_id3146976">More <<</h2>
- <paragraph role="paragraph" id="par_id3149664" xml-lang="en-US">Hides the
additional options.</paragraph>
- </body>
-</helpdocument>
diff --git a/source/text/scalc/guide/database_define.xhp
b/source/text/scalc/guide/database_define.xhp
index c284ec838e..31bf70b0b3 100644
--- a/source/text/scalc/guide/database_define.xhp
+++ b/source/text/scalc/guide/database_define.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,43 +18,43 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textscalcguidedatabase_definexml" indexer="include"
status="PUBLISH">
- <title xml-lang="en-US" id="tit">Defining Database Ranges</title>
+ <title id="tit">Defining Database Ranges</title>
<filename>/text/scalc/guide/database_define.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3154758"><bookmark_value>tables; database ranges</bookmark_value>
+<bookmark branch="index" id="bm_id3154758"><bookmark_value>tables; database
ranges</bookmark_value>
<bookmark_value>database ranges; defining</bookmark_value>
<bookmark_value>ranges; defining database ranges</bookmark_value>
<bookmark_value>defining;database ranges</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3154758" role="heading"
level="1"><variable id="database_define"><link
href="text/scalc/guide/database_define.xhp">Defining a Database Range</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph">You can
define a range of cells in a spreadsheet to use as a database. Each row in this
database range corresponds to a database record and each cell in a row
corresponds to a database field. You can sort, group, search, and perform
calculations on the range as you would in a database.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145801" role="warning">You can
only edit and access a database range in the spreadsheet that contains the
range. You cannot access the database range in the %PRODUCTNAME Data Sources
view. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10648" role="paragraph">To define
a database range</paragraph>
+<h1 id="hd_id3154758"><variable id="database_define"><link
href="text/scalc/guide/database_define.xhp">Defining a Database Range</link>
+</variable></h1>
+ <paragraph id="par_id3153768" role="paragraph">You can define a range of
cells in a spreadsheet to use as a database. Each row in this database range
corresponds to a database record and each cell in a row corresponds to a
database field. You can sort, group, search, and perform calculations on the
range as you would in a database.</paragraph>
+ <warning id="par_id3145801">You can only edit and access a database
range in the spreadsheet that contains the range. You cannot access the
database range in the %PRODUCTNAME Data Sources view. </warning>
+ <paragraph id="par_idN10648" role="paragraph">To define a database
range</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155064"
role="listitem">Select the range of cells that you want to define as a database
range.</paragraph>
+ <paragraph id="par_id3155064" role="listitem">Select the range of
cells that you want to define as a database range.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10654"
role="listitem">Choose <item type="menuitem">Data - Define
Range</item>.</paragraph>
+ <paragraph id="par_idN10654" role="listitem">Choose <menuitem>Data
- Define Range</menuitem>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153715" role="listitem">In
the <emph>Name</emph> box, enter a name for the database range.</paragraph>
+ <paragraph id="par_id3153715" role="listitem">In the
<emph>Name</emph> box, enter a name for the database range.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN1066A"
role="listitem">Click <emph>More</emph>.</paragraph>
+ <paragraph id="par_idN1066A" role="listitem">Click
<emph>Options</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154253"
role="listitem">Specify the options for the database range.</paragraph>
+ <paragraph id="par_id3154253" role="listitem">Specify the options
for the database range.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10675"
role="listitem">Click <emph>OK</emph>.</paragraph>
+ <paragraph id="par_idN10675" role="listitem">Click
<emph>OK</emph>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
@@ -62,4 +62,4 @@
<embed href="text/scalc/guide/database_filter.xhp#database_filter"/>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
