advertised shotrcuts

The main goal of this patch was to simplify things. The LibreOffice
version that goes to Intel AppUp use advertsied shourtcuts, because
it is what Intel AppUp Center requires. We can reduce complexity a
bit, if we use advertised shortcuts in normal builds, too.

Conflicts:

	scp2/source/ooo/common_brand.scp
	setup_native/Package_misc.mk
	solenv/bin/modules/installer/globals.pm

Change-Id: Ia35a753c83cb592137232428ab897a640e7ccc1f

8 files changed, 12 insertions, 30 deletions

diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index c21c2a8c8c0c..aefc128b4892 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -30,14 +30,13 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sbase
     Name = "%PRODUCTNAME Base";
-    ModuleID = gid_Module_Prg_Base_Bin;
+    ModuleID = gid_Module_Brand_Prg_Base;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Sbase;
     IconFile = gid_File_Exe_Sbase;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
 End
 #endif
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index f77258ae7112..7fd14effaec4 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -30,14 +30,13 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Scalc
     Name = "%PRODUCTNAME Calc";
-    ModuleID = gid_Module_Prg_Calc_Bin;
+    ModuleID = gid_Module_Brand_Prg_Calc;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Scalc;
     IconFile = gid_File_Exe_Scalc;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
 End
 #endif
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 1fe1de25a8f1..76ce6c4b9350 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -30,14 +30,13 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sdraw
     Name = "%PRODUCTNAME Draw";
-    ModuleID = gid_Module_Prg_Draw_Bin;
+    ModuleID = gid_Module_Brand_Prg_Draw;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Sdraw;
     IconFile = gid_File_Exe_Sdraw;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
 End
 #endif
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index 31c56ad6a3d6..0f87196b24dc 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -30,14 +30,13 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Simpress
     Name = "%PRODUCTNAME Impress";
-    ModuleID = gid_Module_Prg_Impress_Bin;
+    ModuleID = gid_Module_Brand_Prg_Impress;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Simpress;
     IconFile = gid_File_Exe_Simpress;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
 End
 #endif
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 3ad3b07a24e1..e12e7996f6d5 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -30,14 +30,13 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Smath
     Name = "%PRODUCTNAME Math";
-    ModuleID = gid_Module_Prg_Math_Bin;
+    ModuleID = gid_Module_Brand_Prg_Math;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Smath;
     IconFile = gid_File_Exe_Smath;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
 End
 #endif
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 458ac691b1ce..dd1421363d36 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -67,7 +67,6 @@ Module gid_Module_Root_Brand
              gid_Brand_File_C05_Htm_Rgt,
              gid_Brand_File_C05_Pdf_Gettingstartedguide,
              gid_Brand_File_C05_Exe_Suptool,
-             gid_Brand_File_Desktophelper_Txt,
              gid_Brand_File_Html_Thirdpartylicensereadme,
              gid_Brand_File_Images_Brand_Zip,
              gid_Brand_File_Lib_Dbghelp,
@@ -542,16 +541,6 @@ 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 b714e7d4b8b8..226701f95890 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -29,36 +29,35 @@
 
 FolderItem gid_Folderitem_LibreOffice
     Name = "%PRODUCTNAME";
-    ModuleID = gid_Module_Root;
+    ModuleID = gid_Module_Root_Brand;
 #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 = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
 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;
+    ModuleID = gid_Module_Root_Brand;
     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 = (NOWEB,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 946ae6530277..88a4b5356169 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -30,14 +30,13 @@
 #ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Swriter
     Name = "%PRODUCTNAME Writer";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
+    ModuleID = gid_Module_Brand_Prg_Wrt;
     FolderID = gid_Folder_Staroffice51;
     FileID = gid_File_Exe_Swriter;
     IconFile = gid_File_Exe_Swriter;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
 End
 #endif