scp2/source/impress/registryitem_impress.scp | 1 +
scp2/source/ooo/common_brand.scp | 6 ++++++
scp2/source/ooo/folderitem_ooo.scp | 7 ++++++-
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit e7ba76a27f9f56ee4c92ddc413c44c32706342ef
Author: Andras Timar <ati...@suse.com>
Date: Thu Nov 24 18:41:52 2011 +0100
Desktop launcher w/o version number for silent MSI version
diff --git a/scp2/source/impress/registryitem_impress.scp
b/scp2/source/impress/registryitem_impress.scp
index 063bcf9..ead0603 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -1034,6 +1034,7 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_MSO_Reg, ppt,
PPT, MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_MSO_Reg, pps,
PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg,
ppsx, PPSX, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg,
pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg,
pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,
gid_Module_Prg_Impress_MSO_Reg, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34,
simpress.exe, new, Impress )
diff --git a/scp2/source/ooo/folderitem_ooo.scp
b/scp2/source/ooo/folderitem_ooo.scp
index d00148a..1e9b0d2 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -46,8 +46,13 @@ FolderItem gid_Folderitem_Soffice
End
FolderItem gid_Folderitem_Soffice_Desktop
+#ifdef ENABLE_SILENT_MSI
+ Name = "%PRODUCTNAME";
+ Name (pt-BR) = "%PRODUCTNAME_BR";
+#else
Name = "%PRODUCTNAME %PRODUCTVERSION";
Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
+#endif
ModuleID = gid_Module_Root;
FolderID = PREDEFINED_DESKTOP;
FileID = gid_Brand_File_Bin_Soffice;
@@ -56,7 +61,7 @@ FolderItem gid_Folderitem_Soffice_Desktop
ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
WkDir = gid_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
commit 4c944a35288785430feb3046fe8b9a08ca038308
Author: Andras Timar <ati...@suse.com>
Date: Wed Nov 23 13:40:17 2011 +0100
create this dir so uninstall can remove it
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2557f0d..19f560f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -413,6 +413,12 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache
Styles = (CREATE);
End
+Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
+ ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache;
+ DosName = "uno_packages";
+ Styles = (CREATE);
+End
+
Directory gid_Brand_Dir_Share_Registry
ParentID = gid_Brand_Dir_Share;
DosName = "registry";
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
