update helpids for conditional format dialog .ui conversion

Change-Id: Ie3f00dfcedbfd688e44746f3b3d61c32bdb3f7e6

3 files changed, 2 insertions, 34 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 559f942805..d3657bbc1d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5876,9 +5876,6 @@ sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_NUMFORMAT,1493533716,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_PATTERN,1493533720,
 sc_CheckBox_RID_SCDLG_CHARTCOLROW_1,1494516737,
 sc_CheckBox_RID_SCDLG_CHARTCOLROW_2,1494516738,
-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_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474,
 sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475,
 sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT,2568963085,
@@ -5933,12 +5930,6 @@ sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794,
 sc_DateField_RID_SCDLG_DPDATEGROUP_ED_END,1495440898,
 sc_DateField_RID_SCDLG_DPDATEGROUP_ED_START,1495440897,
 sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575,
-sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND1_1,2568521732,
-sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND1_2,2568521735,
-sc_Edit_RID_SCDLG_CONDFORMAT_EDT_COND2_1,2568521742,
-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_DAPISERVICE_ED_NAME,1495336973,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971,
@@ -5956,12 +5947,6 @@ sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231,
 sc_FloatingWindow_RID_SCDLG_TEAM,231304704,
 sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481,
 sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304,
-sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND1_1,2568531461,
-sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND1_2,2568531464,
-sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_1,2568531471,
-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_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
@@ -5969,15 +5954,6 @@ sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
 sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291,
 sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
 sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257,
-sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_1,2568523266,
-sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_2,2568523267,
-sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_TEMPLATE,2568523274,
-sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND2_1,2568523276,
-sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND2_2,2568523277,
-sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND2_TEMPLATE,2568523284,
-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_DAPIDATA_LB_DATABASE,1495354899,
 sc_ListBox_RID_SCDLG_DAPIDATA_LB_OBJTYPE,1495354903,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
@@ -6027,9 +6003,6 @@ sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
 sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_ADD,1493537385,
 sc_PushButton_RID_SCDLG_AUTOFORMAT_BTN_REMOVE,1493537386,
-sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND1_NEW,2568524322,
-sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND2_NEW,2568524323,
-sc_PushButton_RID_SCDLG_CONDFORMAT_BTN_COND3_NEW,2568524324,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
diff --git a/source/text/scalc/01/05120000.xhp b/source/text/scalc/01/05120000.xhp
index b0bb03c827..2babbfab2b 100644
--- a/source/text/scalc/01/05120000.xhp
+++ b/source/text/scalc/01/05120000.xhp
@@ -28,7 +28,7 @@
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatDialog" id="bm_id5008046" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ModalDialog:RID_SCDLG_CONDFORMAT" id="bm_id3152518" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog" id="bm_id3152518" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="1" l10n="U" oldref="1">Conditional Formatting</paragraph>
       <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph" l10n="U" oldref="2"><variable id="bedingtetext"><ahelp hid=".uno:ConditionalFormatDialog">Choose <emph>Conditional Formatting</emph> to define format styles depending on certain conditions.</ahelp>
 </variable> If a style was already assigned to a cell, it remains unchanged. The style entered here is then evaluated. There are several types of conditional formatting that can be used.</paragraph>
diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp
index 15a4f38219..633d282172 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -150,12 +150,7 @@
 <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"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_1" id="bm_id3155380" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_1" id="bm_id3150202" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_1" id="bm_id3150886" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_2" id="bm_id3150370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_2" id="bm_id3150519" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_2" id="bm_id3155532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/rbassign" id="bm_id3155532" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/managenamesdialog/assign" id="bm_id3159155" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/assignrb" id="bm_id3149262" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/rbfilterarea" id="bm_id3153190" localize="false"/>