Fix HIDs in Java based Table/Query/Report wizards

Some HIDs were a bit off in these wizards
- Report Wizard 'Grouping' page
- Table Wizard 'Set primary key' page
- Query Wizard 'Grouping' page

All these contain a subclass of a FieldSelection.
Due to the implementation of HID handling there, we need 4 consecutive
HIDs in HelpIds.java for the buttons cmdMoveSelected, cmdMoveAll,
cmdRemoveSelected and cmdRemoveAll.

Above pages contain subclasses without the MoveAll and RemoveAll buttons
so we need empty placeholders in their places to cater for the assumptions
of the parent class.

This also means that HID numbers must be adjusted a bit, and in ReportWizard.java
we need to shift the base HID number of the Sorting page that follows
the Grouping page.

Change-Id: I944dd4f781aff2c0b0cfd99c3386001506c01440
Reviewed-on: https://gerrit.libreoffice.org/46270
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>

2 files changed, 37 insertions, 35 deletions

diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java
index de87206d2bac..2c1ae4fc7d5b 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.java
+++ b/wizards/com/sun/star/wizards/common/HelpIds.java
@@ -163,24 +163,24 @@ public class HelpIds
         PropertyNames.EMPTY_STRING,
         "HID:WIZARDS_HID_DLGREPORT_2_GROUPING",    // HID:34340
         "HID:WIZARDS_HID_DLGREPORT_2_CMDGROUP",    // HID:34341
-        "HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP",    // HID:34342
-        "HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST",    // HID:34343
-        "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP",    // HID:34344
-        "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP",    // HID:34345
-        "HID:WIZARDS_HID_DLGREPORT_3_SORT1",    // HID:34346
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1",    // HID:34347
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1",    // HID:34348
-        "HID:WIZARDS_HID_DLGREPORT_3_SORT2",    // HID:34349
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2",    // HID:34350
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2",    // HID:34351
-        "HID:WIZARDS_HID_DLGREPORT_3_SORT3",    // HID:34352
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3",    // HID:34353
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3",    // HID:34354
-        "HID:WIZARDS_HID_DLGREPORT_3_SORT4",    // HID:34355
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4",    // HID:34356
-        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4",    // HID:34357
-        PropertyNames.EMPTY_STRING,
-        PropertyNames.EMPTY_STRING,
+        PropertyNames.EMPTY_STRING, // HID:34342 empty, no moveall button
+        "HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP",    // HID:34343
+        PropertyNames.EMPTY_STRING, // HID:34344 empty, no removeall button
+        "HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST",    // HID:34345
+        "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP",    // HID:34346
+        "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP",    // HID:34347
+        "HID:WIZARDS_HID_DLGREPORT_3_SORT1",    // HID:34348
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1",    // HID:34349
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1",    // HID:34350
+        "HID:WIZARDS_HID_DLGREPORT_3_SORT2",    // HID:34351
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2",    // HID:34352
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2",    // HID:34353
+        "HID:WIZARDS_HID_DLGREPORT_3_SORT3",    // HID:34354
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3",    // HID:34355
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3",    // HID:34356
+        "HID:WIZARDS_HID_DLGREPORT_3_SORT4",    // HID:34357
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4",    // HID:34358
+        "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4",    // HID:34359
         PropertyNames.EMPTY_STRING,
         PropertyNames.EMPTY_STRING,
         "HID:WIZARDS_HID_DLGREPORT_4_TITLE",    // HID:34362
@@ -695,12 +695,12 @@ public class HelpIds
         PropertyNames.EMPTY_STRING,
         "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS",    // HID:40915
         "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED",    // HID:40916
-        "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED",    // HID:40917
-        "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS",    // HID:40918
-        "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP",    // HID:40919
-        "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN",    // HID:40920
-        PropertyNames.EMPTY_STRING,
-        PropertyNames.EMPTY_STRING,
+        PropertyNames.EMPTY_STRING, // HID:40917 empty, no moveall button
+        "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED",    // HID:40918
+        PropertyNames.EMPTY_STRING, // HID:40919 empty no removeall button
+        "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS",    // HID:40920
+        "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP",    // HID:409121
+        "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN",    // HID:40922
         "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL",    // HID:40923
         "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY",    // HID:40924
         "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1",    // HID:40925
@@ -1014,16 +1014,18 @@ public class HelpIds
         "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL",    // HID:41233
         "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE",    // HID:41234
         "HID:WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED",    // HID:41235
-        "HID:WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED",    // HID:41236
-        "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED",    // HID:41237
-        "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED",    // HID:41238
-        "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED",    // HID:41239
-        "HID:WIZARDS_HID_DLGTABLE_TXT_NAME",    // HID:41240
-        "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE",    // HID:41241
-        "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE",    // HID:41242
-        "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD",    // HID:41243
-        "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG",    // HID:41244
-        "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA"    // HID:41245
+        PropertyNames.EMPTY_STRING, // HID:41236 empty, no moveall button
+        "HID:WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED",    // HID:41237
+        PropertyNames.EMPTY_STRING, // HID:41238 empty, no removeall button
+        "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED",    // HID:41239
+        "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED",    // HID:41240
+        "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED",    // HID:41241
+        "HID:WIZARDS_HID_DLGTABLE_TXT_NAME",    // HID:41242
+        "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE",    // HID:41243
+        "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE",    // HID:41244
+        "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD",    // HID:41245
+        "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG",    // HID:41246
+        "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA"    // HID:41247
     };
 
     public static String getHelpIdString( int nHelpId )
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index e6ca5ab2afe6..92d53273c9ad 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -320,7 +320,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
         CurTitlesComponent = new TitlesComponent(this, SOTITLEPAGE, 97, 37, 210, 7, slblColumnNames, slblColumnTitles, 34381);
         CurTitlesComponent.addTextListener(this);
         CurGroupFieldHandler = new GroupFieldHandler(m_reportDocument, this);
-        CurSortingComponent = new SortingComponent(this, SOSORTPAGE, 95, 30, 210, 34346);
+        CurSortingComponent = new SortingComponent(this, SOSORTPAGE, 95, 30, 210, 34348);
         CurReportLayouter = new ReportLayouter(xMSF, m_reportDocument, this, isReportBuilderInstalled());
         CurReportFinalizer = new ReportFinalizer(m_reportDocument, this);
         bCloseDocument = true;