AllLangHelp_shared.mk | 1 source/text/shared/00/00000010.xhp | 2 source/text/shared/01/03150100.xhp | 46 ----------------- source/text/shared/autopi/01090100.xhp | 4 + source/text/shared/explorer/database/tablewizard02.xhp | 4 + source/text/shared/explorer/database/tablewizard03.xhp | 2 6 files changed, 10 insertions(+), 49 deletions(-)
New commits: commit 5cce73dd589d3b2e8818228c95db28c29bad1f2f Author: Gabor Kelemen <[email protected]> Date: Tue Dec 12 00:22:02 2017 +0100 Fix extended help in Table Wizard of Base Add missing HIDs and fix a broken one Change-Id: I4478cdd2e10bf994509c828444701c5875bc3125 Reviewed-on: https://gerrit.libreoffice.org/46269 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Gabor Kelemen <[email protected]> (cherry picked from commit ed6eecfc6f33cb7cbd33996dcd2d0f07f6e04405) Reviewed-on: https://gerrit.libreoffice.org/46299 diff --git a/source/text/shared/autopi/01090100.xhp b/source/text/shared/autopi/01090100.xhp index 9b8d6ce9f..fdf5c130a 100644 --- a/source/text/shared/autopi/01090100.xhp +++ b/source/text/shared/autopi/01090100.xhp @@ -52,6 +52,7 @@ <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED" id="bm_id5681936" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVESELECTED" id="bm_id5441755" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED" id="bm_id5441756" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED" id="bm_id4933927" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED" id="bm_id9028595" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED" id="bm_id2095095" localize="false"/> @@ -81,6 +82,7 @@ <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL" id="bm_id1483504" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDREMOVEALL" id="bm_id86672" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED" id="bm_id86673" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL" id="bm_id9287697" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL" id="bm_id4853053" localize="false"/> <paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2"><<</paragraph> @@ -90,6 +92,7 @@ <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP" id="bm_id3334452" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID2_BTN_DOC_UP" id="bm_id915860" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVEUP" id="bm_id5749382" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP" id="bm_id5749383" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CMDMOVEUP" id="bm_id710776" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" id="bm_id2638019" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP" id="bm_id1707815" localize="false"/> @@ -100,6 +103,7 @@ <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN" id="bm_id5430463" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID2_BTN_DOC_DOWN" id="bm_id2385937" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVEDOWN" id="bm_id1741691" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN" id="bm_id1741691" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id632038" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" id="bm_id6198309" localize="false"/> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN" id="bm_id6916714" localize="false"/> diff --git a/source/text/shared/explorer/database/tablewizard02.xhp b/source/text/shared/explorer/database/tablewizard02.xhp index 1d394ae8e..f6f149f72 100644 --- a/source/text/shared/explorer/database/tablewizard02.xhp +++ b/source/text/shared/explorer/database/tablewizard02.xhp @@ -43,16 +43,20 @@ <paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2">Field information</paragraph> <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_COLNAME" id="bm_id1665089" localize="false"/><paragraph role="heading" id="par_idN10586" xml-lang="en-US" level="3">Field name</paragraph> <paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US"><ahelp hid=".">Displays the name of the selected data field. If you want, you can enter a new name.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_TYPE" id="bm_id1665090" localize="false"/> <paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="3">Field type</paragraph> <paragraph role="paragraph" id="par_idN10591" xml-lang="en-US"><ahelp hid=".">Select a field type.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_AUTOINCREMENT" id="bm_id1055330" localize="false"/><paragraph role="heading" id="hd_id5486922" xml-lang="en-US" level="3">AutoValue</paragraph> <paragraph role="paragraph" id="par_id4198736" xml-lang="en-US"><ahelp hid=".">If set to Yes, the values for this data field are generated by the database engine.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_REQUIRED" id="bm_id3498336" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="3">Entry required</paragraph> <paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US"><ahelp hid=".">If set to Yes, this field must not be empty.</ahelp><comment>not in spec doc</comment></paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_LEN" id="bm_id3498337" localize="false"/> <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="3">Length</paragraph> <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US"><ahelp hid=".">Specifies the number of characters for the data field.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_SCALE" id="bm_id3498338" localize="false"/> <paragraph role="heading" id="par_idN1059B" xml-lang="en-US" level="3">Decimal places</paragraph> <paragraph role="paragraph" id="par_idN1059F" xml-lang="en-US"><ahelp hid=".">Specifies the number of decimal places for the data field. This option is only available for numerical or decimal data fields.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_BOOL_DEFAULT" id="bm_id3498339" localize="false"/> <paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="3">Default value</paragraph> <paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US"><ahelp hid=".">Specifies the default value for a Yes/No field.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_AUTOINCREMENTVALUE" id="bm_id8732871.00000001" localize="false"/><paragraph role="heading" id="par_idN10730" xml-lang="en-US" level="3">Auto-increment statement</paragraph> diff --git a/source/text/shared/explorer/database/tablewizard03.xhp b/source/text/shared/explorer/database/tablewizard03.xhp index d09aa8e2f..68597bcf0 100644 --- a/source/text/shared/explorer/database/tablewizard03.xhp +++ b/source/text/shared/explorer/database/tablewizard03.xhp @@ -60,7 +60,7 @@ <paragraph role="paragraph" id="par_idN10587" xml-lang="en-US"><ahelp hid=".">Select a field and click > to add it to the list of primary key fields.</ahelp></paragraph> <embed href="text/shared/autopi/01090100.xhp#uebernehmen"/> <embed href="text/shared/autopi/01090100.xhp#entfernen"/> -<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED" id="bm_id8829309" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED" id="bm_id8829309" localize="false"/> <paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="4">Primary key fields</paragraph> <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US"><ahelp hid=".">Select a field and click < to remove it from the list of primary key fields. The primary key is created as a concatenation of the fields in this list, from top to bottom.</ahelp></paragraph> <paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US"><link href="text/shared/explorer/database/tablewizard04.xhp" name="Table Wizard - Create table">Table Wizard - Create table</link></paragraph> commit f7c555e40d979db2916a9e22be5b1782967904f3 Author: Gabor Kelemen <[email protected]> Date: Mon Dec 11 00:01:22 2017 +0100 Remove unnecessary page from Gallery context menus explanation The confirmation window is a simple Yes/No now, no need to keep a whole page for this. Change-Id: I182d4937d049ae62e0b62180ed94115369aea2c7 Reviewed-on: https://gerrit.libreoffice.org/46268 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Gabor Kelemen <[email protected]> (cherry picked from commit 83d2ccb8248fbe24ccb0206b60d6f15c439f07f6) Reviewed-on: https://gerrit.libreoffice.org/46298 diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index fe7a85d80..e1b0bfdca 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -142,7 +142,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/03050000 \ helpcontent2/source/text/shared/01/03060000 \ helpcontent2/source/text/shared/01/03110000 \ - helpcontent2/source/text/shared/01/03150100 \ helpcontent2/source/text/shared/01/03170000 \ helpcontent2/source/text/shared/01/03990000 \ helpcontent2/source/text/shared/01/04050000 \ diff --git a/source/text/shared/00/00000010.xhp b/source/text/shared/00/00000010.xhp index 1d13d1e6d..0e3e59413 100644 --- a/source/text/shared/00/00000010.xhp +++ b/source/text/shared/00/00000010.xhp @@ -53,7 +53,7 @@ </section> <section id="loeschen"> <bookmark branch="hid/SID_EXPLORERCONTENT_DESTROY" xml-lang="en-US" id="bm_id3155355" localize="false"/><paragraph role="heading" level="2" id="hd_id3148620" xml-lang="en-US">Delete</paragraph> - <paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><ahelp visibility="visible" hid="SID_EXPLORERCONTENT_DESTROY">Deletes the current selection. If multiple objects are selected, all will be deleted. In most cases, a <link href="text/shared/01/03150100.xhp" name="security query">security query</link> appears before objects are deleted.</ahelp></paragraph> + <paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><ahelp visibility="visible" hid="SID_EXPLORERCONTENT_DESTROY">Deletes the current selection. If multiple objects are selected, all will be deleted. In most cases, a confirmation question appears before objects are deleted.</ahelp></paragraph> <paragraph role="paragraph" id="par_id3155941" xml-lang="en-US">The object is either physically deleted from the data carrier or the object display is removed, depending on context.</paragraph> </section> <section id="loeschen2"> diff --git a/source/text/shared/01/03150100.xhp b/source/text/shared/01/03150100.xhp deleted file mode 100644 index 241ca35ff..000000000 --- a/source/text/shared/01/03150100.xhp +++ /dev/null @@ -1,46 +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="textshared0103150100xml" indexer="include" status="PUBLISH"> -<title xml-lang="en-US" id="tit">Confirm Delete</title> -<filename>/text/shared/01/03150100.xhp</filename> -</topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -</history> -</meta> -<body> - - - <!-- removed HID SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE --><paragraph role="heading" level="1" id="hd_id3150278" xml-lang="en-US">Confirm Delete</paragraph> - <paragraph role="paragraph" id="par_id3148668" xml-lang="en-US"><ahelp hid="SFX2:MODALDIALOG:DLG_SFX_QUERYDELETE" visibility="visible">Confirms or cancels the deletion.</ahelp></paragraph> - <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES --><paragraph role="heading" level="2" id="hd_id3152821" xml-lang="en-US">Delete</paragraph> - <paragraph role="paragraph" id="par_id3150040" xml-lang="en-US"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_YES" visibility="visible">Performs the deletion in the current file.</ahelp></paragraph> - <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL --><paragraph role="heading" level="2" id="hd_id3149999" xml-lang="en-US">Delete All</paragraph> - <paragraph role="paragraph" id="par_id3155616" xml-lang="en-US"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_ALL" visibility="visible">Performs the deletion in all selected files.</ahelp></paragraph> - <!-- removed HID SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO --><paragraph role="heading" level="2" id="hd_id3157991" xml-lang="en-US">Do Not Delete</paragraph> - <paragraph role="paragraph" id="par_id3147043" xml-lang="en-US"><ahelp hid="SFX2:PUSHBUTTON:DLG_SFX_QUERYDELETE:BTN_NO" visibility="visible">Rejects the deletion for the current file.</ahelp></paragraph> - <paragraph role="heading" level="2" id="hd_id3149346" xml-lang="en-US">Cancel</paragraph> - <paragraph role="paragraph" id="par_id3148620" xml-lang="en-US">Cancels the deletion in the current file and any other selected files.</paragraph> - </body> -</helpdocument> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
