summaryrefslogtreecommitdiff
path: root/scp2/source/ooo
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-10-28 23:03:56 +0100
committerMichael Stahl <mstahl@redhat.com>2014-10-29 11:37:49 +0100
commitf3616065a72656a11a75d7f5dae363050b03daed (patch)
treee062070df28986c6778fcff39d88bbe99cb2a61c /scp2/source/ooo
parent368729decbf368161b0fed3be262c2bad840b6f6 (diff)
installer: let's make missing FileID a fatal error
... because the upcoming AutoInstall conversions introduce dependency from FolderItem to auto-installed executables, and we want to ensure that that keeps working. Change-Id: I08d4aeddd28b93f080e201716597315e9a6ec2d6
Diffstat (limited to 'scp2/source/ooo')
-rw-r--r--scp2/source/ooo/common_brand.scp10
-rw-r--r--scp2/source/ooo/folderitem_ooo.scp8
2 files changed, 4 insertions, 14 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 314dd87cf3f5..01c072d65f08 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -505,16 +505,6 @@ End
#endif
#ifdef WNT
-// TODO: some FolderItem reference this?
-File gid_Brand_File_Bin_Soffice
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = EXENAME(soffice);
- Styles = (PACKED);
-End
-#endif
-
-#ifdef WNT
File gid_Brand_File_Desktophelper_Txt
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index ecfc7f234ba4..ff8a371354da 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -26,8 +26,8 @@ FolderItem gid_Folderitem_LibreOffice
#else
FolderID = gid_Folder_Staroffice51;
#endif
- FileID = gid_Brand_File_Bin_Soffice;
- IconFile = gid_Brand_File_Bin_Soffice;
+ FileID = auto_brand_exe_soffice;
+ IconFile = auto_brand_exe_soffice;
IconID = 0;
WkDir = gid_Brand_Dir_Program;
Parameter = "";
@@ -49,8 +49,8 @@ FolderItem gid_Folderitem_Soffice_Desktop
#endif
ModuleID = gid_Module_Root;
FolderID = PREDEFINED_DESKTOP;
- FileID = gid_Brand_File_Bin_Soffice;
- IconFile = gid_Brand_File_Bin_Soffice;
+ FileID = auto_brand_exe_soffice;
+ IconFile = auto_brand_exe_soffice;
IconID = 0;
ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
WkDir = gid_Brand_Dir_Program;