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

Caolán McNamara caolanm at redhat.com
Mon Mar 10 13:55:36 PDT 2014


 helpers/help_hid.lst              |   16 ----------------
 source/text/scalc/01/12090103.xhp |   20 ++++++++++----------
 source/text/scalc/01/12090104.xhp |    6 +++---
 3 files changed, 13 insertions(+), 29 deletions(-)

New commits:
commit c0f068348420e4ef59842aaa4a9786aefabb3a83
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 10 20:49:57 2014 +0000

    update help ids for pivot filter dialog .ui conversion
    
    Change-Id: I2b2a55a4cca7fbfffa7a2d1f9659faea2149fd3c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 68e550d..fcfec62 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3010,7 +3010,6 @@ HID_SC_NAVIPI_SCEN,58862,
 HID_SC_NAVIPI_TOOLBOX,58867,
 HID_SC_NAVIPI_UP,58858,
 HID_SC_NAVIPI_ZOOM,58860,
-HID_SC_PIVOTFILTER,58869,
 HID_SC_REDLIN_CTR,58934,
 HID_SC_RENAME_AUTOFMT,58943,
 HID_SC_RENAME_NAME,58913,
@@ -5715,9 +5714,6 @@ reportdesign_ListBox_RID_GROUPS_SORTING_LST_KEEPTOGETHERLST,2114719242,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_ORDER,2114719249,
 reportdesign_NumericField_RID_GROUPS_SORTING_ED_GROUPINTERVALLST,2114721800,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
-sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_CASE,1493746690,
-sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_REGEXP,1493746691,
-sc_CheckBox_RID_SCDLG_PIVOTFILTER_BTN_UNIQUE,1493746689,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
@@ -5727,9 +5723,6 @@ sc_CheckBox_RID_SCPAGE_CALC_BTN_REGEX,957252628,
 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_PIVOTFILTER_ED_VAL1,1493749792,
-sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793,
-sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977,
@@ -5748,14 +5741,6 @@ sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
 sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND1,1493749277,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND2,1493749278,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND3,1493749279,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD1,1493749272,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD2,1493749273,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_FIELD3,1493749274,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP1,1493749275,
-sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP2,1493749276,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
@@ -5763,7 +5748,6 @@ sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762,
 sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
-sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
diff --git a/source/text/scalc/01/12090103.xhp b/source/text/scalc/01/12090103.xhp
index 5b17e88..44818bb 100644
--- a/source/text/scalc/01/12090103.xhp
+++ b/source/text/scalc/01/12090103.xhp
@@ -32,17 +32,17 @@
 </meta>
 <body>
   
-  
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/PivotFilterDialog" xml-lang="en-US" id="bm_id3153143" localize="false"/>
   <paragraph role="heading" level="1" id="hd_id3153970" l10n="U" xml-lang="en-US" oldref="1">Filter</paragraph>
   <paragraph role="paragraph" id="par_id3150448" l10n="U" xml-lang="en-US" oldref="2">Set the filtering options for the data.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3151043" l10n="U" xml-lang="en-US" oldref="3">Filter Criteria</paragraph>
   <paragraph role="paragraph" id="par_id3150440" l10n="U" xml-lang="en-US" oldref="4">You can define a default filter for the data by filtering, for example, field names, using a combination of logical expressions arguments.</paragraph>
