fdo#65102 respect user's choice not to install desktop icon

Using advertised shortcuts -- inspired by Intel AppUp Centre's
requirement -- was not a good idea after all. I revert this,
and  I also revert the commit that actually disabled it in
default Windows builds.

This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e.
This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6.

8 files changed, 30 insertions, 12 deletions

diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index 2da4321a2b14..51a940b1d06f 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sbase
     Name = "%PRODUCTNAME Base";
-    ModuleID = gid_Module_Brand_Prg_Base;
+    ModuleID = gid_Module_Prg_Base_Bin;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Sbase;
     IconFile = gid_File_Exe_Sbase;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
 End
 
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index 83dd82b63684..05db68fded8e 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Scalc
     Name = "%PRODUCTNAME Calc";
-    ModuleID = gid_Module_Brand_Prg_Calc;
+    ModuleID = gid_Module_Prg_Calc_Bin;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Scalc;
     IconFile = gid_File_Exe_Scalc;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
 End
 
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index ba59ea722362..f6927072fe7e 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sdraw
     Name = "%PRODUCTNAME Draw";
-    ModuleID = gid_Module_Brand_Prg_Draw;
+    ModuleID = gid_Module_Prg_Draw_Bin;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Sdraw;
     IconFile = gid_File_Exe_Sdraw;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
 End
 
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index fb5c1360e0b3..44adbbe73796 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Simpress
     Name = "%PRODUCTNAME Impress";
-    ModuleID = gid_Module_Brand_Prg_Impress;
+    ModuleID = gid_Module_Prg_Impress_Bin;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Simpress;
     IconFile = gid_File_Exe_Simpress;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
 End
 
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 127773f52c83..fb8bbcd0df63 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Smath
     Name = "%PRODUCTNAME Math";
-    ModuleID = gid_Module_Brand_Prg_Math;
+    ModuleID = gid_Module_Prg_Math_Bin;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Smath;
     IconFile = gid_File_Exe_Smath;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
 End
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1b2e7df6c8ea..c2e296d626b6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -64,6 +64,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Libxml2,
              gid_Brand_File_Bmp_IntroAboutShell,
              gid_Brand_File_Bmp_IntroAboutShell_custom,
+	     gid_Brand_File_Desktophelper_Txt,
              gid_Brand_File_Html_Thirdpartylicensereadme,
              gid_Brand_File_Lib_Dbghelp,
              gid_Brand_File_Lib_Mingw_GccS,
@@ -559,6 +560,16 @@ File gid_Brand_File_Bin_Soffice_Bin_Manifest
 End
 #endif
 
+#ifdef WNT
+File gid_Brand_File_Desktophelper_Txt
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Program;
+    Name = "desktophelper.txt";
+    ComponentCondition = "CREATEDESKTOPLINK=1";
+End
+#endif
+
 File gid_Brand_File_Bin_Unoinfo
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index de77ba12141b..ecfc7f234ba4 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -20,19 +20,19 @@
 
 FolderItem gid_Folderitem_LibreOffice
     Name = "%PRODUCTNAME";
-    ModuleID = gid_Module_Root_Brand;
+    ModuleID = gid_Module_Root;
 #ifdef ENABLE_SILENT_MSI
     FolderID = PREDEFINED_STARTMENU;
-    Tooltip = "LibreOffice";
 #else
     FolderID = gid_Folder_Staroffice51;
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
 #endif
     FileID = gid_Brand_File_Bin_Soffice;
     IconFile = gid_Brand_File_Bin_Soffice;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
 End
 
 FolderItemProperty gid_Fip_LibreOffice_AppID
@@ -44,18 +44,19 @@ End
 FolderItem gid_Folderitem_Soffice_Desktop
 #ifdef ENABLE_SILENT_MSI
     Name = "%PRODUCTNAME";
-    Tooltip = "LibreOffice";
 #else
     Name = "%PRODUCTNAME %PRODUCTVERSION";
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
 #endif
-    ModuleID = gid_Module_Root_Brand;
+    ModuleID = gid_Module_Root;
     FolderID = PREDEFINED_DESKTOP;
     FileID = gid_Brand_File_Bin_Soffice;
     IconFile = gid_Brand_File_Bin_Soffice;
     IconID = 0;
+    ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED,USE_HELPER_FILENAME);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
     ComponentCondition = "CREATEDESKTOPLINK=1";
 End
 
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 0257a965aa51..c4f8dbf0adb6 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -21,13 +21,14 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Swriter
     Name = "%PRODUCTNAME Writer";
-    ModuleID = gid_Module_Brand_Prg_Wrt;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Swriter;
     IconFile = gid_File_Exe_Swriter;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
+    Styles = (NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
 End