[PATCH] update ids for consolidate dialog .ui conversion

Tamás Csikós (via_Code_Review) gerrit at gerrit.libreoffice.org
Mon Jul 22 10:13:35 PDT 2013 

Hi,

I would like you to review the following patch:

    https://gerrit.libreoffice.org/5035

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/35/5035/1

update ids for consolidate dialog .ui conversion

Change-Id: I92b434dde9361c669d8c6a5cccd9bc74e56aa5cf
---
M helpers/help_hid.lst
M source/text/scalc/01/12070000.xhp
M source/text/scalc/01/12070100.xhp
M source/text/shared/00/00000001.xhp
4 files changed, 23 insertions(+), 37 deletions(-)



diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7cf7da2..cc6dc8e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6287,9 +6287,6 @@
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND1,2568520705,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND2,2568520715,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND3,2568520725,
-sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_BYCOL,2567521332,
-sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_BYROW,2567521331,
-sc_CheckBox_RID_SCDLG_CONSOLIDATE_BTN_REFS,2567521341,
 sc_CheckBox_RID_SCDLG_DBNAMES_BTN_FORMAT,2567324695,
 sc_CheckBox_RID_SCDLG_DBNAMES_BTN_HEADER,2567324693,
 sc_CheckBox_RID_SCDLG_DBNAMES_BTN_SIZE,2567324694,
@@ -6360,8 +6357,6 @@
 sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND2_2,2568521745,
 sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND3_1,2568521752,
 sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND3_2,2568521755,
-sc_Edit_RID_SCDLG_CONSOLIDATE_ED_DATA_AREA,2567522337,
-sc_Edit_RID_SCDLG_CONSOLIDATE_ED_DEST_AREA,2567522347,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971,
@@ -6400,8 +6395,6 @@
 sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_2,2568531474,
 sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_1,2568531481,
 sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_2,2568531484,
-sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DATA_AREA,2567532066,
-sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DEST_AREA,2567532076,
 sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438,
 sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
@@ -6424,9 +6417,6 @@
 sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_1,2568523286,
 sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_2,2568523287,
 sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND3_TEMPLATE,2568523294,
-sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_DATA_AREA,2567523872,
-sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_DEST_AREA,2567523882,
-sc_ListBox_RID_SCDLG_CONSOLIDATE_LB_FUNC,2567523852,
 sc_ListBox_RID_SCDLG_DAPIDATA_LB_DATABASE,1495354899,
 sc_ListBox_RID_SCDLG_DAPIDATA_LB_OBJTYPE,1495354903,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
@@ -6472,7 +6462,6 @@
 sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136,
 sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816,
 sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
-sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060,
 sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481,
 sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
@@ -6481,7 +6470,6 @@
 sc_MultiLineEdit_TP_VALIDATION_ERROR_EDT_ERROR,548309529,
 sc_MultiLineEdit_TP_VALIDATION_INPUTHELP_EDT_INPUTHELP,548293135,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
-sc_MultiListBox_RID_SCDLG_CONSOLIDATE_LB_CONSAREAS,2567523350,
 sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137,
 sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657,
 sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931,
@@ -6500,8 +6488,6 @@
 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_CONSOLIDATE_BTN_ADD,2567524869,
-sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_REMOVE,2567524870,
 sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259,
 sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260,
 sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197,
diff --git a/source/text/scalc/01/12070000.xhp b/source/text/scalc/01/12070000.xhp
index f02c208..a52a17d 100644
--- a/source/text/scalc/01/12070000.xhp
+++ b/source/text/scalc/01/12070000.xhp
@@ -35,27 +35,27 @@
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#dnksd"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_FUNC" id="bm_id3149958" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/func" id="bm_id3149958" localize="false"/>
 <paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="8">Function</paragraph>
