update helpids for solver dialog .ui conversion

Change-Id: I9e6ef6fb678dbc1c853fb9b6245b58a2d6b08b30

2 files changed, 37 insertions, 71 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1fd405d7ac..8ef203d028 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6591,17 +6591,6 @@ sc_Edit_RID_SCDLG_FILLSERIES_ED_START_VALUES,1493518388,
 sc_Edit_RID_SCDLG_FILTER_ED_COPY_AREA,2567079943,
 sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111,
 sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT1,2569209860,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT2,2569209861,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT3,2569209862,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT4,2569209863,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_OBJECTIVECELL,2569209857,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT1,2569209864,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT2,2569209865,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT3,2569209866,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT4,2569209867,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_TARGET,2569209858,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_VARIABLECELLS,2569209859,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943,
 sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326,
@@ -6640,21 +6629,6 @@ sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DEST_AREA,2567532076,
 sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438,
 sc_ImageButton_RID_SCDLG_FILTER_RB_COPY_AREA,2567089672,
 sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE1,2569219596,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE2,2569219597,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE3,2569219598,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE4,2569219599,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT1,2569219588,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT2,2569219589,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT3,2569219590,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT4,2569219591,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_OBJECTIVECELL,2569219585,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT1,2569219592,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT2,2569219593,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT3,2569219594,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT4,2569219595,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_TARGET,2569219586,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_VARIABLECELLS,2569219587,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604,
@@ -6713,10 +6687,6 @@ sc_ListBox_RID_SCDLG_IMPORTOPT_LB_FONT,1494175242,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCDLG_NEWSCENARIO_LB_COLOR,1493847574,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP1,2569211393,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP2,2569211394,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP3,2569211395,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP4,2569211396,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND1,1493749277,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND2,1493749278,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND3,1493749279,
@@ -6796,8 +6766,6 @@ 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_OPTSOLVER_BTN_OPTIONS,2569212417,
-sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_SOLVE,2569212420,
 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,
@@ -6852,9 +6820,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_OPTSOLVER_RB_MAX,2569208321,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_MIN,2569208322,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_VALUE,2569208323,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_AUTO,1493828098,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_NONE,1493828097,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_USER,1493828099,
diff --git a/source/text/scalc/01/solver.xhp b/source/text/scalc/01/solver.xhp
index a39d07746a..5c45daf26a 100644
--- a/source/text/scalc/01/solver.xhp
+++ b/source/text/scalc/01/solver.xhp
@@ -34,7 +34,8 @@
 <bookmark_value>back-solving</bookmark_value>
 <bookmark_value>solver</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:SolverDialog" id="bm_id5634022" localize="false"/><comment>mw changed "what-if...", "goal seek;" and made "back-solving;" a one level entry</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/SolverDialog" id="bm_id5634023" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SolverDialog" id="bm_id5634022" localize="false"/>
 <paragraph role="heading" id="hd_id9216284" xml-lang="en-US" level="1" l10n="NEW"><variable id="solver"><link href="text/scalc/01/solver.xhp">Solver</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id9210486" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Solver dialog. A solver allows to solve equations with multiple unknown variables by goal seeking methods.</ahelp></paragraph>
