update help ids for Resolve Conflicts dlg

Change-Id: I5b682de419e348bfe46ac34fcd1ac72251cbef2d

2 files changed, 5 insertions, 10 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d33cab66a7..8a97f7fd18 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2551,7 +2551,6 @@ HID_RPT_START_IMAGE,64517,
 HID_RPT_START_TITLE,64516,
 HID_RPT_VERT_SCROLLBAR,64459,
 HID_RUBY_DIALOG,34187,
-HID_SCDLG_CONFLICTS,59023,
 HID_SCH_CT_INDICATE,63291,
 HID_SCH_DATA_SERIES_LABEL,63367,
 HID_SCH_LEGEND_POS_BOTTOM,63343,
@@ -5073,10 +5072,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
-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_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/shared/guide/collab.xhp b/source/text/shared/guide/collab.xhp
index accd82fe80..22d675c4b2 100644
--- a/source/text/shared/guide/collab.xhp
+++ b/source/text/shared/guide/collab.xhp
@@ -64,15 +64,15 @@
 <paragraph id="par_id5323343" role="paragraph" xml-lang="en-US">The spreadsheet document is in shared mode.</paragraph>
 <paragraph id="par_id5824457" role="paragraph" xml-lang="en-US">The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode.</paragraph>
 </listitem></list><comment>Resolve Conflicts dialog</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/ConflictsDialog" id="bm_id9671926" localize="false"/>
 <paragraph id="par_id5800653" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph><comment>Keep Mine</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/keepmine" id="bm_id1640369" localize="false"/>
 <paragraph id="par_id6263924" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph><comment>Keep Other</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/keepother" id="bm_id1640360" localize="false"/>
 <paragraph id="par_id3609118" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph><comment>Keep All Mine</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/keepallmine" id="bm_id1640361" localize="false"/>
 <paragraph id="par_id7184057" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph><comment>Keep All Others</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/keepallothers" id="bm_id1640363" localize="false"/>
 <paragraph id="par_id786767" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph>
 <paragraph id="hd_id2934965" role="heading" xml-lang="en-US" level="3">Saving a shared spreadsheet document</paragraph>
 <paragraph id="par_id1174657" role="paragraph" xml-lang="en-US">User A saves a shared document. The following conditions can apply:</paragraph>