-<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNC">Select the function that you want to use to consolidate the data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:MultiListBox:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS" id="bm_id3144764" localize="false"/>
+<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="modules/scalc/ui/consolidatedialog/func">Select the function that you want to use to consolidate the data.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/consareas" id="bm_id3144764" localize="false"/>
 <paragraph role="heading" id="hd_id3147127" xml-lang="en-US" level="2" l10n="U" oldref="10">Consolidation ranges</paragraph>
-<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS">Displays the cell ranges that you want to consolidate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA" id="bm_id3149400" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA" id="bm_id3154018" localize="false"/>
+<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="modules/scalc/ui/consolidatedialog/consareas">Displays the cell ranges that you want to consolidate.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/lbdataarea" id="bm_id3149400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/eddataarea" id="bm_id3154018" localize="false"/>
 <paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2" l10n="U" oldref="12">Source data range</paragraph>
-<paragraph role="paragraph" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA">Specifies the cell range that you want to consolidate with the cell ranges listed in the <emph>Consolidation ranges </emph>box. Select a cell range in a sheet, and then click <emph>Add</emph>. You can also select a the name of a predefined cell from the <emph>Source data range </emph>list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="modules/scalc/ui/consolidatedialog/eddataarea">Specifies the cell range that you want to consolidate with the cell ranges listed in the <emph>Consolidation ranges </emph>box. Select a cell range in a sheet, and then click <emph>Add</emph>. You can also select a the name of a predefined cell from the <emph>Source data range </emph>list.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA" id="bm_id3156383" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA" id="bm_id3156382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/lbdestarea" id="bm_id3156383" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/eddestarea" id="bm_id3156382" localize="false"/>
 <paragraph role="heading" id="hd_id3155768" xml-lang="en-US" level="2" l10n="U" oldref="15">Copy results to</paragraph>
-<paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA">Displays the first cell in the range where the consolidation results will be displayed.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="modules/scalc/ui/consolidatedialog/eddestarea">Displays the first cell in the range where the consolidation results will be displayed.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen1"/>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_ADD" id="bm_id3145228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/add" id="bm_id3145228" localize="false"/>
 <paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="2" l10n="U" oldref="17">Add</paragraph>
-<paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD">Adds the cell range specified in the <emph>Source data range</emph> box to the <emph>Consolidation ranges </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_CONSOLIDATE:BTN_MORE" id="bm_id3159102" localize="false"/>
+<paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="modules/scalc/ui/consolidatedialog/add">Adds the cell range specified in the <emph>Source data range</emph> box to the <emph>Consolidation ranges </emph>box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/more" id="bm_id3159102" localize="false"/>
 <paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="2" l10n="U" oldref="19">More >></paragraph>
