[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
Caolán McNamara
caolanm at redhat.com
Wed Aug 14 08:15:21 PDT 2013
helpers/help_hid.lst | 8 --------
source/text/swriter/01/04070100.xhp | 24 ++++++++++++------------
2 files changed, 12 insertions(+), 20 deletions(-)
New commits:
commit eb245191261167b8de5ec3c941402240e4dab133
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 14 16:14:43 2013 +0100
update help ids for envelope address page
Change-Id: I176457e205824d330aec7a72e1fb5d6fbc038c2a
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c5c711a..9e1aeac 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1604,7 +1604,6 @@ HID_EDIT_WIN,52821,
HID_ENDNOTE_OPTIONS,53216,
HID_ENVELOP_INSERT,54823,
HID_ENVELOP_PRINT,54820,
-HID_ENV_ENV,53186,
HID_ENV_FMT,53187,
HID_EVT_ACTIONPERFORMED,38068,
HID_EVT_ADJUSTMENTVALUECHANGED,38100,
@@ -7495,7 +7494,6 @@ sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600,
sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE,898270216,
sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
sw_CheckBox_TP_CONDCOLL_CB_CONDITION,878445569,
-sw_CheckBox_TP_ENV_ENV_BOX_SEND,909640714,
sw_CheckBox_TP_FLD_DOKINF_CB_DOKINFFIXEDCONTENT,878724117,
sw_CheckBox_TP_FLD_DOK_CB_DOKFIXEDCONTENT,878756922,
sw_CheckBox_TP_FLD_VAR_CB_VARINVISIBLE,878740520,
@@ -7615,7 +7613,6 @@ sw_ImageButton_DLG_MM_CUSTOMIZE_ADDRESS_LIST_PB_DOWN,1435299335,
sw_ImageButton_DLG_MM_CUSTOMIZE_ADDRESS_LIST_PB_UP,1435299334,
sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_NEXTSET,898264597,
sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_PREVSET,898264596,
-sw_ImageButton_TP_ENV_ENV_BTN_INSERT,909651463,
sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627,
sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_DOWN,888499833,
sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832,
@@ -7650,9 +7647,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_ENV_ENV_LB_DATABASE,909643268,
-sw_ListBox_TP_ENV_ENV_LB_DBFIELD,909643273,
-sw_ListBox_TP_ENV_ENV_LB_TABLE,909643270,
sw_ListBox_TP_ENV_FMT_BOX_SIZE_FORMAT,909659681,
sw_ListBox_TP_FLD_DB_LB_DBFORMAT,878710282,
sw_ListBox_TP_FLD_DB_LB_DBNUMFORMAT,878710283,
@@ -7766,8 +7760,6 @@ sw_MultiLineEdit_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDWARNING_ED_DETAILS,197235
sw_MultiLineEdit_DLG_MM_CUSTOMIZEADDRESSBLOCK_ED_DRAG,1435306545,
sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831,
sw_MultiLineEdit_DLG_MM_TESTACCOUNTSETTINGS_ED_ERROR,1427130914,
-sw_MultiLineEdit_TP_ENV_ENV_EDT_ADDR,909642242,
-sw_MultiLineEdit_TP_ENV_ENV_EDT_SEND,909642251,
sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
diff --git a/source/text/swriter/01/04070100.xhp b/source/text/swriter/01/04070100.xhp
index 60c5a33..032422c 100644
--- a/source/text/swriter/01/04070100.xhp
+++ b/source/text/swriter/01/04070100.xhp
@@ -34,22 +34,22 @@
<section id="umschlag">
- <bookmark branch="hid/SW_HID_ENV_ENV" xml-lang="en-US" id="bm_id3148772" localize="false"/><paragraph id="hd_id3145243" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/04070100.xhp" name="Envelope">Envelope</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3147172" xml-lang="en-US" oldref="2"><ahelp hid="HID_ENV_ENV" visibility="visible">Enter the delivery and return addresses for the envelope. You can also insert address fields from a database, for example from the Addresses database.</ahelp></paragraph>
+ <bookmark branch="hid/modules/swriter/ui/envaddresspage/EnvAddressPage" xml-lang="en-US" id="bm_id3148772" localize="false"/><paragraph id="hd_id3145243" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/04070100.xhp" name="Envelope">Envelope</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3147172" xml-lang="en-US" oldref="2"><ahelp hid="modules/swriter/ui/envaddresspage/EnvAddressPage" visibility="visible">Enter the delivery and return addresses for the envelope. You can also insert address fields from a database, for example from the Addresses database.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#umschlagb"/>
</section>
- <bookmark branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR" xml-lang="en-US" id="bm_id3151178" localize="false"/><paragraph role="heading" level="2" id="hd_id3149295" l10n="U" xml-lang="en-US" oldref="3">Addressee</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3145415" xml-lang="en-US" oldref="4"><ahelp hid="SW:MULTILINEEDIT:TP_ENV_ENV:EDT_ADDR" visibility="visible">Enter the delivery address.</ahelp> You can also click in this box, and select a database, a table, and field, and then click the arrow button to insert the field in the address. If you want, you can apply formatting, such as bold and underline, to the address text.</paragraph>
- <bookmark branch="hid/sw:CheckBox:TP_ENV_ENV:BOX_SEND" xml-lang="en-US" id="bm_id3149802" localize="false"/><bookmark branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND" xml-lang="en-US" id="bm_id3149806" localize="false"/><paragraph role="heading" level="2" id="hd_id3154102" l10n="U" xml-lang="en-US" oldref="5">Sender</paragraph>
- <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3153527" oldref="6"><ahelp visibility="visible" hid="SW:MULTILINEEDIT:TP_ENV_ENV:EDT_SEND">Includes a return address on the envelope. Select the <emph>Sender </emph>check box, and then enter the return address.</ahelp> $[officename] automatically inserts your user data in the <emph>Sender </emph>box, but you can also enter the data that you want.</paragraph>
- <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_DATABASE" xml-lang="en-US" id="bm_id3154474" localize="false"/><paragraph role="heading" level="2" id="hd_id3154571" l10n="U" xml-lang="en-US" oldref="9">Database</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3154480" xml-lang="en-US" oldref="10"><ahelp hid="SW:LISTBOX:TP_ENV_ENV:LB_DATABASE" visibility="visible">Select the database containing the address data that you want to insert.</ahelp></paragraph>
- <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_TABLE" xml-lang="en-US" id="bm_id3155892" localize="false"/><paragraph role="heading" level="2" id="hd_id3151310" l10n="U" xml-lang="en-US" oldref="11">Table</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3155898" xml-lang="en-US" oldref="12"><ahelp hid="SW:LISTBOX:TP_ENV_ENV:LB_TABLE" visibility="visible">Select the database table containing the address data that you want to insert.</ahelp></paragraph>
- <bookmark branch="hid/sw:ListBox:TP_ENV_ENV:LB_DBFIELD" xml-lang="en-US" id="bm_id3154197" localize="false"/><bookmark branch="hid/sw:ImageButton:TP_ENV_ENV:BTN_INSERT" xml-lang="en-US" id="bm_id3154201" localize="false"/><paragraph role="heading" level="2" id="hd_id3149695" l10n="U" xml-lang="en-US" oldref="13">Database field</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3155180" xml-lang="en-US" oldref="14"><ahelp hid="SW:IMAGEBUTTON:TP_ENV_ENV:BTN_INSERT" visibility="visible">Select the database field containing the address data that you want to insert, and then click the left arrow button. The data is added to the address box containing the cursor.</ahelp></paragraph>
+ <bookmark branch="hid/modules/swriter/ui/envaddresspage/addredit" xml-lang="en-US" id="bm_id3151178" localize="false"/><paragraph role="heading" level="2" id="hd_id3149295" l10n="U" xml-lang="en-US" oldref="3">Addressee</paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3145415" xml-lang="en-US" oldref="4"><ahelp hid="modules/swriter/ui/envaddresspage/addredit" visibility="visible">Enter the delivery address.</ahelp> You can also click in this box, and select a database, a table, and field, and then click the arrow button to insert the field in the address. If you want, you can apply formatting, such as bold and underline, to the address text.</paragraph>
+ <bookmark branch="hid/modules/swriter/ui/envaddresspage/senderedit" xml-lang="en-US" id="bm_id3149802" localize="false"/><bookmark branch="hid/sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND" xml-lang="en-US" id="bm_id3149806" localize="false"/><paragraph role="heading" level="2" id="hd_id3154102" l10n="U" xml-lang="en-US" oldref="5">Sender</paragraph>
+ <paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3153527" oldref="6"><ahelp visibility="visible" hid="modules/swriter/ui/envaddresspage/senderedit">Includes a return address on the envelope. Select the <emph>Sender </emph>check box, and then enter the return address.</ahelp> $[officename] automatically inserts your user data in the <emph>Sender </emph>box, but you can also enter the data that you want.</paragraph>
+ <bookmark branch="hid/modules/swriter/ui/envaddresspage/database" xml-lang="en-US" id="bm_id3154474" localize="false"/><paragraph role="heading" level="2" id="hd_id3154571" l10n="U" xml-lang="en-US" oldref="9">Database</paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3154480" xml-lang="en-US" oldref="10"><ahelp hid="modules/swriter/ui/envaddresspage/database" visibility="visible">Select the database containing the address data that you want to insert.</ahelp></paragraph>
+ <bookmark branch="hid/modules/swriter/ui/envaddresspage/table" xml-lang="en-US" id="bm_id3155892" localize="false"/><paragraph role="heading" level="2" id="hd_id3151310" l10n="U" xml-lang="en-US" oldref="11">Table</paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3155898" xml-lang="en-US" oldref="12"><ahelp hid="modules/swriter/ui/envaddresspage/table" visibility="visible">Select the database table containing the address data that you want to insert.</ahelp></paragraph>
+ <bookmark branch="hid/modules/swriter/ui/envaddresspage/field" xml-lang="en-US" id="bm_id3154197" localize="false"/><bookmark branch="hid/modules/swriter/ui/envaddresspage/insert" xml-lang="en-US" id="bm_id3154201" localize="false"/><paragraph role="heading" level="2" id="hd_id3149695" l10n="U" xml-lang="en-US" oldref="13">Database field</paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3155180" xml-lang="en-US" oldref="14"><ahelp hid="modules/swriter/ui/envaddresspage/insert" visibility="visible">Select the database field containing the address data that you want to insert, and then click the left arrow button. The data is added to the address box containing the cursor.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
</helpdocument>
More information about the Libreoffice-commits
mailing list