[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
Caolán McNamara
caolanm at redhat.com
Fri Jan 17 02:15:56 PST 2014
helpers/help_hid.lst | 6 ------
source/text/scalc/01/12090105.xhp | 14 ++++++--------
2 files changed, 6 insertions(+), 14 deletions(-)
New commits:
commit 70e404728857f43ff48da7892a42c4d4df969153
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 17 10:14:55 2014 +0000
update help ids for data field dialog .ui conversion
Change-Id: I955c6a3be8d1867775a2df948ac0e7d55fa0aaac
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d3657bb..ad43d3d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3048,7 +3048,6 @@ HID_SC_APPEND_NAME,58914,
HID_SC_ASCII_TABCTR,58926,
HID_SC_AUTOFMT_NAME,58921,
HID_SC_CHANGES_COMMENT,58990,
-HID_SC_DPDATAFIELD,59008,
HID_SC_DPDATEGROUP,59012,
HID_SC_DPDATEGROUP_LB,59013,
HID_SC_DPLAY_COLUMN,59003,
@@ -5957,9 +5956,6 @@ sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257,
sc_ListBox_RID_SCDLG_DAPIDATA_LB_DATABASE,1495354899,
sc_ListBox_RID_SCDLG_DAPIDATA_LB_OBJTYPE,1495354903,
sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
-sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_BASEFIELD,1495387651,
-sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_BASEITEM,1495387652,
-sc_ListBox_RID_SCDLG_DPDATAFIELD_LB_TYPE,1495387650,
sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_HIERARCHY,1495404041,
sc_ListBox_RID_SCDLG_DPSUBTOTAL_OPT_LB_LAYOUT,1495404038,
@@ -5990,12 +5986,10 @@ sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968,
sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592,
sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
-sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868,
sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676,
sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541,
sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
-sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137,
sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657,
sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
diff --git a/source/text/scalc/01/12090105.xhp b/source/text/scalc/01/12090105.xhp
index 9c17733..0c9ae40 100644
--- a/source/text/scalc/01/12090105.xhp
+++ b/source/text/scalc/01/12090105.xhp
@@ -28,23 +28,21 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SC_HID_SC_PIVOTSUBT" id="bm_id3153194" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafielddialog/BaseFieldDialog" id="bm_id8070926" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id7292397"><bookmark_value>calculating;pivot table</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150871" xml-lang="en-US" level="1" l10n="U" oldref="1">Data field</paragraph>
<paragraph role="paragraph" id="par_id3154124" xml-lang="en-US" l10n="U" oldref="16">The contents of this dialog is different for data fields in the <emph>Data</emph> area, and data fields in the <emph>Row</emph> or <emph>Column</emph> area of the <link href="text/scalc/01/12090102.xhp" name="Pivot table">Pivot Table</link> dialog.</paragraph>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="2">Subtotals</paragraph>
<paragraph role="paragraph" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_SC_PIVOTSUBT">Specify the subtotals that you want to calculate.</ahelp></paragraph>
-<!-- removed HID SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_NONE -->
<paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3" l10n="U" oldref="4">None</paragraph>
<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_NONE">Does not calculate subtotals.</ahelp></paragraph>
-<!-- removed HID SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_AUTO -->
<paragraph role="heading" id="hd_id3154012" xml-lang="en-US" level="3" l10n="U" oldref="6">Automatic</paragraph>
<paragraph role="paragraph" id="par_id3155856" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_AUTO">Automatically calculates subtotals.</ahelp></paragraph>
-<!-- removed HID SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_USER -->
<paragraph role="heading" id="hd_id3155411" xml-lang="en-US" level="3" l10n="U" oldref="8">User-defined</paragraph>
<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_PIVOTSUBT:BTN_USER">Select this option, and then click the type of subtotal that you want to calculate in the list.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_PIVOTSUBT:LB_FUNC" id="bm_id3145799" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_DPDATAFIELD:LB_FUNC" id="bm_id1523789" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafielddialog/functions" id="bm_id1523789" localize="false"/>
<paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="3" l10n="U" oldref="10">Function</paragraph>
<paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_PIVOTSUBT:LB_FUNC">Click the type of subtotal that you want to calculate. This option is only available if the <emph>User-defined</emph> option is selected.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_PIVOTSUBT:CB_SHOWALL" id="bm_id3154015" localize="false"/>
@@ -52,7 +50,7 @@
<paragraph role="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOTSUBT:CB_SHOWALL">Includes empty columns and rows in the results table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149122" xml-lang="en-US" level="2" l10n="U" oldref="12">Name:</paragraph>
<paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="13">Lists the name of the selected data field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_DPDATAFIELD:BTN_MORE" id="bm_id4281746" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafielddialog/expander" id="bm_id4281746" localize="false"/>
<paragraph role="heading" id="par_idN106EC" xml-lang="en-US" level="2" l10n="NEW">More</paragraph>
<paragraph role="paragraph" id="par_idN106F0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Expands or reduces the dialog. The <emph>More</emph> button is visible for data fields only.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_PIVOTSUBT:BTN_OPTIONS" id="bm_id2855922" localize="false"/>
@@ -61,7 +59,7 @@
<paragraph role="paragraph" id="par_idN10708" xml-lang="en-US" l10n="NEW">If the dialog is expanded by the <emph>More</emph> button, the following items are added to the dialog:</paragraph>
<paragraph role="heading" id="par_idN1070B" xml-lang="en-US" level="2" l10n="NEW">Displayed value</paragraph>
<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For each data field, you can select the type of display.</ahelp> For some types you can select additional information for a base field and a base item.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_TYPE" id="bm_id3325907" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafielddialog/type" id="bm_id3325907" localize="false"/>
<paragraph role="heading" id="par_idN10712" xml-lang="en-US" level="3" l10n="NEW">Type</paragraph>
<paragraph role="paragraph" id="par_idN10716" xml-lang="en-US" l10n="NEW"><ahelp hid="1495371266">Select the type of calculating of the displayed value for the data field.</ahelp></paragraph>
<table id="">
@@ -157,10 +155,10 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEFIELD" id="bm_id7005523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafielddialog/basefield" id="bm_id7005523" localize="false"/>
<paragraph role="heading" id="par_idN107BA" xml-lang="en-US" level="3" l10n="NEW">Base field</paragraph>
<paragraph role="paragraph" id="par_idN107BE" xml-lang="en-US" l10n="NEW"><ahelp hid="1495371267">Select the field from which the respective value is taken as base for the calculation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEITEM" id="bm_id8070925" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafielddialog/baseitem" id="bm_id8070925" localize="false"/>
<paragraph role="heading" id="par_idN107C1" xml-lang="en-US" level="3" l10n="NEW">Base item</paragraph>
<paragraph role="paragraph" id="par_idN107C5" xml-lang="en-US" l10n="NEW"><ahelp hid="1495371268">Select the item of the base field from which the respective value is taken as base for the calculation.</ahelp></paragraph>
</body>
More information about the Libreoffice-commits
mailing list