[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text
Caolán McNamara
caolanm at redhat.com
Wed Aug 21 07:45:33 PDT 2013
helpers/help_hid.lst | 15 ---------------
source/text/swriter/01/04090003.xhp | 2 +-
source/text/swriter/01/04090006.xhp | 32 ++++++++++++++++----------------
3 files changed, 17 insertions(+), 32 deletions(-)
New commits:
commit f027aa3baedd3fc88746fb3373da95c02a98f55c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 21 15:26:18 2013 +0100
drop helpds that go nowhere
Change-Id: I6eff9bdabbb4738e7cdfd40c463b2000ba6a27ea
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 93e76a2..c8b9fef 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1591,12 +1591,6 @@ HID_EDITENG_SPELLER_AUTOCORRECT,34068,
HID_EDITENG_SPELLER_IGNORE,34067,
HID_EDITENG_SPELLER_START,34065,
HID_EDIT_COMMENT,53056,
-HID_EDIT_FLD_DB,53220,
-HID_EDIT_FLD_DOK,53223,
-HID_EDIT_FLD_DOKINF,53221,
-HID_EDIT_FLD_FUNC,53224,
-HID_EDIT_FLD_REF,53225,
-HID_EDIT_FLD_VAR,53222,
HID_EDIT_FORMULA,53896,
HID_EDIT_MODULES,34169,
HID_EDIT_WIN,52821,
commit acac48f776fd3520a8d5cb0d375ac148b8698330
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 21 14:52:09 2013 +0100
update help ids for database field .ui page conversion
Change-Id: If0a222b86277e85bcb18fe03185a90f1d1bcbc44
(cherry picked from commit 37a817df16f4148d6283ed3cba735850c35bc714)
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ac4d32a..93e76a2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1732,7 +1732,6 @@ HID_FIRSTSTART_FINISH,42782,
HID_FIRSTSTART_NEXT,42780,
HID_FIRSTSTART_PREV,42779,
HID_FLDEDT_ADDRESS,53049,
-HID_FLD_DB,53205,
HID_FLD_DROPDOWN,54954,
HID_FM_CTL_SELECTION,59884,
HID_FM_DLG_SEARCH,38177,
@@ -7469,8 +7468,6 @@ sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035,
sw_Edit_DLG_MM_QUERY_ED_TEXT,1435469884,
sw_Edit_DLG_MM_SAVEWARNING_ED_FILENAME,1435453444,
sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY,1435322396,
-sw_Edit_TP_FLD_DB_ED_DBCONDITION,878708744,
-sw_Edit_TP_FLD_DB_ED_DBSETNUMBER,878708745,
sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
sw_Edit_TP_GRF_EXT_ED_CONNECT,878233654,
sw_Edit_TP_LINENUMBERING_ED_DIVISOR,878888975,
@@ -7532,9 +7529,6 @@ sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS,898305573,
sw_ListBox_DLG_MULTMRK_LB_TOX,1433456132,
sw_ListBox_TP_CONDCOLL_LB_FILTER,878448136,
sw_ListBox_TP_CONDCOLL_LB_STYLE,878448135,
-sw_ListBox_TP_FLD_DB_LB_DBFORMAT,878710282,
-sw_ListBox_TP_FLD_DB_LB_DBNUMFORMAT,878710283,
-sw_ListBox_TP_FLD_DB_LB_DBTYPE,878710274,
sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631,
sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629,
sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796,
@@ -7690,7 +7684,6 @@ sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
sw_PushButton_TP_CONDCOLL_PB_ASSIGN,878449162,
sw_PushButton_TP_CONDCOLL_PB_REMOVE,878449161,
-sw_PushButton_TP_FLD_DB_PB_ADDDB,878711313,
sw_PushButton_TP_GRF_EXT_PB_BROWSE,878236213,
sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287,
@@ -7743,8 +7736,6 @@ sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_DEPENDENT,1435320859,
sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_NEVER,1435320857,
sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528,
sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529,
-sw_RadioButton_TP_FLD_DB_RB_DBFORMAT,878707212,
-sw_RadioButton_TP_FLD_DB_RB_DBOWNFORMAT,878707213,
sw_RadioButton_TP_FOOTNOTE_PAGE_RB_MAXHEIGHT,877953538,
sw_RadioButton_TP_FOOTNOTE_PAGE_RB_MAXHEIGHT_PAGE,877953537,
sw_RadioButton_TP_FORMAT_TABLE_RB_CENTER,878215692,
diff --git a/source/text/swriter/01/04090003.xhp b/source/text/swriter/01/04090003.xhp
index a2d055c..dc25ad8 100644
--- a/source/text/swriter/01/04090003.xhp
+++ b/source/text/swriter/01/04090003.xhp
@@ -122,7 +122,7 @@
<paragraph role="paragraph" id="par_id3151329" xml-lang="en-US" l10n="U" oldref="17">For function fields, the format field is only used for fields of the type placeholder. Here, the format determines the object for which the placeholder stands.</paragraph>
<section id="bedingung">
<paragraph role="heading" id="hd_id3149494" xml-lang="en-US" level="2" l10n="U" oldref="18">Condition</paragraph>
-<paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBCONDITION">For fields linked to a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link>, enter the criteria here.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="hid/modules/swriter/ui/flddbpage/condition">For fields linked to a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link>, enter the criteria here.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldfuncpage/cond1" id="bm_id3151259" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldfuncpage/cond2" id="bm_id3151262" localize="false"/>
diff --git a/source/text/swriter/01/04090006.xhp b/source/text/swriter/01/04090006.xhp
index 5b59342..13859ca 100644
--- a/source/text/swriter/01/04090006.xhp
+++ b/source/text/swriter/01/04090006.xhp
@@ -28,14 +28,14 @@
</meta>
<body>
<section id="datenbank">
-<bookmark xml-lang="en-US" branch="hid/SW_HID_FLD_DB" id="bm_id3151315" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/FldDbPage" id="bm_id3151315" localize="false"/>
<paragraph role="heading" id="hd_id3153536" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090006.xhp" name="Database">Database</link></paragraph>
<paragraph role="paragraph" id="par_id3154471" xml-lang="en-US" l10n="U" oldref="2">You can insert fields from any database, for example, address fields, into your document.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#felddatenbank"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/type" id="bm_id3154566" localize="false"/>
<paragraph role="paragraph" id="par_id090220080439090" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3155894">
@@ -91,32 +91,32 @@
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_DB_SELECTION_TLB" id="bm_id3145262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/select" id="bm_id3145262" localize="false"/>
<paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="17">Database Selection</paragraph>
-<paragraph role="paragraph" id="par_id3145268" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_DB_SELECTION_TLB">Select the database table or the database query that you want the field to refer to.</ahelp> You can include fields from more than one database or query in a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/>
+<paragraph role="paragraph" id="par_id3145268" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="modules/swriter/ui/flddbpage/select">Select the database table or the database query that you want the field to refer to.</ahelp> You can include fields from more than one database or query in a document.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/condition" id="bm_id3150559" localize="false"/>
<paragraph role="paragraph" id="par_id0902200804391084" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For fields linked to a condition, enter the criteria here.</ahelp></paragraph>
<embed href="text/swriter/01/04090003.xhp#bedingung"/>
<paragraph role="paragraph" id="par_id3147739" xml-lang="en-US" l10n="U" oldref="19">If you want, you can assign a condition that must be met before the contents of the "Any Record" and "Next Record" fields are inserted. The default condition is "True", that is, the condition is always true if you do not change the condition text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/recnumber" id="bm_id3149831" localize="false"/>
<paragraph role="heading" id="hd_id3146336" xml-lang="en-US" level="2" l10n="U" oldref="20">Record number</paragraph>
-<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER">Enter the number of the record that you want to insert when the condition that you specify is met.</ahelp> The record number corresponds to the current selection in the data source view. For example, if you select the last 5 records in a database containing 10 records, the number of the first record will be 1, and not 6.</paragraph>
+<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="modules/swriter/ui/flddbpage/recnumber">Enter the number of the record that you want to insert when the condition that you specify is met.</ahelp> The record number corresponds to the current selection in the data source view. For example, if you select the last 5 records in a database containing 10 records, the number of the first record will be 1, and not 6.</paragraph>
<paragraph role="note" id="par_id3153305" xml-lang="en-US" l10n="U" oldref="22">If you refer to fields in a different database (or in a different table or query within the same database), $[officename] determines the record number relative to the current selection.</paragraph>
<paragraph role="heading" id="hd_id3156109" xml-lang="en-US" level="2" l10n="U" oldref="23">Format</paragraph>
<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid=".">Select the format of the field that you want to insert. This option is available for numerical, boolean, date and time fields.</ahelp><comment>see #i64135</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/fromdatabasecb" id="bm_id3150915" localize="false"/>
<paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3" l10n="U" oldref="25">From database</paragraph>
-<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT">Uses the format defined in the selected database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_FLD_DB:PB_ADDDB" id="bm_id5024262" localize="false"/>
+<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="modules/swriter/ui/flddbpage/fromdatabasecb">Uses the format defined in the selected database.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/browse" id="bm_id5024262" localize="false"/>
<paragraph role="heading" id="par_idN1076E" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
-<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US" l10n="NEW"><ahelp hid="878711313">Opens a file open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/>
+<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US" l10n="NEW"><ahelp hid="modules/swriter/ui/flddbpage/browse">Opens a file open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/userdefinedcb" id="bm_id3154326" localize="false"/>
<paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="3" l10n="U" oldref="27">User defined</paragraph>
-<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT">Applies the format that you select in the <emph>List of user-defined formats</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT" id="bm_id3150084" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/>
+<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="modules/swriter/ui/flddbpage/userdefinedcb">Applies the format that you select in the <emph>List of user-defined formats</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/numformat" id="bm_id3150084" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/format" id="bm_id3150087" localize="false"/>
<paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="29">List of user-defined formats</paragraph>
-<paragraph role="paragraph" id="par_id3150093" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT">Lists the available user-defined formats.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150093" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="modules/swriter/ui/flddbpage/format">Lists the available user-defined formats.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/>
<paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="2" l10n="NEW">Printing a form letter</paragraph>
<paragraph role="paragraph" id="par_idN10803" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you print a document that contains database fields, a dialog asks you if you want to print a form letter. If you answer Yes, the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog opens where you can select the database records to print.</ahelp></paragraph>
More information about the Libreoffice-commits
mailing list