[Libreoffice-commits] .: scp2/source

[Andras Timar]

 scp2/source/ooo/folderitem_ooo.scp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 43353984e883d932e8fdaf3a25cc3d9bfc839dd0
Author: Andras Timar <atimar at suse.com>
Date:   Thu Nov 24 18:43:11 2011 +0100

    Desktop launcher w/o version number for silent MSI version

diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index 7381735..e1a25e9 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -45,7 +45,11 @@ FolderItem gid_Folderitem_Soffice
 End
 
 FolderItem gid_Folderitem_Soffice_Desktop
+#ifdef ENABLE_SILENT_MSI
+    Name = "%PRODUCTNAME";
+#else
     Name = "%PRODUCTNAME %PRODUCTVERSION";
+#endif
     ModuleID = gid_Module_Root;
     FolderID = PREDEFINED_DESKTOP;
     FileID = gid_Brand_File_Bin_Soffice;
@@ -54,7 +58,7 @@ FolderItem gid_Folderitem_Soffice_Desktop
     ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
-	Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
+    Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
     ComponentCondition = "CREATEDESKTOPLINK=1";
 End