scp2: move impress executables to AutoInstall

Change-Id: I312a9921e8760ee93282ef0706469fdea3fabea9

Repository.mk

@@ -116,6 +116,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,draw_brand, \
 	) \
 ))
 
+$(eval $(call gb_Helper_register_executables_for_install,OOO,impress_brand, \
+	$(if $(filter WNT,$(OS)), \
+		simpress \
+	) \
+))
+
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 ))
@@ -159,7 +165,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(filter WNT,$(OS)), \
 		quickstart \
 		senddoc \
-		simpress \
 		smath \
 		sweb \
 		swriter \

scp2/AutoInstall.mk

@@ -24,6 +24,7 @@ $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE))

scp2/InstallModule_impress.mk

@@ -11,6 +11,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/impress))
 
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,\
 	impress \
+	impress_brand \
 	ogltrans \
 ))
 

scp2/source/impress/file_impress.scp

@@ -33,11 +33,11 @@ File gid_File_Help_Simpress_Zip
 End
 #endif
 
-#ifndef MACOSX
+#if !defined MACOSX && !defined WNT
 File gid_File_Exe_Simpress
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(simpress);
+    Name = "simpress";
     Styles = (PACKED);
 End
 #endif

scp2/source/impress/folderitem_impress.scp

@@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Simpress
     Name = "%PRODUCTNAME Impress";
     ModuleID = gid_Module_Prg_Impress_Bin;
     FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Simpress;
-    IconFile = gid_File_Exe_Simpress;
+    FileID = auto_impress_brand_exe_simpress;
+    IconFile = auto_impress_brand_exe_simpress;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";

scp2/source/impress/module_impress.scp

@@ -19,6 +19,7 @@
 #include "macros.inc"
 
 #include "AutoInstall/impress"
+#include "AutoInstall/impress_brand"
 
 Module gid_Module_Prg_Impress
     MOD_NAME_DESC ( MODULE_PRG_IMPRESS );
@@ -52,7 +53,7 @@ Module gid_Module_Brand_Prg_Impress
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Simpress);
+    Files = (auto_impress_brand_ALL,gid_File_Exe_Simpress);
 End
 
 Module gid_Module_Langpack_Impress_Template