-  <bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1" xml-lang="en-US" id="bm_id3153142" localize="false"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2" xml-lang="en-US" id="bm_id3155412" localize="false"/><paragraph role="heading" level="3" id="hd_id3159153" l10n="U" xml-lang="en-US" oldref="5">Operator</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3153093" xml-lang="en-US" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_OP2" visibility="visible">Select a logical operator for the filter.</ahelp></paragraph>
-  <bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1" xml-lang="en-US" id="bm_id3147317" localize="false"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2" xml-lang="en-US" id="bm_id3148646" localize="false"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3" xml-lang="en-US" id="bm_id3149667" localize="false"/><paragraph role="heading" level="3" id="hd_id3152462" l10n="U" xml-lang="en-US" oldref="7">Field name</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3155306" xml-lang="en-US" oldref="8"><ahelp hid="SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_FIELD3" visibility="visible">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</ahelp></paragraph>
-  <bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1" xml-lang="en-US" id="bm_id3147348" localize="false"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2" xml-lang="en-US" id="bm_id3155855" localize="false"/><bookmark branch="hid/sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3" xml-lang="en-US" id="bm_id3156444" localize="false"/><paragraph role="heading" level="3" id="hd_id3148575" l10n="U" xml-lang="en-US" oldref="9">Condition</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3147394" xml-lang="en-US" oldref="10"><ahelp visibility="visible" hid="SC:LISTBOX:RID_SCDLG_PIVOTFILTER:LB_COND3">Select an operator to compare the <emph>Field name</emph> and <emph>Value</emph> entries.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/connect1" xml-lang="en-US" id="bm_id3153142" localize="false"/><bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/connect2" xml-lang="en-US" id="bm_id3155412" localize="false"/><paragraph role="heading" level="3" id="hd_id3159153" l10n="U" xml-lang="en-US" oldref="5">Operator</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3153093" xml-lang="en-US" oldref="6"><ahelp hid="modules/scalc/ui/pivotfilterdialog/connect2" visibility="visible">Select a logical operator for the filter.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/field1" xml-lang="en-US" id="bm_id3147317" localize="false"/><bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/field2" xml-lang="en-US" id="bm_id3148646" localize="false"/><bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/field3" xml-lang="en-US" id="bm_id3149667" localize="false"/><paragraph role="heading" level="3" id="hd_id3152462" l10n="U" xml-lang="en-US" oldref="7">Field name</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3155306" xml-lang="en-US" oldref="8"><ahelp hid="modules/scalc/ui/pivotfilterdialog/field3" visibility="visible">Select the field that you want to use in the filter. If field names are not available, the column labels are listed.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/cond1" xml-lang="en-US" id="bm_id3147348" localize="false"/><bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/cond2" xml-lang="en-US" id="bm_id3155855" localize="false"/><bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/cond3" xml-lang="en-US" id="bm_id3156444" localize="false"/><paragraph role="heading" level="3" id="hd_id3148575" l10n="U" xml-lang="en-US" oldref="9">Condition</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3147394" xml-lang="en-US" oldref="10"><ahelp visibility="visible" hid="modules/scalc/ui/pivotfilterdialog/cond3">Select an operator to compare the <emph>Field name</emph> and <emph>Value</emph> entries.</ahelp></paragraph>
   <paragraph role="paragraph" id="par_id3144764" l10n="U" xml-lang="en-US" oldref="11">The following operators are available:</paragraph>
   <table id="tbl_id3149379">
    
@@ -106,9 +106,9 @@
     </tablecell>
    </tablerow>
   </table>
-  <bookmark branch="hid/sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1" xml-lang="en-US" id="bm_id3152990" localize="false"/><bookmark branch="hid/sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2" xml-lang="en-US" id="bm_id3152994" localize="false"/><bookmark branch="hid/sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3" xml-lang="en-US" id="bm_id3150370" localize="false"/><paragraph role="heading" level="3" id="hd_id3150886" l10n="U" xml-lang="en-US" oldref="25">Value</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3155506" xml-lang="en-US" oldref="26"><ahelp hid="SC:COMBOBOX:RID_SCDLG_PIVOTFILTER:ED_VAL3" visibility="visible">Select the value that you want to compare to the selected field.</ahelp></paragraph>
-  <bookmark branch="hid/sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE" xml-lang="en-US" id="bm_id3152987" localize="false"/><paragraph id="hd_id3146980" role="heading" level="2" oldref="27" l10n="U" xml-lang="en-US"><link href="text/scalc/01/12090104.xhp" name="More>>">More>></link></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/val1" xml-lang="en-US" id="bm_id3152990" localize="false"/><bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/val2" xml-lang="en-US" id="bm_id3152994" localize="false"/><bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/val3" xml-lang="en-US" id="bm_id3150370" localize="false"/><paragraph role="heading" level="3" id="hd_id3150886" l10n="U" xml-lang="en-US" oldref="25">Value</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3155506" xml-lang="en-US" oldref="26"><ahelp hid="modules/scalc/ui/pivotfilterdialog/val3" visibility="visible">Select the value that you want to compare to the selected field.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/more" xml-lang="en-US" id="bm_id3152987" localize="false"/><paragraph id="hd_id3146980" role="heading" level="2" oldref="27" l10n="U" xml-lang="en-US"><link href="text/scalc/01/12090104.xhp" name="More>>">More>></link></paragraph>
   <embed href="text/scalc/01/12090104.xhp#zusaetzetext"/>
  </body>
 </helpdocument>
