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

Fri Jan 17 03:17:01 PST 2014

helpers/help_hid.lst              |    7 -------
 source/text/scalc/01/12090105.xhp |   20 ++++++++++----------
 2 files changed, 10 insertions(+), 17 deletions(-)

New commits:
commit f9723f6b047938a0bb00dfaae407cc3184acd697
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Fri Jan 17 11:14:43 2014 +0000

    update help ids for pivot data field dialog .ui conversion
    
    Change-Id: I161036c87468382f87879f8a6742dcba44220168

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ad43d3d..0bbfd60 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3091,7 +3091,6 @@ HID_SC_NAVIPI_TOOLBOX,58867,
 HID_SC_NAVIPI_UP,58858,
 HID_SC_NAVIPI_ZOOM,58860,
 HID_SC_PIVOTFILTER,58869,
-HID_SC_PIVOTSUBT,58871,
 HID_SC_REDLIN_CTR,58934,
 HID_SC_RENAME_AUTOFMT,58943,
 HID_SC_RENAME_NAME,58913,
@@ -5904,7 +5903,6 @@ sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_VALUE,1493845018,
 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_SCDLG_PIVOTSUBT_CB_SHOWALL,1493828609,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DETECTCAT,2567504922,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DRILLDOWN,2567504926,
 sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER,2567504925,
@@ -5990,7 +5988,6 @@ 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_PIVOTSUBT_LB_FUNC,1493830657,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
@@ -6001,7 +5998,6 @@ sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284,
-sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485,
 sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_DOC,1495667213,
@@ -6030,9 +6026,6 @@ sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_DIV,1493434911,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_MUL,1493434910,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_NOOP,1493434907,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_SUB,1493434909,
-sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_AUTO,1493828098,
-sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_NONE,1493828097,
-sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_USER,1493828099,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
diff --git a/source/text/scalc/01/12090105.xhp b/source/text/scalc/01/12090105.xhp
index 0c9ae40..c84f8ce 100644
--- a/source/text/scalc/01/12090105.xhp
+++ b/source/text/scalc/01/12090105.xhp
@@ -27,33 +27,33 @@
 </topic>
 </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/pivotfielddialog/PivotFieldDialog" 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>
+<paragraph role="paragraph" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="modules/scalc/ui/pivotfielddialog/PivotFieldDialog">Specify the subtotals that you want to calculate.</ahelp></paragraph>
 <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>
+<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="modules/scalc/ui/pivotfielddialog/none">Does not calculate subtotals.</ahelp></paragraph>
 <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>
+<paragraph role="paragraph" id="par_id3155856" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="modules/scalc/ui/pivotfielddialog/auto">Automatically calculates subtotals.</ahelp></paragraph>
 <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"/>
+<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="modules/scalc/ui/pivotfielddialog/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/modules/scalc/ui/pivotfielddialog/functions" id="bm_id3145799" 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"/>
+<paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="modules/scalc/ui/pivotfielddialog/functions">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/modules/scalc/ui/pivotfielddialog/showall" id="bm_id3154015" localize="false"/>
 <paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="2" l10n="U" oldref="14">Show elements without data</paragraph>
-<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="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="modules/scalc/ui/pivotfielddialog/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/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"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/pivotfielddialog/options" id="bm_id2855922" localize="false"/>
 <paragraph role="heading" id="par_idN106F3" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
 <paragraph role="paragraph" id="par_idN106F7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/scalc/01/12090106.xhp">Data Field Options</link> dialog. The <emph>Options</emph> button is visible for column, row, or page fields only.</ahelp></paragraph>
 <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>