-<paragraph role="paragraph" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_CONSOLIDATE:BTN_MORE">Shows additional <link href="text/scalc/01/12070100.xhp" name="options">options</link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="modules/scalc/ui/consolidatedialog/more">Shows additional <link href="text/scalc/01/12070100.xhp" name="options">options</link>.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/scalc/01/12070100.xhp b/source/text/scalc/01/12070100.xhp
index bef39b9..cc2d014 100644
--- a/source/text/scalc/01/12070100.xhp
+++ b/source/text/scalc/01/12070100.xhp
@@ -36,13 +36,13 @@
   <paragraph role="heading" level="1" id="hd_id3151210" l10n="U" xml-lang="en-US" oldref="1">Consolidate by</paragraph>
   <paragraph role="heading" level="2" id="hd_id3125864" l10n="U" xml-lang="en-US" oldref="2">Consolidate by</paragraph>
   <paragraph role="paragraph" id="par_id3154909" l10n="U" xml-lang="en-US" oldref="3">Use this section if the cell ranges that you want to consolidate contain labels. You only need to select these options if the consolidation ranges contain similar labels and the data arranged is arranged differently.</paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYROW" xml-lang="en-US" id="bm_id3154684" localize="false"/><paragraph role="heading" level="3" id="hd_id3153968" l10n="U" xml-lang="en-US" oldref="4">Row labels</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3150441" xml-lang="en-US" oldref="5"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYROW" visibility="visible">Uses the row labels to arrange the consolidated data.</ahelp></paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYCOL" xml-lang="en-US" id="bm_id3149260" localize="false"/><paragraph role="heading" level="3" id="hd_id3146976" l10n="U" xml-lang="en-US" oldref="6">Column labels</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3155411" xml-lang="en-US" oldref="7"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYCOL" visibility="visible">Uses the column labels to arrange the consolidated data.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/consolidatedialog/byrow" xml-lang="en-US" id="bm_id3154684" localize="false"/><paragraph role="heading" level="3" id="hd_id3153968" l10n="U" xml-lang="en-US" oldref="4">Row labels</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3150441" xml-lang="en-US" oldref="5"><ahelp hid="modules/scalc/ui/consolidatedialog/byrow" visibility="visible">Uses the row labels to arrange the consolidated data.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/consolidatedialog/bycol" xml-lang="en-US" id="bm_id3149260" localize="false"/><paragraph role="heading" level="3" id="hd_id3146976" l10n="U" xml-lang="en-US" oldref="6">Column labels</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3155411" xml-lang="en-US" oldref="7"><ahelp hid="modules/scalc/ui/consolidatedialog/bycol" visibility="visible">Uses the column labels to arrange the consolidated data.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3153191" l10n="U" xml-lang="en-US" oldref="12">Options</paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_REFS" xml-lang="en-US" id="bm_id3153954" localize="false"/><paragraph role="heading" level="3" id="hd_id3159154" l10n="U" xml-lang="en-US" oldref="8">Link to source data</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3146986" xml-lang="en-US" oldref="9"><ahelp hid="SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_REFS" visibility="visible">Links the data in the consolidation range to the source data, and automatically updates the results of the consolidation when the source data is changed.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/consolidatedialog/refs" xml-lang="en-US" id="bm_id3153954" localize="false"/><paragraph role="heading" level="3" id="hd_id3159154" l10n="U" xml-lang="en-US" oldref="8">Link to source data</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3146986" xml-lang="en-US" oldref="9"><ahelp hid="modules/scalc/ui/consolidatedialog/refs" visibility="visible">Links the data in the consolidation range to the source data, and automatically updates the results of the consolidation when the source data is changed.</ahelp></paragraph>
   <paragraph role="heading" level="2" id="hd_id3163708" l10n="U" xml-lang="en-US" oldref="10">More <<</paragraph>
   <paragraph role="paragraph" id="par_id3151118" l10n="U" xml-lang="en-US" oldref="11">Hides the additional options.</paragraph>
   
diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp
index 6d45a39..1708573 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -101,7 +101,7 @@
          <paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="25"><ahelp hid=".">Deletes the selected element or elements after confirmation.</ahelp></paragraph>
       </section>
       <section id="loeschen1">
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_REMOVE" id="bm_id3146916" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/delete" id="bm_id3146916" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/customslideshows/delete" id="bm_id3147296" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_BIB_BASE:PB_DELETE" id="bm_id6168401" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/>
@@ -141,8 +141,8 @@
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/goalseekdlg/varbutton" id="bm_id3153363" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_AREA" id="bm_id3149400" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_DATA" id="bm_id3155962" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA" id="bm_id3145640" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA" id="bm_id3153713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/rbdataarea" id="bm_id3145640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/rbdestarea" id="bm_id3153713" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/printareasdialog/rbprintarea" id="bm_id3152596" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/printareasdialog/rbrepeatrow" id="bm_id3146975" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/printareasdialog/rbrepeatcol" id="bm_id3154321" localize="false"/>

-- 
To view, visit https://gerrit.libreoffice.org/5035
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92b434dde9361c669d8c6a5cccd9bc74e56aa5cf
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: master
Gerrit-Owner: Tamás Csikós <csks.tomi at gmail.com>

More information about the LibreOffice mailing list