diff --git a/source/text/scalc/01/12090104.xhp b/source/text/scalc/01/12090104.xhp
index 14de8e0..469d473 100644
--- a/source/text/scalc/01/12090104.xhp
+++ b/source/text/scalc/01/12090104.xhp
@@ -37,12 +37,12 @@
   <paragraph id="hd_id3149119" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/scalc/01/12090104.xhp" name="Options">Options</link></paragraph>
   <paragraph l10n="U" role="paragraph" id="par_id3147102" xml-lang="en-US" oldref="2"><variable id="zusaetzetext"><ahelp hid="" visibility="visible">Displays or hides additional filtering options.</ahelp></variable></paragraph>
   <paragraph role="heading" level="2" id="hd_id3147008" l10n="U" xml-lang="en-US" oldref="3">Options</paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE" xml-lang="en-US" id="bm_id3153562" localize="false"/><paragraph role="heading" level="3" id="hd_id3153662" l10n="U" xml-lang="en-US" oldref="5">Case sensitive</paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/case" xml-lang="en-US" id="bm_id3153562" localize="false"/><paragraph role="heading" level="3" id="hd_id3153662" l10n="U" xml-lang="en-US" oldref="5">Case sensitive</paragraph>
   <paragraph role="paragraph" id="par_id3145673" l10n="U" xml-lang="en-US" oldref="6">Distinguishes between uppercase and lowercase letters.</paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP" xml-lang="en-US" id="bm_id3153881" localize="false"/><paragraph role="heading" level="3" id="hd_id3156327" l10n="U" xml-lang="en-US" oldref="7">Regular Expression</paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/regexp" xml-lang="en-US" id="bm_id3153881" localize="false"/><paragraph role="heading" level="3" id="hd_id3156327" l10n="U" xml-lang="en-US" oldref="7">Regular Expression</paragraph>
   <paragraph role="paragraph" id="par_id3151245" l10n="U" xml-lang="en-US" oldref="8">Allows you to use wildcards in the filter definition.</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3147264" l10n="U" oldref="29">If the <emph>Regular Expression</emph> check box is selected, you can use EQUAL (=) and NOT EQUAL (<>) also in comparisons. You can also use the following functions: DCOUNTA, DGET, MATCH, COUNTIF, SUMIF, LOOKUP, VLOOKUP and HLOOKUP.</paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE" xml-lang="en-US" id="bm_id3150541" localize="false"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="30">Unique records only</paragraph>
+  <bookmark branch="hid/modules/scalc/ui/pivotfilterdialog/unique" xml-lang="en-US" id="bm_id3150541" localize="false"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="30">Unique records only</paragraph>
   <paragraph role="paragraph" id="par_id3154138" l10n="U" xml-lang="en-US" oldref="31">Excludes duplicate rows in the list of filtered data.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3156282" l10n="U" xml-lang="en-US" oldref="32">Data area</paragraph>
   <paragraph role="paragraph" id="par_id3150768" l10n="U" xml-lang="en-US" oldref="33">Displays the name of the filtered data area in the table.</paragraph>


More information about the Libreoffice-commits mailing list