[Libreoffice] [PATCH] Fix fdo#39639 [EasyHack] Fix duplicate longname IDs

Hello,
the attached patch simply removes duplicated and unused IDs in
BackgroundsDialog.

Victor Lee

diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java 
b/wizards/com/sun/star/wizards/common/HelpIds.java
index 12af48a..4c9971b 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.java
+++ b/wizards/com/sun/star/wizards/common/HelpIds.java
@@ -139,10 +139,10 @@ public class HelpIds
         "HID:WIZARDS_HID_BG_BTN_IMG10",    // HID:34306
         "HID:WIZARDS_HID_BG_BTN_IMG11",    // HID:34307
         "HID:WIZARDS_HID_BG_BTN_IMG12",    // HID:34308
-        "HID:WIZARDS_HID_BG_BTN_IMG13",    // HID:34309
-        "HID:WIZARDS_HID_BG_BTN_IMG14",    // HID:34300
-        "HID:WIZARDS_HID_BG_BTN_IMG15",    // HID:34311
-        "HID:WIZARDS_HID_BG_BTN_IMG16",    // HID:34312
+        PropertyNames.EMPTY_STRING,
+        PropertyNames.EMPTY_STRING,
+        PropertyNames.EMPTY_STRING,
+        PropertyNames.EMPTY_STRING,
         PropertyNames.EMPTY_STRING,
         PropertyNames.EMPTY_STRING,
         PropertyNames.EMPTY_STRING,
diff --git a/wizards/com/sun/star/wizards/common/HelpIds.py 
b/wizards/com/sun/star/wizards/common/HelpIds.py
index c6bd1b7..38a8bf7 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.py
+++ b/wizards/com/sun/star/wizards/common/HelpIds.py
@@ -109,10 +109,10 @@ class HelpIds:
     "HID:WIZARDS_HID_BG_BTN_IMG10", # HID:34306
     "HID:WIZARDS_HID_BG_BTN_IMG11", # HID:34307
     "HID:WIZARDS_HID_BG_BTN_IMG12", # HID:34308
-    "HID:WIZARDS_HID_BG_BTN_IMG13", # HID:34309
-    "HID:WIZARDS_HID_BG_BTN_IMG14", # HID:34300
-    "HID:WIZARDS_HID_BG_BTN_IMG15", # HID:34311
-    "HID:WIZARDS_HID_BG_BTN_IMG16", # HID:34312
+    "",
+    "",
+    "",
+    "",
     "",
     "",
     "",
diff --git a/wizards/com/sun/star/wizards/web/WWHID.java 
b/wizards/com/sun/star/wizards/web/WWHID.java
index 8baa372..9cc7670 100644
--- a/wizards/com/sun/star/wizards/web/WWHID.java
+++ b/wizards/com/sun/star/wizards/web/WWHID.java
@@ -132,11 +132,7 @@ public interface WWHID
     public static final int HID_BG_BTN_IMG9 = 34200 + 105;
     public static final int HID_BG_BTN_IMG10 = 34200 + 106;
     public static final int HID_BG_BTN_IMG11 = 34200 + 107;
-    public static final int HID_BG_BTN_IMG12 = 34200 + 108;
-    public static final int HID_BG_BTN_IMG13 = 34200 + 109;
-    public static final int HID_BG_BTN_IMG14 = 34200 + 100;
-    public static final int HID_BG_BTN_IMG15 = 34200 + 111;
-    public static final int HID_BG_BTN_IMG16 = 34200 + 112;//   web wizard icons sets dialog
+    public static final int HID_BG_BTN_IMG12 = 34200 + 108;//   web wizard icons sets dialog
     public static final int HID_IS = 41000 + 0;
     public static final int HID_IS_ICONSETS = 41000 + 1;
     public static final int HID_IS_BTN_NONE = 41000 + 2;
diff --git a/wizards/com/sun/star/wizards/web/WWHID.py b/wizards/com/sun/star/wizards/web/WWHID.py
index 28b3aaa..c71fda8 100644
--- a/wizards/com/sun/star/wizards/web/WWHID.py
+++ b/wizards/com/sun/star/wizards/web/WWHID.py
@@ -86,11 +86,7 @@ HID_BG_BTN_IMG8 = 34200 + 104
 HID_BG_BTN_IMG9 = 34200 + 105
 HID_BG_BTN_IMG10 = 34200 + 106
 HID_BG_BTN_IMG11 = 34200 + 107
-HID_BG_BTN_IMG12 = 34200 + 108
-HID_BG_BTN_IMG13 = 34200 + 109
-HID_BG_BTN_IMG14 = 34200 + 100
-HID_BG_BTN_IMG15 = 34200 + 111
-HID_BG_BTN_IMG16 = 34200 + 112  #web wizard icons sets dialog
+HID_BG_BTN_IMG12 = 34200 + 108  #web wizard icons sets dialog
 HID_IS = 41000 + 0
 HID_IS_ICONSETS = 41000 + 1
 HID_IS_BTN_NONE = 41000 + 2
diff --git a/wizards/util/hidother.src b/wizards/util/hidother.src
index bf1953e..004b0ff 100644
--- a/wizards/util/hidother.src
+++ b/wizards/util/hidother.src
@@ -238,14 +238,6 @@ hidspecial HID { HelpID = HID_BG_BTN_IMG10; } ;
 hidspecial HID { HelpID = HID_BG_BTN_IMG11; } ;
 // #define     HID_BG_BTN_IMG12        34308
 hidspecial HID { HelpID = HID_BG_BTN_IMG12; } ;
-// #define     HID_BG_BTN_IMG13        34309
-hidspecial HID { HelpID = HID_BG_BTN_IMG13; } ;
-// #define     HID_BG_BTN_IMG14        34300
-hidspecial HID { HelpID = HID_BG_BTN_IMG14; } ;
-// #define     HID_BG_BTN_IMG15        34311
-hidspecial HID { HelpID = HID_BG_BTN_IMG15; } ;
-// #define     HID_BG_BTN_IMG16        34312
-hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ;
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Note: Web Wizard continues on 41000 later in this file.