summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/base/file_base.scp4
-rw-r--r--scp2/source/calc/file_calc.scp4
-rw-r--r--scp2/source/calc/registryitem_calc.scp4
-rw-r--r--scp2/source/canvas/canvascommons.scp2
-rw-r--r--scp2/source/draw/registryitem_draw.scp4
-rw-r--r--scp2/source/impress/registryitem_impress.scp4
-rw-r--r--scp2/source/layout/layout.scp8
-rw-r--r--scp2/source/math/file_math.scp2
-rw-r--r--scp2/source/math/registryitem_math.scp4
-rw-r--r--scp2/source/onlineupdate/file_onlineupdate.scp2
-rw-r--r--scp2/source/ooo/file_improvement.scp2
-rw-r--r--scp2/source/ooo/file_library_ooo.scp120
-rw-r--r--scp2/source/ooo/file_ooo.scp14
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp6
-rw-r--r--scp2/source/ooo/makefile.mk1
-rw-r--r--scp2/source/ooo/profile_ooo.scp2
-rw-r--r--scp2/source/ooo/registryitem_ooo.scp32
-rwxr-xr-xscp2/source/ooo/ure.scp10
-rw-r--r--scp2/source/ooo/vc_redist.scp41
-rwxr-xr-xscp2/source/ooo/windowscustomaction_ooo.scp6
-rw-r--r--scp2/source/writer/registryitem_writer.scp4
21 files changed, 140 insertions, 136 deletions
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 397929e7c6e9..4506962806b7 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -57,7 +57,7 @@ STD_RES_FILE( gid_File_Res_Abp, abp)
STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp)
STD_RES_FILE( gid_File_Res_Dbp, dbp)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbu, dbu )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu )
STD_RES_FILE( gid_File_Res_Dbu, dbu)
STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
@@ -67,7 +67,7 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Rpt, rpt )
+STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt )
STD_RES_FILE( gid_File_Res_Rpt, rpt)
STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui )
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 46c07cc0ed3a..a4865b67b416 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -52,9 +52,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)
STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index c720c0a85d0f..4a30287e6fce 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochand
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochand
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Insertable
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index b3a0d4505be5..87717292563a 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -30,7 +30,7 @@
#include "macros.inc"
-STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
+STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
#ifdef ENABLE_AGG
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 13b32fd71d0d..b06ca6430fe4 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochand
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochand
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Insertable
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 2e7d7f471cfe..cb23b879fc37 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochand
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochand
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Insertable
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 64629d480a20..0bb9d19ec2ab 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -38,28 +38,28 @@ End
File gid_File_Zip_Toolkit_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "toolkit-layout.zip";
End
File gid_File_Zip_Sc_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "sc-layout.zip";
End
File gid_File_Zip_Svx_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "svx-layout.zip";
End
File gid_File_Zip_Sw_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "sw-layout.zip";
End
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index f30914be604a..3426fea0f7e1 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -40,7 +40,7 @@ End
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sm , sm)
+STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm)
STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 84c246f60b3c..cc50981da023 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochand
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable
@@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochand
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Insertable
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index b65391b57dfa..6405511d48fc 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -30,7 +30,7 @@
#include "macros.inc"
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updchk , updchk.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
File gid_File_Share_Registry_Onlineupdate_Xcd
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index e81f7d63dd2c..37e3e3e0c731 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -40,5 +40,5 @@ End
#endif
#if defined(BUILD_SPECIAL)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovement , oooimprovement)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0a286e3da4e2..0d00efe51e3a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -150,13 +150,13 @@ File gid_File_Lib_Comphelper2
Name = STRING(CONCAT3(comphelp4,COMID,.dll));
#endif
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
-STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
+STD_LIB_FILE( gid_File_Lib_Cui, cui)
#ifndef SYSTEM_CURL
@@ -216,7 +216,7 @@ End
#endif
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dba, dba)
+STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba)
STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
@@ -224,7 +224,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
STD_LIB_FILE( gid_File_Lib_Dbfile , file)
STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
@@ -242,9 +242,9 @@ File gid_File_Lib_Dbpool
#endif
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbt, dbtools )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbaxml, dbaxml )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
File gid_File_Lib_Dict_Ja
TXT_FILE_BODY;
@@ -303,7 +303,7 @@ End
File gid_File_Lib_Dlgprov
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -403,7 +403,7 @@ End
#endif
-STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer)
+STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
@@ -413,11 +413,11 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
#if defined(WNT) && !defined(DISABLE_ATL)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser )
+STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser )
File gid_File_Lib_Inprocserv
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "inprocserv.dll";
End
@@ -486,7 +486,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
File gid_File_Lib_Filterconfig1
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
Name = SPECIAL_NAME(filterconfig1);
@@ -510,7 +510,7 @@ End
File gid_File_Lib_Fps
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
Name = "fps.dll";
@@ -559,7 +559,7 @@ End
#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
@@ -627,14 +627,14 @@ End
#endif
-STD_LIB_FILE_PATCH( gid_File_Lib_Fwe , fwe)
+STD_LIB_FILE( gid_File_Lib_Fwe , fwe)
STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
File gid_File_Lib_Fwk
Name = LIBNAME(fwk);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -655,7 +655,7 @@ End
File gid_File_Lib_Go
Name = LIBNAME(go);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -666,7 +666,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
File gid_File_Lib_I18npool
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -840,12 +840,12 @@ File gid_File_Lib_Rebasemsi
TXT_FILE_BODY;
Name = "rebase.dll";
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
+ Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
+STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng)
File gid_File_Lib_Localedata_En
TXT_FILE_BODY;
@@ -912,7 +912,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
File gid_File_Lib_Mozbootstrap
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -1002,7 +1002,7 @@ File gid_File_Lib_Mingw_GccS
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Name = MINGW_GCCDLL;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
End
#endif
@@ -1013,7 +1013,7 @@ File gid_File_Lib_Mingw_Stdcpp
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Name = MINGW_GXXDLL;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
End
#endif
@@ -1104,7 +1104,7 @@ End
STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
#ifndef WITHOUT_MOZILLA
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
+STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)
@@ -1115,13 +1115,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
File gid_File_Lib_Desktop_Detector
Name = LIBNAME(desktop_detector);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
File gid_File_Lib_Vclplug_Gen
Name = LIBNAME(vclplug_gen);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1131,7 +1131,7 @@ End
File gid_File_Lib_Vclplug_Gtk
Name = LIBNAME(vclplug_gtk);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1140,7 +1140,7 @@ End
File gid_File_Lib_Vclplug_Kde
Name = LIBNAME(vclplug_kde);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1176,7 +1176,7 @@ End
#endif
#if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
@@ -1227,7 +1227,7 @@ End
File gid_File_Lib_Res
Name = LIBNAME(res);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1258,9 +1258,9 @@ End
STD_LIB_FILE( gid_File_Lib_Sax , sax)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox , oox)
+STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
+STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
@@ -1277,15 +1277,15 @@ File gid_File_Lib_Scriptframe
#endif
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sd , sd)
-STD_LIB_FILE_PATCH( gid_File_Lib_Sdui, sdui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
File gid_File_Lib_Slideshow
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -1314,7 +1314,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
File gid_File_Lib_Sfx
Name = LIBNAME(sfx);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1342,7 +1342,7 @@ End
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sot, sot )
+STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot )
#if defined(UNX) && !defined(QUARTZ)
@@ -1357,7 +1357,7 @@ End
File gid_File_Lib_Spell
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(spell);
Dir = SCP2_OOO_BIN_DIR;
@@ -1369,24 +1369,24 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
STD_LIB_FILE( gid_File_Lib_Sts , sts)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
+STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
+STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-STD_LIB_FILE_PATCH( gid_File_Lib_Msfilter, msfilter)
+STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)
-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
#if ! defined UNX
File gid_File_Lib_Sysdtrans
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
Name = "sysdtrans.dll";
@@ -1457,13 +1457,13 @@ File gid_File_Lib_Ucpchelp1
End
#ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#ifndef SYSTEM_NEON
SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
#endif
#endif
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
@@ -1477,7 +1477,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
File gid_File_Lib_Lnth
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(lnth);
Dir = SCP2_OOO_BIN_DIR;
@@ -1485,22 +1485,22 @@ End
File gid_File_Lib_Hyph
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(hyphen);
Dir = SCP2_OOO_BIN_DIR;
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl)
+STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Uui, uui )
+STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui )
STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
File gid_File_Lib_Vcl
Name = LIBNAME(vcl);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1525,7 +1525,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
File gid_File_Lib_Xo
Name = LIBNAME(xo);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1588,7 +1588,7 @@ File gid_File_Lib_XSec_Framework
Name = "xsec_fw.dll";
#endif
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1600,7 +1600,7 @@ File gid_File_Lib_XSec_XmlSec
Name = "xsec_xmlsec.dll";
#endif
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1668,9 +1668,9 @@ End
STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Updchkui , updchk )
+STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk )
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
#ifdef WNT
File gid_File_Lib_Onlinecheck
@@ -1718,7 +1718,7 @@ File gid_File_Lib_Unopkgapp
Styles = (PACKED);
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
!(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4fcc73bef25d..7ba2624edd76 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -163,7 +163,7 @@ End
File gid_File_Profile_Gengal
BIN_FILE_BODY;
Dir = gid_Dir_Program;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
Name = PROFILENAME(gengal);
End
@@ -173,7 +173,7 @@ File gid_File_Bin_Pluginapp
BIN_FILE_BODY;
Dir = gid_Dir_Program;
Name = "pluginapp.bin";
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
End
#endif
@@ -348,7 +348,7 @@ End
STD_FILTER_FILE( gid_File_Filter_Eme, eme)
-STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
+STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
STD_FILTER_FILE( gid_File_Filter_Icg, icg)
@@ -515,7 +515,7 @@ File gid_File_Jar_Unoil
TXT_FILE_BODY;
Name = "unoil.jar";
Dir = gid_Dir_Classes;
- Styles = (PACKED,DONT_OVERWRITE,PATCH);
+ Styles = (PACKED,DONT_OVERWRITE);
End
#endif
@@ -1171,7 +1171,7 @@ End
File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Dir_Program;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Name = "offapi.rdb";
End
@@ -1671,7 +1671,7 @@ File gid_Starregistry_Services_Rdb
TXT_FILE_BODY;
Name = "services.rdb";
Dir = gid_Dir_Program;
- Styles = (PACKED, STARREGISTRY, PATCH);
+ Styles = (PACKED, STARREGISTRY);
#if defined WNT
NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
#else
@@ -1818,7 +1818,7 @@ File gid_File_Images_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images.zip";
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
End
File gid_File_ImagesCrystal_Zip
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index c0371115788f..010a3ec5efd6 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -87,7 +87,7 @@ STD_RES_FILE( gid_File_Res_San, san )
STD_RES_FILE( gid_File_Res_Sd, sd )
-STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx )
+STD_RES_FILE( gid_File_Res_Sfx, sfx )
#if defined(UNX) && !defined(QUARTZ)
@@ -101,7 +101,7 @@ STD_RES_FILE( gid_File_Res_Sb, sb )
STD_RES_FILE( gid_File_Res_Svs, svs )
STD_RES_FILE( gid_File_Res_Svt, svt )
-STD_RES_FILE_ONLY_PATCH( gid_File_Res_Svp, svp )
+STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
STD_RES_FILE( gid_File_Res_Svx, svx )
STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
@@ -115,7 +115,7 @@ STD_RES_FILE( gid_File_Res_Acc, acc )
STD_RES_FILE( gid_File_Res_Tpl, tpl )
-STD_RES_FILE_PATCH( gid_File_Res_Uui, uui )
+STD_RES_FILE( gid_File_Res_Uui, uui )
STD_RES_FILE( gid_File_Res_Vcl, vcl )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 345f28a8762c..aa8c3178c9fd 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -301,7 +301,6 @@ PARFILES += \
folder_ooo.par \
folderitem_ooo.par \
registryitem_ooo.par \
- mergemodules_ooo.par \
vc_redist.par \
windowscustomaction_ooo.par
.ENDIF
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index d61ab9d592d0..cbd331666851 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -45,7 +45,7 @@ Profile gid_Profile_Version_Ini_Basis
ModuleID = gid_Module_Root;
Name = PROFILENAME(version);
Dir = gid_Dir_Program;
- Styles = (PATCH);
+ Styles = ();
End
Profile gid_Profile_Fundamentalbasis_Ini
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index d06c4bd3864c..6544de17f993 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -266,7 +266,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Install
@@ -275,7 +275,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
@@ -284,7 +284,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Officeinstall
@@ -293,7 +293,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH,UPGRADEKEY);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion
@@ -302,7 +302,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "ProductVersion";
Value = "[ProductVersion]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Officeinstall
@@ -311,7 +311,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion
@@ -320,7 +320,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "ProductVersion";
Value = "[ProductVersion]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
@@ -329,7 +329,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
@@ -338,7 +338,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
@@ -347,7 +347,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
@@ -356,7 +356,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION,PATCH);
+ Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
@@ -365,7 +365,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
@@ -374,7 +374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
@@ -383,7 +383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
@@ -392,7 +392,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION,PATCH);
+ Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
@@ -401,7 +401,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Sog
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 1c260e2d2508..41f2b73adbe8 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -134,7 +134,7 @@ File gid_File_Exe_Javaldx
BIN_FILE_BODY;
Dir = gid_Dir_Ure_Bin;
Name = EXENAME(javaldx);
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
End
#endif
@@ -269,7 +269,7 @@ File gid_File_Dl_Sal
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER("sal", "3");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID,PATCH);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
End
@@ -336,7 +336,7 @@ File gid_File_Dl_Sunjavaplugin
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_BARE("sunjavaplugin");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
End
#endif
@@ -839,7 +839,7 @@ File gid_File_Dl_Libxml2
#else
Name = SCP2_URE_DL_VER("xml2", "2");
#endif
- Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
End
#endif
@@ -1208,7 +1208,7 @@ Profile gid_Profile_Version_Ini_Ure
ModuleID = gid_Module_Root_Ure_Hidden;
Name = PROFILENAME(version);
Dir = gid_Dir_Ure_Bin;
- Styles = (PATCH);
+ Styles = ();
End
ProfileItem gid_Ure_Profileitem_Version_Buildid
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index cefdd69ce034..b7e6e81dc331 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -30,25 +30,29 @@
#include "macros.inc"
#if defined(WITH_VC_REDIST)
-WindowsCustomAction gid_Customaction_InstallRuntime
- Name = "InstallRuntime";
- Typ = "98";
- Source = "SystemFolder";
- Target = "[SourceDir]redist\vcredist_x86.exe /qb";
- Inbinarytable = 0;
- Styles = (NO_FILE);
- Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-End
-WindowsCustomAction gid_Customaction_InstallRuntime_X64
- Name = "InstallRuntimeX64";
- Typ = "98";
- Source = "SystemFolder";
- Target = "[SourceDir]redist\vcredist_x64.exe /qb";
- Inbinarytable = 0;
- Styles = (NO_FILE);
- Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
-End
+// WindowsCustomAction gid_Customaction_InstallRuntime
+// Name = "InstallRuntime";
+// Typ = "98";
+// Source = "SystemFolder";
+// Target = "[SourceDir]redist\vcredist_x86.exe /qb";
+// Inbinarytable = 0;
+// Styles = (NO_FILE);
+// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
+// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
+// End
+
+// WindowsCustomAction gid_Customaction_InstallRuntime_X64
+// Name = "InstallRuntimeX64";
+// Typ = "98";
+// Source = "SystemFolder";
+// Target = "[SourceDir]redist\vcredist_x64.exe /qb";
+// Inbinarytable = 0;
+// Styles = (NO_FILE);
+// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
+// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
+// End
+
ScpAction scp_Copy_vcredist_x86
#if defined(BUILD_SPECIAL)
@@ -65,4 +69,5 @@ ScpAction scp_Copy_vcredist_x64
Name = "vcredist_x64.exe";
Subdir = "redist";
End
+
#endif
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index b4ddac39799b..ceb0b156cd7b 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -394,7 +394,7 @@ WindowsCustomAction gid_Customaction_Patch_Isofficerunning
Target = "IsOfficeRunning";
Inbinarytable = 1;
Assignment1 = ("ControlEvent", "ReadyToInstall", "InstallNow", "DoAction", "IsOfficeRunning", "1", "1");
- Assignment2 = ("InstallExecuteSequence", "", "RunningOffice");
+ Assignment2 = ("InstallExecuteSequence", "VersionNT < 600", "RunningOffice");
End
WindowsCustomAction gid_Customaction_Full_Isofficerunning
@@ -403,7 +403,7 @@ WindowsCustomAction gid_Customaction_Full_Isofficerunning
Source = "shlxtmsi.dll";
Target = "IsOfficeRunning";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "", "RunningOffice");
+ Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 Or Not PATCH", "RunningOffice");
End
WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
@@ -412,7 +412,7 @@ WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
Source = "lngpckinsthlp.dll";
Target = "IsOfficeRunning";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "PATCH", "RunningOffice");
+ Assignment1 = ("InstallExecuteSequence", "PATCH And VersionNT < 600", "RunningOffice");
End
WindowsCustomAction gid_Customaction_CheckPatchList
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 33616500ac29..819ba6128663 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochand
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochand
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable