[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

Sun Feb 2 06:50:23 PST 2014

helpers/help_hid.lst               |    7 -------
 source/text/shared/00/00000206.xhp |    4 ++--
 source/text/shared/00/00000207.xhp |   21 +++++++++++----------
 3 files changed, 13 insertions(+), 19 deletions(-)

New commits:
commit 2328f3f8efa6622c742b6e5b826376b08cd22d46
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Sun Feb 2 12:30:26 2014 +0000

    update help ids for import options dialog .ui conversion
    
    Change-Id: I1afab1a150aaa526fa01ff8e99111330da6540d8

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5974d56..a0dad9f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3039,7 +3039,6 @@ HID_SC_HEADER_EDIT,58908,
 HID_SC_HF_DATE,58906,
 HID_SC_HF_PAGES,58905,
 HID_SC_HF_TIME,58907,
-HID_SC_INPORTOPT,58870,
 HID_SC_INPUTWIN,58912,
 HID_SC_NAVIGATOR,58895,
 HID_SC_NAVIPI_COL,58855,
@@ -5827,8 +5826,6 @@ sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475,
 sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT,2568963085,
 sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_ACCEPT,2568963078,
 sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT_REJECT,2568963079,
-sc_CheckBox_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH,1494172684,
-sc_CheckBox_RID_SCDLG_IMPORTOPT_CB_SAVESHOWN,1494172685,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
 sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_ATTRIB,1493845017,
 sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_COPYALL,1493845019,
@@ -5856,8 +5853,6 @@ sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227,
 sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228,
 sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203,
 sc_ComboBox_RID_SCDLG_DAPIDATA_CB_OBJECT,1495355413,
-sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749,
-sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794,
@@ -5897,8 +5892,6 @@ sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_LAYOUT,1495404038,
 sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_FROM,1495404039,
 sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SHOW_USING,1495404040,
 sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_SORT_BY,1495404037,
-sc_ListBox_RID_SCDLG_IMPORTOPT_DDLB_FONT,1494175241,
-sc_ListBox_RID_SCDLG_IMPORTOPT_LB_FONT,1494175242,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCDLG_NEWSCENARIO_LB_COLOR,1493847574,
diff --git a/source/text/shared/00/00000206.xhp b/source/text/shared/00/00000206.xhp
index 1d861ef..aecc7ad 100644
--- a/source/text/shared/00/00000206.xhp
+++ b/source/text/shared/00/00000206.xhp
@@ -31,8 +31,8 @@
 <body>
 <paragraph role="heading" id="hd_id3155354" xml-lang="en-US" level="1" l10n="U" oldref="1">Dif Import/Export/ Lotus import/ dBASE import</paragraph>
 <paragraph role="paragraph" id="par_id3150620" xml-lang="en-US" l10n="U" oldref="4">Defines the options for import/export. These dialogs will be automatically shown if the corresponding file type is selected.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT" id="bm_id3149987" localize="false"/><paragraph role="heading" id="hd_id3149000" xml-lang="en-US" level="2" l10n="U" oldref="2">Character set</paragraph>
-<paragraph role="paragraph" id="par_id3152790" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SC:LISTBOX:RID_SCDLG_IMPORTOPT:LB_FONT">Select the character set from the options used for import/export.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/charsetlist" id="bm_id3149987" localize="false"/><paragraph role="heading" id="hd_id3149000" xml-lang="en-US" level="2" l10n="U" oldref="2">Character set</paragraph>
+<paragraph role="paragraph" id="par_id3152790" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="modules/scalc/ui/imoptdialog/charsetlist">Select the character set from the options used for import/export.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152942" xml-lang="en-US" l10n="U" oldref="3">For further information regarding filters, refer to the topic: <link href="text/shared/00/00000020.xhp" name="Information about Import and Export Filters">Information about Import and Export Filters</link>.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/00/00000207.xhp b/source/text/shared/00/00000207.xhp
index 6824156..267db04 100644
--- a/source/text/shared/00/00000207.xhp
+++ b/source/text/shared/00/00000207.xhp
@@ -29,25 +29,26 @@
 </topic>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/ImOptDialog" id="bm_id3154839" localize="false"/>
 <paragraph role="heading" id="hd_id3153116" xml-lang="en-US" level="1" l10n="U" oldref="1">Export text files</paragraph>
 <paragraph role="paragraph" id="par_id3150379" xml-lang="en-US" l10n="U" oldref="7">The <emph>Export text files</emph> dialog allows you to define the export options for text files. The dialog will be displayed if you save spreadsheet data as file type "Text CSV", and if the <emph>Edit filter settings</emph> check box is marked in the <emph>Save As</emph> dialog.</paragraph>
 <paragraph role="heading" id="hd_id3155577" xml-lang="en-US" level="2" l10n="U" oldref="2">Field options</paragraph>
 <paragraph role="paragraph" id="par_id3152427" xml-lang="en-US" l10n="U" oldref="8">Defines the field separator, text separator and character set that is used for the text export.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT" id="bm_id3154841" localize="false"/><paragraph role="heading" id="hd_id3152876" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
-<paragraph role="paragraph" id="par_id3154689" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:LISTBOX:RID_SCDLG_IMPORTOPT:DDLB_FONT">Specifies the character set for text export.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3145138" xml-lang="en-US" level="3" l10n="U" oldref="3">Field delimiter</paragraph>
-<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_FIELDSEP">Choose or enter the field delimiter, which separates data fields.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP" id="bm_id3146938" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="4">Text delimiter</paragraph>
-<paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_TEXTSEP">Choose or enter the text delimiter, which encloses every data field.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/charsetdropdown" id="bm_id3154841" localize="false"/><paragraph role="heading" id="hd_id3152876" xml-lang="en-US" level="3" l10n="U" oldref="5">Character set</paragraph>
+<paragraph role="paragraph" id="par_id3154689" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="modules/scalc/ui/imoptdialog/charsetdropdown">Specifies the character set for text export.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/field" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3145138" xml-lang="en-US" level="3" l10n="U" oldref="3">Field delimiter</paragraph>
+<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="modules/scalc/ui/imoptdialog/field">Choose or enter the field delimiter, which separates data fields.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/text" id="bm_id3146938" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="4">Text delimiter</paragraph>
+<paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="modules/scalc/ui/imoptdialog/text">Choose or enter the text delimiter, which encloses every data field.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_QUOTEALL" id="bm_id314783281" localize="false"/><paragraph role="heading" id="hd_id783149793" xml-lang="en-US" level="3" l10n="NEW">Quote all text cells</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/quoteall" id="bm_id314783281" localize="false"/><paragraph role="heading" id="hd_id783149793" xml-lang="en-US" level="3" l10n="NEW">Quote all text cells</paragraph>
 <paragraph role="paragraph" id="par_id3152778363" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Exports all text cells with leading and trailing quote characters as set in the Text delimiter box. If not checked, only those text cells get quoted that contain the Field delimiter character.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_SAVESHOWN" id="bm_id7735831" localize="false"/><paragraph role="heading" id="hd_id7145298" xml-lang="en-US" level="3" l10n="NEW">Save cell content as shown</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/asshown" id="bm_id7735831" localize="false"/><paragraph role="heading" id="hd_id7145298" xml-lang="en-US" level="3" l10n="NEW">Save cell content as shown</paragraph>
 <paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of the software.</ahelp></paragraph>
 <paragraph role="warning" id="par_id3541062" xml-lang="en-US" l10n="NEW">Depending on the number format, saving cell content as shown may write values that during an import cannot be interpreted as numerical values anymore.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_FIXEDWIDTH" id="bm_id3143281" localize="false"/><paragraph role="heading" id="hd_id3149793" xml-lang="en-US" level="3" l10n="U" oldref="12">Fixed column width</paragraph>
-<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC_CHECKBOX_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH">Exports all data fields with a fixed width.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/imoptdialog/fixedwidth" id="bm_id3143281" localize="false"/><paragraph role="heading" id="hd_id3149793" xml-lang="en-US" level="3" l10n="U" oldref="12">Fixed column width</paragraph>
+<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="modules/scalc/ui/imoptdialog/fixedwidth">Exports all data fields with a fixed width.</ahelp></paragraph>
 <list type="unordered">
 <listitem>
 <paragraph role="listitem" id="par_id3149283" xml-lang="en-US" l10n="U" oldref="14">The width of a data field in the exported text file is set to the current width of the corresponding column.</paragraph>
