helpers/help_hid.lst | 46 -------------------
source/text/shared/explorer/database/05030300.xhp | 12 ++---
source/text/shared/explorer/database/05030400.xhp | 28 +++++------
source/text/shared/explorer/database/11020000.xhp | 4 -
source/text/shared/explorer/database/11030000.xhp | 8 +--
source/text/swriter/01/01150000.xhp | 52 +++++++++++-----------
6 files changed, 52 insertions(+), 98 deletions(-)
New commits:
commit cc5bb5cd5316199307fcafa59583314f040b8733
Author: David Tardon <dtar...@redhat.com>
Date: Wed Aug 6 17:46:02 2014 +0200
update help ids for Mail Merge dialog
Change-Id: Id72168754b58edc5232fd965687652fc3813efc3
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2d5b291..d33cab6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5571,11 +5571,6 @@ sw_CheckBox_DLG_GLOSSARY_CB_FILE_REL,1428636740,
sw_CheckBox_DLG_GLOSSARY_CB_INSERT_TIP,1428636677,
sw_CheckBox_DLG_GLOSSARY_CB_NET_REL,1428636741,
sw_CheckBox_DLG_GLOSSARY_CB_SHOW_EXAMPLE,1428636745,
-sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_HTML,1446609941,
-sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
-sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
-sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
-sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -5604,9 +5599,6 @@ sw_CheckBox_TP_TABLE_TEXTFLOW_CB_SPLIT,878511249,
sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626,
sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700,
sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
-sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
-sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
-sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
sw_Edit_TP_LINENUMBERING_ED_DIVISOR,878888975,
sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627,
@@ -5615,9 +5607,6 @@ sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832,
sw_ListBox_DLG_BIB_BASE_LB_PATH,1428721160,
sw_ListBox_DLG_COLUMN_LB_APPLY_TO,1417874998,
sw_ListBox_DLG_FLD_DROPDOWN_LB_LISTITEMS,1419644418,
-sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
-sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
-sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631,
sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629,
sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796,
@@ -5663,8 +5652,6 @@ sw_MetricField_TP_TABLE_COLUMN_ED_SPACE,888494718,
sw_ModalDialog_DLG_CHANGE_DB,1419591680,
sw_ModalDialog_DLG_DBSELECTION,1435009024,
sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
-sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
-sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073,
@@ -5684,20 +5671,10 @@ sw_PushButton_DLG_GLOSSARY_PB_PATH,1428640312,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_CLOSE,1972294214,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
-sw_PushButton_DLG_MAILMERGE_PB_ATTACH,1446613538,
-sw_PushButton_DLG_MAILMERGE_PB_PATH,1446613530,
sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287,
-sw_RadioButton_DLG_MAILMERGE_RB_ALL,1446609410,
-sw_RadioButton_DLG_MAILMERGE_RB_FILE,1446609431,
-sw_RadioButton_DLG_MAILMERGE_RB_FROM,1446609412,
-sw_RadioButton_DLG_MAILMERGE_RB_MAILING,1446609420,
-sw_RadioButton_DLG_MAILMERGE_RB_MARKED,1446609411,
-sw_RadioButton_DLG_MAILMERGE_RB_PRINTER,1446609419,
-sw_RadioButton_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL,1446609448,
-sw_RadioButton_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC,1446609447,
sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528,
sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529,
sw_RadioButton_TP_FOOTNOTE_PAGE_RB_MAXHEIGHT,877953538,
diff --git a/source/text/swriter/01/01150000.xhp
b/source/text/swriter/01/01150000.xhp
index a36dbe8..0eba869 100644
--- a/source/text/swriter/01/01150000.xhp
+++ b/source/text/swriter/01/01150000.xhp
@@ -37,39 +37,39 @@
<paragraph role="paragraph" id="par_id3154102" xml-lang="en-US" l10n="U"
oldref="4">During printing, the database information replaces the corresponding
database fields (placeholders). For more information about inserting database
fields refer to the <link href="text/swriter/01/04090006.xhp"
name="Database"><emph>Database</emph></link> tab page under <emph>Insert -
Fields - Other</emph>.</paragraph><comment>db browser explorer</comment>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TLB_TREELISTBOX"
id="bm_id5399029" localize="false"/><paragraph role="paragraph"
id="par_id8186895" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Select a database and table.</ahelp></paragraph><comment>db
browser records</comment>
-<bookmark xml-lang="en-US"
branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC" id="bm_id7246620"
localize="false"/><paragraph role="paragraph" id="par_id3101901"
xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create
one big document containing all data records.</ahelp></paragraph><comment>save
as individual documents</comment>
-<bookmark xml-lang="en-US"
branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL" id="bm_id6964323"
localize="false"/><paragraph role="paragraph" id="par_id5345011"
xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create
one document for every one data record.</ahelp></paragraph><comment>generate
file name from database</comment>
-<bookmark xml-lang="en-US"
branch="hid/SW_CHECKBOX_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE"
id="bm_id6631672" localize="false"/><paragraph role="paragraph"
id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Generate each file name from data contained in a
database.</ahelp><comment>UFI: sorry, spec doc has no more info about the
specifics</comment></paragraph><comment>file format</comment>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_DLG_MAILMERGE_LB_FILTER"
id="bm_id8452711" localize="false"/><paragraph role="paragraph"
id="par_id8992889" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Select the file format.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/singledocument" id="bm_id7246620"
localize="false"/><paragraph role="paragraph" id="par_id3101901"
xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create
one big document containing all data records.</ahelp></paragraph><comment>save
as individual documents</comment>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/individualdocuments" id="bm_id6964323"
localize="false"/><paragraph role="paragraph" id="par_id5345011"
xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create
one document for every one data record.</ahelp></paragraph><comment>generate
file name from database</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/generate"
id="bm_id6631672" localize="false"/><paragraph role="paragraph"
id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Generate each file name from data contained in a
database.</ahelp><comment>UFI: sorry, spec doc has no more info about the
specifics</comment></paragraph><comment>file format</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/mailmerge/fileformat"
id="bm_id8452711" localize="false"/><paragraph role="paragraph"
id="par_id8992889" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Select the file format.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154482" xml-lang="en-US" level="2"
l10n="U" oldref="5">Records</paragraph>
<paragraph role="paragraph" id="par_id3154565" xml-lang="en-US" l10n="U"
oldref="6">Determines the number of records for printing the form letter. One
letter will be printed for each record.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_ALL"
id="bm_id3149685" localize="false"/><paragraph role="heading" id="hd_id3155896"
xml-lang="en-US" level="3" l10n="U" oldref="7">All</paragraph>
-<paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="U"
oldref="8"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_ALL">Processes all the
records from the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_MARKED"
id="bm_id3143279" localize="false"/><paragraph role="heading" id="hd_id3155186"
xml-lang="en-US" level="3" l10n="U" oldref="9">Selected records</paragraph>
-<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U"
oldref="10"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_MARKED">Processes only
the marked records from the database. This option is only available when you
have previously marked the necessary records in the
database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_FROM"
id="bm_id3149097" localize="false"/><paragraph role="heading" id="hd_id3149819"
xml-lang="en-US" level="3" l10n="U" oldref="23">From</paragraph>
-<paragraph role="paragraph" id="par_id3149104" xml-lang="en-US" l10n="U"
oldref="24"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_FROM">Specifies which
records to include in your form letter.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MAILMERGE:NF_FROM"
id="bm_id3148978" localize="false"/><paragraph role="heading" id="hd_id3151260"
xml-lang="en-US" level="3" l10n="U" oldref="11">From:</paragraph>
-<paragraph role="paragraph" id="par_id3149034" xml-lang="en-US" l10n="U"
oldref="12"><ahelp hid="SW:NUMERICFIELD:DLG_MAILMERGE:NF_FROM">Specifies the
number of the first record to be printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:DLG_MAILMERGE:NF_TO"
id="bm_id3153643" localize="false"/><paragraph role="heading" id="hd_id3153631"
xml-lang="en-US" level="3" l10n="U" oldref="25">To:</paragraph>
-<paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="U"
oldref="26"><ahelp hid="SW:NUMERICFIELD:DLG_MAILMERGE:NF_TO">Specifies the
number of the last record to be printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/all"
id="bm_id3149685" localize="false"/><paragraph role="heading" id="hd_id3155896"
xml-lang="en-US" level="3" l10n="U" oldref="7">All</paragraph>
+<paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="U"
oldref="8"><ahelp hid="modules/swriter/ui/mailmerge/all">Processes all the
records from the database.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/selected"
id="bm_id3143279" localize="false"/><paragraph role="heading" id="hd_id3155186"
xml-lang="en-US" level="3" l10n="U" oldref="9">Selected records</paragraph>
+<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U"
oldref="10"><ahelp hid="modules/swriter/ui/mailmerge/selected">Processes only
the marked records from the database. This option is only available when you
have previously marked the necessary records in the
database.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/rbfrom"
id="bm_id3149097" localize="false"/><paragraph role="heading" id="hd_id3149819"
xml-lang="en-US" level="3" l10n="U" oldref="23">From</paragraph>
+<paragraph role="paragraph" id="par_id3149104" xml-lang="en-US" l10n="U"
oldref="24"><ahelp hid="modules/swriter/ui/mailmerge/rbfrom">Specifies which
records to include in your form letter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/from"
id="bm_id3148978" localize="false"/><paragraph role="heading" id="hd_id3151260"
xml-lang="en-US" level="3" l10n="U" oldref="11">From:</paragraph>
+<paragraph role="paragraph" id="par_id3149034" xml-lang="en-US" l10n="U"
oldref="12"><ahelp hid="modules/swriter/ui/mailmerge/from">Specifies the number
of the first record to be printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/to"
id="bm_id3153643" localize="false"/><paragraph role="heading" id="hd_id3153631"
xml-lang="en-US" level="3" l10n="U" oldref="25">To:</paragraph>
+<paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="U"
oldref="26"><ahelp hid="modules/swriter/ui/mailmerge/to">Specifies the number
of the last record to be printed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="2"
l10n="U" oldref="13">Output</paragraph>
<paragraph role="paragraph" id="par_id3155138" xml-lang="en-US" l10n="U"
oldref="14">Determines whether to send your form letters to a printer or save
them to a file.</paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_PRINTER" id="bm_id3150497"
localize="false"/><paragraph role="heading" id="hd_id3150485" xml-lang="en-US"
level="3" l10n="U" oldref="15">Printer</paragraph>
-<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U"
oldref="16"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_PRINTER">Prints the
form letters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MAILMERGE:RB_FILE"
id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3145773"
xml-lang="en-US" level="3" l10n="U" oldref="39">File</paragraph>
-<paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U"
oldref="40"><ahelp hid="SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILE">Saves the form
letters in files.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS" id="bm_id3151383"
localize="false"/><paragraph role="heading" id="hd_id3151371" xml-lang="en-US"
level="3" l10n="U" oldref="35">Single print jobs</paragraph>
-<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U"
oldref="36"><ahelp hid="SW:CHECKBOX:DLG_MAILMERGE:CB_SINGLE_JOBS">Prints each
form letter individually with the selected printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MAILMERGE:ED_PATH"
id="bm_id3150122" localize="false"/><paragraph role="heading" id="hd_id3150111"
xml-lang="en-US" level="3" l10n="U" oldref="41">Path</paragraph>
-<paragraph role="paragraph" id="par_id3150687" xml-lang="en-US" l10n="U"
oldref="42"><ahelp hid="SW:EDIT:DLG_MAILMERGE:ED_PATH">Specifies the path to
store the form letters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MAILMERGE:PB_PATH"
id="bm_id3147423" localize="false"/><paragraph role="heading" id="hd_id3147412"
xml-lang="en-US" level="3" l10n="U" oldref="43">...</paragraph>
-<paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U"
oldref="44"><ahelp hid="SW:PUSHBUTTON:DLG_MAILMERGE:PB_PATH">Opens the<emph>
Select Path </emph>dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/printer"
id="bm_id3150497" localize="false"/><paragraph role="heading" id="hd_id3150485"
xml-lang="en-US" level="3" l10n="U" oldref="15">Printer</paragraph>
+<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U"
oldref="16"><ahelp hid="modules/swriter/ui/mailmerge/printer">Prints the form
letters.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/file"
id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3145773"
xml-lang="en-US" level="3" l10n="U" oldref="39">File</paragraph>
+<paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U"
oldref="40"><ahelp hid="modules/swriter/ui/mailmerge/file">Saves the form
letters in files.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/singlejobs" id="bm_id3151383"
localize="false"/><paragraph role="heading" id="hd_id3151371" xml-lang="en-US"
level="3" l10n="U" oldref="35">Single print jobs</paragraph>
+<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U"
oldref="36"><ahelp hid="modules/swriter/ui/mailmerge/singlejobs">Prints each
form letter individually with the selected printer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/path"
id="bm_id3150122" localize="false"/><paragraph role="heading" id="hd_id3150111"
xml-lang="en-US" level="3" l10n="U" oldref="41">Path</paragraph>
+<paragraph role="paragraph" id="par_id3150687" xml-lang="en-US" l10n="U"
oldref="42"><ahelp hid="modules/swriter/ui/mailmerge/path">Specifies the path
to store the form letters.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/pathpb"
id="bm_id3147423" localize="false"/><paragraph role="heading" id="hd_id3147412"
xml-lang="en-US" level="3" l10n="U" oldref="43">...</paragraph>
+<paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U"
oldref="44"><ahelp hid="modules/swriter/ui/mailmerge/pathpb">Opens the<emph>
Select Path </emph>dialog.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3"
l10n="U" oldref="49">Generate file name from</paragraph>
<paragraph role="paragraph" id="par_id3150547" xml-lang="en-US" l10n="U"
oldref="50">Specifies how the file name is generated.</paragraph>
<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_COLUMN -->
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MAILMERGE:LB_COLUMN"
id="bm_id3147747" localize="false"/><paragraph role="heading" id="hd_id3150561"
xml-lang="en-US" level="4" l10n="U" oldref="45">Database field</paragraph>
-<paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U"
oldref="46"><ahelp hid="SW:LISTBOX:DLG_MAILMERGE:LB_COLUMN">Uses the content of
the selected data field as the file name for the form
letter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/field"
id="bm_id3147747" localize="false"/><paragraph role="heading" id="hd_id3150561"
xml-lang="en-US" level="4" l10n="U" oldref="45">Database field</paragraph>
+<paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U"
oldref="46"><ahelp hid="modules/swriter/ui/mailmerge/field">Uses the content of
the selected data field as the file name for the form
letter.</ahelp></paragraph>
<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILENAME -->
<!-- removed HID SW:EDIT:DLG_MAILMERGE:ED_FILENAME --><paragraph
role="heading" id="hd_id3149848" xml-lang="en-US" level="4" l10n="U"
oldref="47">Manual setting</paragraph>
<paragraph role="paragraph" id="par_id3153289" xml-lang="en-US" l10n="U"
oldref="48"><ahelp hid="SW:EDIT:DLG_MAILMERGE:ED_FILENAME">Creates the file
name based on the text you enter, followed by a serial
number.</ahelp></paragraph>
commit 2cb8244254dc3dd995059b5ac34c640ac4b3d0bf
Author: David Tardon <dtar...@redhat.com>
Date: Wed Aug 6 17:31:17 2014 +0200
update help ids for NameMatching and TypeSelect
Change-Id: If7e9c8ac4206953decc14f5bca5aaccb0628871f
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a227185..2d5b291 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3045,9 +3045,6 @@ HID_TAB_ENT_REQUIRED,38898,
HID_TAB_ENT_SCALE,38905,
HID_TAB_ENT_TEXT_LEN,38900,
HID_TAB_ENT_TYPE,38901,
-HID_TAB_NAMEMATCHING_COLS_ASSIGN,38917,
-HID_TAB_NAMEMATCHING_COLS_AVAIL,38916,
-HID_TAB_WIZ_TYPE_SELECT,38915,
HID_TBXCONTROL_FILENEW,33360,
HID_TEMPLATEDLG_DIALOG,32989,
HID_TEMPLATEDLG_FILEVIEW,32991,
@@ -4978,10 +4975,6 @@ dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059,
dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928,
dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN,851635725,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT,851635727,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP,851635724,
-dbaccess_ImageButton_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT,851635726,
dbaccess_ListBox_DLG_ADABASSTAT_LB_DATADEVS,1388613121,
dbaccess_ListBox_DLG_PARAMETERS_LB_ALLPARAMS,1388400129,
dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST,851447299,
@@ -4990,25 +4983,19 @@ dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840,
dbaccess_ModalDialog_DLG_PARAMETERS,1388396544,
dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528,
dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768,
-dbaccess_MultiListBox_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES,851610626,
dbaccess_NumericField_DLG_ADABASSTAT_ET_MEMORYUSING,1388615683,
dbaccess_NumericField_PAGE_ADABAS_NF_CACHE_SIZE,851531778,
dbaccess_NumericField_PAGE_ADABAS_NF_DATA_INCREMENT,851531777,
dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153,
-dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT,851448326,
-dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_ALL,851628560,
-dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_NONE,851628561,
-dbaccess_PushButton_TAB_WIZ_TYPE_SELECT_PB_AUTO,851612165,
dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928,
dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
-dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936,
desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
diff --git a/source/text/shared/explorer/database/05030300.xhp
b/source/text/shared/explorer/database/05030300.xhp
index 734d308..67336bb 100644
--- a/source/text/shared/explorer/database/05030300.xhp
+++ b/source/text/shared/explorer/database/05030300.xhp
@@ -37,9 +37,9 @@
<paragraph role="heading" id="hd_id3163829" xml-lang="en-US" level="1"
l10n="U" oldref="1"><link href="text/shared/explorer/database/05030300.xhp"
name="Type formatting">Type formatting</link></paragraph>
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U"
oldref="2">In the data source explorer, you can copy a table by dragging and
dropping the table onto the table container. The<emph> Type formatting
</emph>dialog is the third window of the <emph>Copy table</emph>
dialog.</paragraph>
</section>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES"
id="bm_id3147291" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/typeselectpage/columnnames"
id="bm_id3147291" localize="false"/>
<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2"
l10n="U" oldref="3">List box</paragraph>
-<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U"
oldref="4"><ahelp
hid="DBACCESS_MULTILISTBOX_TAB_WIZ_TYPE_SELECT_LB_NEW_COLUMN_NAMES">Lists the
data fields that will be included in to the copied table.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U"
oldref="4"><ahelp hid="dbaccess/ui/typeselectpage/columnnames">Lists the data
fields that will be included in to the copied table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="2"
l10n="U" oldref="5">Column information</paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_COLUMNNAME"
id="bm_id3153311" localize="false"/>
<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="3"
l10n="U" oldref="7">Field name</paragraph>
@@ -59,11 +59,11 @@
<paragraph role="paragraph" id="par_id3147620" xml-lang="en-US" l10n="U"
oldref="16"><ahelp hid="HID_TAB_ENT_BOOL_DEFAULT">Select the default value for
a Yes/No field.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="2"
l10n="U" oldref="17">Automatic type recognition</paragraph>
<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U"
oldref="18">$[officename] can automatically recognize field contents when you
copy database tables by drag and drop.</paragraph>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO"
id="bm_id3153061" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/typeselectpage/auto"
id="bm_id3153061" localize="false"/>
<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="3"
l10n="U" oldref="19">(max.) lines</paragraph>
-<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U"
oldref="20"><ahelp
hid="DBACCESS_NUMERICFIELD_TAB_WIZ_TYPE_SELECT_ET_AUTO">Enter the number of
lines to use for automatic type recognition.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO" id="bm_id3148946"
localize="false"/>
+<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="U"
oldref="20"><ahelp hid="dbaccess/ui/typeselectpage/auto">Enter the number of
lines to use for automatic type recognition.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/typeselectpage/autobutton"
id="bm_id3148946" localize="false"/>
<paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3"
l10n="U" oldref="21">Auto</paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U"
oldref="22"><ahelp
hid="DBACCESS_PUSHBUTTON_TAB_WIZ_TYPE_SELECT_PB_AUTO">Enables automatic type
recognition.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U"
oldref="22"><ahelp hid="dbaccess/ui/typeselectpage/autobutton">Enables
automatic type recognition.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/05030400.xhp
b/source/text/shared/explorer/database/05030400.xhp
index db37cf3..8e96855 100644
--- a/source/text/shared/explorer/database/05030400.xhp
+++ b/source/text/shared/explorer/database/05030400.xhp
@@ -37,25 +37,25 @@
<paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1"
l10n="U" oldref="1"><link href="text/shared/explorer/database/05030400.xhp"
name="Assign columns">Assign columns</link></paragraph>
<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="U"
oldref="2">In the data source explorer, you can copy a table by dragging and
dropping the table onto the table container. If you select the <emph>Attach
data </emph>check box on the first page of the <emph>Copy table </emph>dialog,
the <emph>Assign columns </emph>dialog opens as the second window. You can use
this dialog to map the contents of a data field in the source table to a
different data field in the destination table.</paragraph>
</section>
-<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL" id="bm_id3153527"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/left"
id="bm_id3153527" localize="false"/>
<paragraph role="heading" id="hd_id3157958" xml-lang="en-US" level="2"
l10n="U" oldref="4">Source table</paragraph>
-<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U"
oldref="5"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_AVAIL">Lists the data fields
in the source table. To include a data field from the source table in the
destination table, select the check box in front of the data field name. To map
the contents of a data field in the source table to a different data field in
the destination table, click the data field in the source table list, and then
click the up or down arrow.</ahelp> To include all of the source data fields in
the destination table, click <emph>All</emph>.</paragraph>
-<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN" id="bm_id3147242"
localize="false"/>
+<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U"
oldref="5"><ahelp hid="dbaccess/ui/namematchingpage/left">Lists the data fields
in the source table. To include a data field from the source table in the
destination table, select the check box in front of the data field name. To map
the contents of a data field in the source table to a different data field in
the destination table, click the data field in the source table list, and then
click the up or down arrow.</ahelp> To include all of the source data fields in
the destination table, click <emph>All</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/right"
id="bm_id3147242" localize="false"/>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2"
l10n="U" oldref="6">Destination table</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U"
oldref="7"><ahelp hid="HID_TAB_NAMEMATCHING_COLS_ASSIGN">Lists the possible
data fields in the destination table. Only the data fields that are selected in
the source table list will be included the destination
table.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP"
id="bm_id3149516" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT"
id="bm_id3155342" localize="false"/>
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U"
oldref="7"><ahelp hid="dbaccess/ui/namematchingpage/right">Lists the possible
data fields in the destination table. Only the data fields that are selected in
the source table list will be included the destination
table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/up"
id="bm_id3149516" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/up_right"
id="bm_id3155342" localize="false"/>
<paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="2"
l10n="U" oldref="8">up</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U"
oldref="9"><ahelp
hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_UP_RIGHT">Moves the
selected entry up one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN"
id="bm_id3154307" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT"
id="bm_id3153716" localize="false"/>
+<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U"
oldref="9"><ahelp hid="dbaccess/ui/namematchingpage/up_right">Moves the
selected entry up one position in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/down"
id="bm_id3154307" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/namematchingpage/down_right" id="bm_id3153716"
localize="false"/>
<paragraph role="heading" id="hd_id3149580" xml-lang="en-US" level="2"
l10n="U" oldref="10">down</paragraph>
-<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U"
oldref="11"><ahelp
hid="DBACCESS_IMAGEBUTTON_TAB_WIZ_NAME_MATCHING_IB_COLUMN_DOWN_RIGHT">Moves the
selected entry down one position in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL" id="bm_id3147619"
localize="false"/>
+<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U"
oldref="11"><ahelp hid="dbaccess/ui/namematchingpage/down_right">Moves the
selected entry down one position in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/all"
id="bm_id3147619" localize="false"/>
<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2"
l10n="U" oldref="12">all</paragraph>
-<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U"
oldref="13"><ahelp
hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_ALL">Selects all of the data
fields in the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE"
id="bm_id3155341" localize="false"/>
+<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="U"
oldref="13"><ahelp hid="dbaccess/ui/namematchingpage/all">Selects all of the
data fields in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/namematchingpage/none"
id="bm_id3155341" localize="false"/>
<paragraph role="heading" id="hd_id3153541" xml-lang="en-US" level="2"
l10n="U" oldref="14">none</paragraph>
-<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U"
oldref="15"><ahelp
hid="DBACCESS_PUSHBUTTON_TAB_WIZ_NAME_MATCHING_PB_NONE">Clears all of the check
boxes in the list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U"
oldref="15"><ahelp hid="dbaccess/ui/namematchingpage/none">Clears all of the
check boxes in the list.</ahelp></paragraph>
</body>
</helpdocument>
commit 28b1dd5ba012ca7136aac1fa014184b39f4f9bb7
Author: David Tardon <dtar...@redhat.com>
Date: Wed Aug 6 17:13:44 2014 +0200
update help ids for ODBC
Change-Id: I9c81f9e3358c18511773f99cdbba614b6dd12cfd
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index fded1f8..a227185 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1309,7 +1309,6 @@ HID_DSADMIN_ODBC_OPTIONS,38816,
HID_DSADMIN_ORACLE_DATABASE,39018,
HID_DSADMIN_PAGE_ADO,38851,
HID_DSADMIN_PAGE_LDAP,38942,
-HID_DSADMIN_PAGE_ODBC,38799,
HID_DSADMIN_PAGE_TEXT,38801,
HID_DSADMIN_PAGE_USERDRIVER,39001,
HID_DSADMIN_PORTNUMBER,39035,
diff --git a/source/text/shared/explorer/database/11020000.xhp
b/source/text/shared/explorer/database/11020000.xhp
index d4f30b9..fb050bd 100644
--- a/source/text/shared/explorer/database/11020000.xhp
+++ b/source/text/shared/explorer/database/11020000.xhp
@@ -42,8 +42,8 @@
<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U"
oldref="7"><ahelp hid=".">Prevents an unauthorized user from accessing the
database. You only need to enter the password once per
session.</ahelp></paragraph>
</section>
<section id="treibereinstellungen">
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_ODBC_OPTIONS"
id="bm_id3148473" localize="false"/><paragraph role="heading" id="hd_id3153087"
xml-lang="en-US" level="2" l10n="U" oldref="10">Driver Settings</paragraph>
-<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U"
oldref="11"><ahelp hid="HID_DSADMIN_ODBC_OPTIONS">Use this text field to enter
additional optional driver settings if this is necessary.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/odbcpage/options"
id="bm_id3148473" localize="false"/><paragraph role="heading" id="hd_id3153087"
xml-lang="en-US" level="2" l10n="U" oldref="10">Driver Settings</paragraph>
+<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="U"
oldref="11"><ahelp hid="dbaccess/ui/odbcpage/options">Use this text field to
enter additional optional driver settings if this is
necessary.</ahelp></paragraph>
</section>
<section id="zeichensatz">
<!-- removed HID HID_DSADMIN_CHARSET_ODBC --><paragraph role="heading"
id="hd_id3152472" xml-lang="en-US" level="2" l10n="U" oldref="12">Character
Set</paragraph>
commit bdfd3a9be0c542fed005c541deb51b4cf6a98a4e
Author: David Tardon <dtar...@redhat.com>
Date: Wed Aug 6 17:11:21 2014 +0200
drop unused help ids
Change-Id: Ie0aaa342fe18fb5bb95846549d9ada966848fef8
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 37d58d3..fded1f8 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4973,9 +4973,7 @@ dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596,
dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681,
dbaccess_Edit_PAGE_ADABAS_ET_CTRLUSERNAME,851527682,
dbaccess_Edit_PAGE_ADABAS_ET_HOSTNAME,851527685,
-dbaccess_Edit_PAGE_MYSQL_JDBC_ET_JDBCDRIVERCLASS,851773444,
dbaccess_Edit_PAGE_MYSQL_NATIVE_ET_USERNAME,851838977,
-dbaccess_Edit_PAGE_ORACLE_JDBC_ET_JDBCDRIVERCLASS,851888132,
dbaccess_Edit_PAGE_USERDRIVER_ET_HOSTNAME,851757061,
dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059,
dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928,
@@ -5002,8 +5000,6 @@
dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697,
dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT,851448326,
-dbaccess_PushButton_PAGE_MYSQL_JDBC_PB_TESTDRIVERCLASS,851776005,
-dbaccess_PushButton_PAGE_ORACLE_JDBC_PB_TESTDRIVERCLASS,851890693,
dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_ALL,851628560,
dbaccess_PushButton_TAB_WIZ_NAME_MATCHING_PB_NONE,851628561,
dbaccess_PushButton_TAB_WIZ_TYPE_SELECT_PB_AUTO,851612165,
@@ -5011,10 +5007,8 @@ dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
-dbaccess_TabPage_PAGE_MYSQL_JDBC,851771392,
dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928,
dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240,
-dbaccess_TabPage_PAGE_ORACLE_JDBC,851886080,
dbaccess_TabPage_TAB_WIZ_NAME_MATCHING,851623936,
desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
commit 73cb43a65a0273467e706e772366346dc6364691
Author: David Tardon <dtar...@redhat.com>
Date: Wed Aug 6 17:08:27 2014 +0200
update help ids for DbasePage
Change-Id: I8d3e16014406a22bf921252df6a46b5f290935d0
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2fb7be5..37d58d3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1291,7 +1291,6 @@ HID_DSADMIN_BOOLEANCOMPARISON,39017,
HID_DSADMIN_BROWSECONN,38809,
HID_DSADMIN_CALC_PATH,39015,
HID_DSADMIN_CHARSET,38777,
-HID_DSADMIN_DBASE_INDICIES,38814,
HID_DSADMIN_DBASE_PATH,39007,
HID_DSADMIN_DECIMAL_SEPARATOR,38820,
HID_DSADMIN_FIELD_SEPARATOR,38818,
@@ -1309,13 +1308,11 @@ HID_DSADMIN_ODBC_DATASOURCE,39010,
HID_DSADMIN_ODBC_OPTIONS,38816,
HID_DSADMIN_ORACLE_DATABASE,39018,
HID_DSADMIN_PAGE_ADO,38851,
-HID_DSADMIN_PAGE_DBASE,38797,
HID_DSADMIN_PAGE_LDAP,38942,
HID_DSADMIN_PAGE_ODBC,38799,
HID_DSADMIN_PAGE_TEXT,38801,
HID_DSADMIN_PAGE_USERDRIVER,39001,
HID_DSADMIN_PORTNUMBER,39035,
-HID_DSADMIN_SHOWDELETED,38812,
HID_DSADMIN_TEXT_HEADER,38817,
HID_DSADMIN_TEXT_SEPARATOR,38819,
HID_DSADMIN_THOUSANDS_SEPARATOR,38821,
diff --git a/source/text/shared/explorer/database/11030000.xhp
b/source/text/shared/explorer/database/11030000.xhp
index 969ee4c..0005bcb 100644
--- a/source/text/shared/explorer/database/11030000.xhp
+++ b/source/text/shared/explorer/database/11030000.xhp
@@ -35,9 +35,9 @@
<embed href="text/shared/00/00000450.xhp#dBase"/>
</section>
<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U"
oldref="18">To be able to define relations between tables, use JDBC or ODBC
from within $[officename].</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SHOWDELETED"
id="bm_id3154142" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/dbasepage/showDelRowsCheckbutton" id="bm_id3154142"
localize="false"/>
<paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2"
l10n="U" oldref="4">Display inactive records</paragraph>
-<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U"
oldref="5"><ahelp hid="HID_DSADMIN_SHOWDELETED">Displays all the records in a
file, including those marked as deleted. If you select this check box, you
cannot delete records.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U"
oldref="5"><ahelp hid="dbaccess/ui/dbasepage/showDelRowsCheckbutton">Displays
all the records in a file, including those marked as deleted. If you select
this check box, you cannot delete records.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U"
oldref="17">In dBASE format, deleted records remain in the file. </paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U"
oldref="15">To view any changes that you make to the database, close the
connection to the database, and then reconnect the database.</paragraph>
<paragraph role="paragraph" id="par_id6051820" xml-lang="en-US" l10n="NEW"
localize="false"><comment>UFI: deleted note about case sensitivity. Should be
not other than for all other files.</comment></paragraph>
@@ -45,8 +45,8 @@
<paragraph role="paragraph" id="par_id0904200811094971" xml-lang="en-US"
l10n="NEW"><ahelp hid="." visibility="hidden">Select the code conversion that
you want to use to view the database in $[officename]. This does not affect the
database.</ahelp></paragraph>
<embed href="text/shared/explorer/database/11020000.xhp#zeichensatz"/>
<embed href="text/shared/explorer/database/11020000.xhp#sql92"/>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DBASE_INDICIES"
id="bm_id3151056" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbasepage/indiciesButton"
id="bm_id3151056" localize="false"/>
<paragraph role="heading" id="hd_id3149047" xml-lang="en-US" level="2"
l10n="U" oldref="8">Indexes</paragraph>
-<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="U"
oldref="9"><ahelp hid="HID_DSADMIN_DBASE_INDICIES">Opens the <link
href="text/shared/explorer/database/11030100.xhp"
name="Indexes"><emph>Indexes</emph></link> dialog, where you can organize the
table indexes in the current dBASE database.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="U"
oldref="9"><ahelp hid="dbaccess/ui/dbasepage/indiciesButton">Opens the <link
href="text/shared/explorer/database/11030100.xhp"
name="Indexes"><emph>Indexes</emph></link> dialog, where you can organize the
table indexes in the current dBASE database.</ahelp></paragraph>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