@@ -42,54 +43,54 @@
 <section id="howtoget">
 <embed href="text/scalc/00/00000406.xhp#solver"/>
 </section><comment>target cell</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL" id="bm_id8861964" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/targetedit" id="bm_id8861964" localize="false"/>
 <paragraph role="paragraph" id="par_id8538773" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter or click the cell reference of the target cell. This field takes the address of the cell whose value is to be optimized.</ahelp></paragraph><comment>maximum</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MAX" id="bm_id8373973" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/max" id="bm_id8373973" localize="false"/>
 <paragraph role="paragraph" id="par_id7564012" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Try to solve the equation for a maximum value of the target cell.</ahelp><comment>where is the equation?</comment></paragraph><comment>minimum</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MIN" id="bm_id6767174" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/min" id="bm_id6767174" localize="false"/>
 <paragraph role="paragraph" id="par_id1186254" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Try to solve the equation for a minimum value of the target cell.</ahelp></paragraph><comment>value of</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE" id="bm_id5222022" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/value" id="bm_id5222022" localize="false"/>
 <paragraph role="paragraph" id="par_id7432477" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Try to solve the equation to approach a given value of the target cell.</ahelp></paragraph><comment>value of text field</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET" id="bm_id2756126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/valueedit" id="bm_id2756126" localize="false"/>
 <paragraph role="paragraph" id="par_id7141026" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the value or a cell reference.</ahelp></paragraph><comment>by changing cells</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS" id="bm_id4908902" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/changeedit" id="bm_id4908902" localize="false"/>
 <paragraph role="paragraph" id="par_id8531449" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the cell range that can be changed.</ahelp></paragraph><comment>cell reference</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT1" id="bm_id8499099" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT2" id="bm_id9544663" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT3" id="bm_id5762199" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT4" id="bm_id9534287" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref1edit" id="bm_id8499099" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref2edit" id="bm_id9544663" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref3edit" id="bm_id5762199" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref4edit" id="bm_id9534287" localize="false"/>
 <paragraph role="paragraph" id="par_id9183935" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a cell reference.</ahelp></paragraph><comment>operators</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP1" id="bm_id9408551" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP2" id="bm_id1329386" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP3" id="bm_id4931180" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP4" id="bm_id5970030" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/op1list" id="bm_id9408551" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/op2list" id="bm_id1329386" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/op3list" id="bm_id4931180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/op4list" id="bm_id5970030" localize="false"/>
 <paragraph role="paragraph" id="par_id946684" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select an operator from the list.</ahelp><comment>what do these operators do? what is the meaning of Integer and Binary here?
 I hate such spec docs that leave so many questions</comment></paragraph><comment>value</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT1" id="bm_id496841" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT2" id="bm_id7440717" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT3" id="bm_id2470778" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT4" id="bm_id3389080" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var1edit" id="bm_id496841" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var2edit" id="bm_id7440717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var3edit" id="bm_id2470778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var4edit" id="bm_id3389080" localize="false"/>
 <paragraph role="paragraph" id="par_id9607226" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter a value or a cell reference.</ahelp></paragraph><comment>shrinker</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_OBJECTIVECELL" id="bm_id5104220" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_TARGET" id="bm_id6714" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_VARIABLECELLS" id="bm_id8507339" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT1" id="bm_id5296792" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT2" id="bm_id3949400" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT3" id="bm_id9991760" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT4" id="bm_id2726828" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT1" id="bm_id6034424" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT2" id="bm_id6998809" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT3" id="bm_id71413" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT4" id="bm_id2924283" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/targetbutton" id="bm_id5104220" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/valuebutton" id="bm_id6714" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/changebutton" id="bm_id8507339" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref1button" id="bm_id5296792" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref2button" id="bm_id3949400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref3button" id="bm_id9991760" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/ref4button" id="bm_id2726828" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var1button" id="bm_id6034424" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var2button" id="bm_id6998809" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var3button" id="bm_id71413" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/var4button" id="bm_id2924283" localize="false"/>
 <paragraph role="paragraph" id="par_id1939451" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to shrink or restore the dialog. You can click or select cells in the sheet. You can enter a cell reference manually in the input box.</ahelp></paragraph><comment>delete row</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE1" id="bm_id5781731" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE2" id="bm_id6942045" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE3" id="bm_id4721823" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE4" id="bm_id5806756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/del1" id="bm_id5781731" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/del2" id="bm_id6942045" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/del3" id="bm_id4721823" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/del4" id="bm_id5806756" localize="false"/>
 <paragraph role="paragraph" id="par_id9038972" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to remove the row from the list. Any rows from below this row move up.</ahelp></paragraph><comment>options button</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_OPTIONS" id="bm_id8915372" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/options" id="bm_id8915372" localize="false"/>
 <paragraph role="paragraph" id="par_id2423780" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Options dialog.</ahelp></paragraph><comment>solve button</comment>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_SOLVE" id="bm_id6070436" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/solverdlg/solve" id="bm_id6070436" localize="false"/>
 <paragraph role="paragraph" id="par_id2569658" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to solve the equation with the current settings. The dialog settings are retained until you close the current document.</ahelp></paragraph>
 <paragraph role="heading" id="par_id5474410" xml-lang="en-US" level="2" l10n="NEW">To solve equations with the solver</paragraph>
 <paragraph role="paragraph" id="par_id2216559" xml-lang="en-US" l10n="NEW">The goal of the solver process is to find those variable values of an equation that result in an optimized value in the <emph>target cell</emph>, also named the "objective". You can choose whether the value in the target cell should be a maximum, a minimum, or approaching a given value.</paragraph>