diff options
Diffstat (limited to 'scp2/source')
30 files changed, 510 insertions, 215 deletions
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index 8cc1c45e17e7..5f257af2e1b8 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -37,6 +37,16 @@ File gid_File_Lib_Soactivex Name = "so_activex.dll"; End +#ifdef BUILD_X64 + File gid_File_Lib_Soactivex64 + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "so_activex_x64.dll"; + ComponentCondition = "VersionNT64"; + End +#endif + File gid_File_Lib_Regactivex_Msi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk index 25a64f07cb64..86097032f455 100644 --- a/scp2/source/activex/makefile.mk +++ b/scp2/source/activex/makefile.mk @@ -41,6 +41,10 @@ TARGETTYPE=CUI .INCLUDE : settings.mk +.IF "$(BUILD_X64)"!="" +SCPDEFS+=-DBUILD_X64 +.ENDIF + SCP_PRODUCT_TYPE=osl .IF "$(GUI)"=="WNT" diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 074e5f36f064..4d39208f5d14 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -37,5 +37,5 @@ Module gid_Module_Optional_Activexcontrol Default = NO; Minimal = NO; ParentID = gid_Module_Optional; - Files = (gid_File_Lib_Soactivex, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi); + Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi); End diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index fa6c1cfcd661..0f34c3ad358d 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 89096b80f87c..3917d5f3e92f 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -51,9 +51,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 133dc6952c94..4a30287e6fce 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + Styles = (); End RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable @@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + 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 839cf429793c..67e374e6d584 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -43,7 +43,7 @@ File gid_File_Oo_Office_Canvas_Xcu Name = "/registry/data/org/openoffice/Office/Canvas.xcu"; End -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 f1f1a086c997..b06ca6430fe4 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + Styles = (); End RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable @@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + 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 5ba0cecb95d5..cb23b879fc37 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + Styles = (); End RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable @@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + 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 43436a75f82d..5bd506f7432b 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 5a55f1bf4b83..cc50981da023 100644 --- a/scp2/source/math/registryitem_math.scp +++ b/scp2/source/math/registryitem_math.scp @@ -83,8 +83,8 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Math_Bin; Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + Styles = (); End RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable @@ -202,8 +202,8 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Math_Bin; Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + 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 b415ea2ad9e7..470b69eb9030 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_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu TXT_FILE_BODY; diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp index 93110fe693eb..67ec89b15963 100644 --- a/scp2/source/ooo/file_improvement.scp +++ b/scp2/source/ooo/file_improvement.scp @@ -49,5 +49,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 05fc45675513..92bafc9053fe 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -203,13 +203,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 @@ -269,7 +269,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) @@ -277,7 +277,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 ) File gid_File_Oo_Office_Dataaccess_Dbase_Xcu TXT_FILE_BODY; Styles = (PACKED); @@ -301,9 +301,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; @@ -362,7 +362,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 @@ -399,7 +399,42 @@ File gid_File_Lib_Vbaobj #endif End +File gid_File_Lib_Vbaswobj + TXT_FILE_BODY; + Styles = (PACKED,UNO_COMPONENT); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = gid_Dir_Program; + #ifdef UNX + Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX)); + #else + Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll)); + #endif +End + +File gid_File_Lib_Vbamsforms + TXT_FILE_BODY; + Styles = (PACKED,UNO_COMPONENT); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = gid_Dir_Program; + #ifdef UNX + Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX)); + #else + Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll)); + #endif +End + #endif // VBA_EXTENSION +File gid_File_Lib_Vbahelper + TXT_FILE_BODY; + Styles = (PACKED); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX)); + #else + Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll)); + #endif +End #endif // ENABLE_VBA @@ -427,7 +462,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) @@ -437,11 +472,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 @@ -528,7 +563,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); @@ -558,7 +593,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"; @@ -607,7 +642,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); @@ -675,14 +710,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 @@ -703,7 +738,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 @@ -714,7 +749,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 @@ -900,12 +935,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; @@ -983,7 +1018,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 @@ -1073,7 +1108,7 @@ File gid_File_Lib_Mingw_GccS TXT_FILE_BODY; Dir = gid_Dir_Program; Name = MINGW_GCCDLL; - Styles = (PACKED, PATCH); + Styles = (PACKED); End #endif @@ -1084,7 +1119,7 @@ File gid_File_Lib_Mingw_Stdcpp TXT_FILE_BODY; Dir = gid_Dir_Program; Name = MINGW_GXXDLL; - Styles = (PACKED, PATCH); + Styles = (PACKED); End #endif @@ -1193,7 +1228,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) @@ -1204,13 +1239,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 @@ -1220,7 +1255,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 @@ -1229,7 +1264,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 @@ -1265,7 +1300,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 @@ -1316,7 +1351,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 @@ -1347,9 +1382,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) @@ -1366,15 +1401,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 @@ -1403,20 +1438,13 @@ 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 #ifdef WNT -File gid_File_Lib_OOoFilt - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "ooofilt.dll"; -End - File gid_File_Lib_Instooofiltmsi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); @@ -1438,7 +1466,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) @@ -1453,7 +1481,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; @@ -1465,24 +1493,24 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) STD_LIB_FILE( gid_File_Lib_Sts , sts) -STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl ) -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno ) +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_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter) -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_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw) -STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui) +STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) + +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"; @@ -1553,10 +1581,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) @@ -1570,7 +1601,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; @@ -1578,22 +1609,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 @@ -1618,7 +1649,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 @@ -1681,7 +1712,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 @@ -1693,7 +1724,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 @@ -1761,9 +1792,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 @@ -1811,7 +1842,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 7d1d8bb5cc40..5a280328e66a 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) @@ -503,17 +503,6 @@ End #endif #ifdef SOLAR_JAVA -#ifndef GCJ -File gid_File_Jar_Sandbox - TXT_FILE_BODY; - Name = JARFILENAME(sandbox); - Dir = gid_Dir_Classes; - Styles = (PACKED); -End -#endif -#endif - -#ifdef SOLAR_JAVA UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) @@ -526,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 @@ -1667,7 +1656,7 @@ End File gid_File_Oo_Office_Ui_Genericcommands_Xcu TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu"; End @@ -1730,7 +1719,7 @@ End File gid_File_Oo_Office_Linguistic_Xcs TXT_FILE_BODY; - Styles = (PACKED,PATCH); + Styles = (PACKED); Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs"; End @@ -2126,7 +2115,7 @@ End File gid_File_Rdb_Offapi TXT_FILE_BODY; Dir = gid_Dir_Program; - Styles = (PACKED,PATCH); + Styles = (PACKED); Name = "offapi.rdb"; End @@ -2724,7 +2713,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 @@ -2893,7 +2882,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 @@ -2903,6 +2892,13 @@ File gid_File_ImagesCrystal_Zip Styles = (PACKED); End +File gid_File_ImagesOxygen_Zip + TXT_FILE_BODY; + Dir = gid_Dir_Share_Config; + Name = "images_oxygen.zip"; + Styles = (PACKED); +End + File gid_File_ImagesHicontrast_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; @@ -2964,6 +2960,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Ca + Dir = gid_Brand_Dir_Share_Extension_Install; + Name = "dict-ca.oxt"; + Styles = (PACKED, FORCELANGUAGEPACK); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Cs Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-cs.oxt"; @@ -2982,15 +2987,33 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS -File gid_File_Extension_Dictionary_De +File gid_File_Extension_Dictionary_De_AT Dir = gid_Brand_Dir_Share_Extension_Install; - Name = "dict-de.oxt"; + Name = "dict-de-AT.oxt"; Styles = (PACKED, FORCELANGUAGEPACK); UnixRights = 444; End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_De_CH + Dir = gid_Brand_Dir_Share_Extension_Install; + Name = "dict-de-CH.oxt"; + Styles = (PACKED, FORCELANGUAGEPACK); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_De_DE + Dir = gid_Brand_Dir_Share_Extension_Install; + Name = "dict-de-DE.oxt"; + Styles = (PACKED, FORCELANGUAGEPACK); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_En Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-en.oxt"; @@ -3090,6 +3113,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_No + Dir = gid_Brand_Dir_Share_Extension_Install; + Name = "dict-no.oxt"; + Styles = (PACKED, FORCELANGUAGEPACK); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Pl Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-pl.oxt"; @@ -3108,6 +3140,15 @@ End #endif #ifndef WITHOUT_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Ro + Dir = gid_Brand_Dir_Share_Extension_Install; + Name = "dict-ro.oxt"; + Styles = (PACKED, FORCELANGUAGEPACK); + UnixRights = 444; +End +#endif + +#ifndef WITHOUT_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ru Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-ru.oxt"; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 14b02d2dfa83..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,11 +101,13 @@ 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 ) +STD_RES_FILE( gid_File_Res_Cui, cui ) + STD_RES_FILE( gid_File_Res_Sw, sw ) STD_RES_FILE( gid_File_Res_Tk, tk ) @@ -113,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 0d85cc529b63..aa8c3178c9fd 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -53,6 +53,11 @@ SCPDEFS+=-DENABLE_CRASHDUMP SCPDEFS+=-DBUILD_SPECIAL .ENDIF +.IF "$(BUILD_X64)"!="" +SCPDEFS+=-DBUILD_X64 +.ENDIF + + SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE .IF "$(PROF_EDITION)"!="" @@ -212,6 +217,9 @@ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR) .IF "$(DISABLE_NEON)" == "TRUE" SCPDEFS+=-DDISABLE_NEON .ENDIF +.IF "$(SYSTEM_NEON)" == "YES" +SCPDEFS+=-DSYSTEM_NEON +.ENDIF # if yes or unset (neon not used) -> do not install openssl library! .IF $(SYSTEM_OPENSSL) != "YES" @@ -293,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/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 97eb5f013be6..f1c647a5bb91 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -360,6 +360,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ucbhelper, gid_File_Lib_Ucpchelp1, gid_File_Lib_Ucpdav1, + gid_File_Lib_Neon, gid_File_Lib_Ucpfile1, gid_File_Lib_Ucpftp1, gid_File_Lib_Ucphier1, @@ -410,7 +411,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Reg4allmsdoc, gid_File_Lib_Qslnkmsi, gid_File_Lib_Sdqsmsi, - gid_File_Lib_OOoFilt, gid_File_Lib_Instooofiltmsi, gid_File_Lib_Smplmail, gid_File_Lib_Gconfebe, @@ -867,6 +867,7 @@ Module gid_Module_Root_Files_Images Styles = (HIDDEN_ROOT); Files = (gid_File_Images_Zip, gid_File_ImagesCrystal_Zip, + gid_File_ImagesOxygen_Zip, gid_File_ImagesHicontrast_Zip, gid_File_ImagesIndustrial_Zip, gid_File_ImagesTango_Zip, @@ -971,6 +972,17 @@ Module gid_Module_Root_Extension_Dictionary_Af Styles = (HIDDEN_ROOT); End +Module gid_Module_Root_Extension_Dictionary_Ca + Name = "gid_Module_Root_Extension_Dictionary_Ca"; + Description = "gid_Module_Root_Extension_Dictionary_Ca"; + Files = (gid_File_Extension_Dictionary_Ca); + InstallOrder = "2000"; + Spellcheckerlanguage = "ca"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + Styles = (HIDDEN_ROOT); +End + Module gid_Module_Root_Extension_Dictionary_Cs Name = "gid_Module_Root_Extension_Dictionary_Cs"; Description = "gid_Module_Root_Extension_Dictionary_Cs"; @@ -993,17 +1005,39 @@ Module gid_Module_Root_Extension_Dictionary_Da Styles = (HIDDEN_ROOT); End -Module gid_Module_Root_Extension_Dictionary_De - Name = "gid_Module_Root_Extension_Dictionary_De"; - Description = "gid_Module_Root_Extension_Dictionary_De"; - Files = (gid_File_Extension_Dictionary_De); +Module gid_Module_Root_Extension_Dictionary_De_AT + Name = "gid_Module_Root_Extension_Dictionary_De_AT"; + Description = "gid_Module_Root_Extension_Dictionary_De_AT"; + Files = (gid_File_Extension_Dictionary_De_AT); InstallOrder = "2000"; - Spellcheckerlanguage = "de"; + Spellcheckerlanguage = "de-AT"; PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root; Styles = (HIDDEN_ROOT); End +Module gid_Module_Root_Extension_Dictionary_De_CH + Name = "gid_Module_Root_Extension_Dictionary_De_CH"; + Description = "gid_Module_Root_Extension_Dictionary_De_CH"; + Files = (gid_File_Extension_Dictionary_De_CH); + InstallOrder = "2000"; + Spellcheckerlanguage = "de-CH"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + Styles = (HIDDEN_ROOT); +End + +Module gid_Module_Root_Extension_Dictionary_De_DE + Name = "gid_Module_Root_Extension_Dictionary_De_DE"; + Description = "gid_Module_Root_Extension_Dictionary_De_DE"; + Files = (gid_File_Extension_Dictionary_De_DE); + InstallOrder = "2000"; + Spellcheckerlanguage = "de-DE"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + Styles = (HIDDEN_ROOT); +End + Module gid_Module_Root_Extension_Dictionary_En Name = "gid_Module_Root_Extension_Dictionary_En"; Description = "gid_Module_Root_Extension_Dictionary_En"; @@ -1125,6 +1159,17 @@ Module gid_Module_Root_Extension_Dictionary_Nl Styles = (HIDDEN_ROOT); End +Module gid_Module_Root_Extension_Dictionary_No + Name = "gid_Module_Root_Extension_Dictionary_No"; + Description = "gid_Module_Root_Extension_Dictionary_No"; + Files = (gid_File_Extension_Dictionary_No); + InstallOrder = "2000"; + Spellcheckerlanguage = "no"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + Styles = (HIDDEN_ROOT); +End + Module gid_Module_Root_Extension_Dictionary_Pl Name = "gid_Module_Root_Extension_Dictionary_Pl"; Description = "gid_Module_Root_Extension_Dictionary_Pl"; @@ -1147,6 +1192,17 @@ Module gid_Module_Root_Extension_Dictionary_Pt Styles = (HIDDEN_ROOT); End +Module gid_Module_Root_Extension_Dictionary_Ro + Name = "gid_Module_Root_Extension_Dictionary_Ro"; + Description = "gid_Module_Root_Extension_Dictionary_Ro"; + Files = (gid_File_Extension_Dictionary_Ro); + InstallOrder = "2000"; + Spellcheckerlanguage = "ro"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root; + Styles = (HIDDEN_ROOT); +End + Module gid_Module_Root_Extension_Dictionary_Ru Name = "gid_Module_Root_Extension_Dictionary_Ru"; Description = "gid_Module_Root_Extension_Dictionary_Ru"; diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index d28fa5bb54dd..9f6329fabc77 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -96,6 +96,7 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Svt, gid_File_Res_Svp, gid_File_Res_Svx, + gid_File_Res_Cui, gid_File_Res_TextConversionDlgs, gid_File_Res_Sw, gid_File_Res_Tab, diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp index 97211fe6a5ac..34c3a5ce8957 100644 --- a/scp2/source/ooo/profile_ooo.scp +++ b/scp2/source/ooo/profile_ooo.scp @@ -56,7 +56,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 878ffc7f36cb..6544de17f993 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -37,6 +37,13 @@ RegistryItem gid_Regitem_Bau Value = "soffice.StarConfigFile.6"; End +RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}"; + ModuleID = gid_Module_Root; + Value = "%PRODUCTNAME Service Manager"; +End + RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}"; @@ -44,6 +51,14 @@ RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_ Value = "%PRODUCTNAME Service Manager (Ver 1.0)"; End +RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_AppID + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}"; + ModuleID = gid_Module_Root; + Name = "AppID"; + Value = "{82154420-0FBF-11d4-8313-005004526AB4}"; +End + RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Localserver32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\LocalServer32"; @@ -251,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 @@ -260,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 @@ -269,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 @@ -278,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 @@ -287,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 @@ -296,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 @@ -305,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 @@ -314,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 @@ -323,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 @@ -332,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 @@ -341,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 @@ -350,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 @@ -359,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 @@ -368,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 @@ -377,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 @@ -386,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 @@ -518,52 +533,6 @@ RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded Value = "<progpath>\program"; End -// Begin registry items for the MS Indexing server filter component - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -// Better?: "OpenOffice.org Format Filter" -// old: Value = "opendocument.org Filter"; - Value = "OpenDocument Format Filter"; - Styles = (); -End - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll"; -End - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}"; -//? Better: "OpenOffice.org Persistent Handler" -// old: Value = "opendocument.org Persistent Handler"; - Value = "OpenDocument Format Persistent Handler"; - Styles = (); -End - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}"; - Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -End - -// End registry items for the MS Indexing server filter component - // "OpenWith" Windows Registry keys for extensions supported by OOo // new oxt file extension for office extension packages 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 427f698bd467..b7e6e81dc331 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -30,15 +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 +// 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) @@ -49,4 +63,11 @@ ScpAction scp_Copy_vcredist_x86 Name = "vcredist_x86.exe"; Subdir = "redist"; End + +ScpAction scp_Copy_vcredist_x64 + Copy = "vcredist_x64.exe"; + 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 d5ececcbac73..ceb0b156cd7b 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -75,6 +75,24 @@ WindowsCustomAction gid_Customaction_Regactivexdll2 Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "RemoveExistingProducts"); End +WindowsCustomAction gid_Customaction_Reg64dll1 + Name = "Reg64dll1"; + Typ = "65"; + Source = "reg64msi.dll"; + Target = "InstallReg64"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" and VersionNT64", "end"); +End + +WindowsCustomAction gid_Customaction_Reg64dll2 + Name = "Reg64dll2"; + Typ = "65"; + Source = "reg64msi.dll"; + Target = "DeinstallReg64"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end"); +End + WindowsCustomAction gid_Customaction_Jfregcadll1 Name = "Jfregcadll1"; Typ = "65"; @@ -376,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 @@ -385,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 @@ -394,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/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 8f7d78fa4399..3e7cac6396cb 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -35,6 +35,40 @@ Directory gid_Dir_Shlxthdl DosName = "shlxthdl"; End +File gid_File_Lib_OOoFilt + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "ooofilt.dll"; +End + +File gid_File_Lib_OOoFiltProxy + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "ooofiltproxy.dll"; +End + +#ifdef BUILD_X64 + +File gid_File_Lib_OOoFilt64 + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "ooofilt_x64.dll"; + ComponentCondition = "VersionNT64"; +End + +File gid_File_Lib_OOoFiltProxy64 + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "ooofiltproxy_x64.dll"; + ComponentCondition = "VersionNT64"; +End + +#endif + File gid_File_Lib_Shlxthdl TXT_FILE_BODY; Styles = (PACKED); @@ -42,6 +76,17 @@ File gid_File_Lib_Shlxthdl Name = "shlxthdl.dll"; End +#ifdef BUILD_X64 + File gid_File_Lib_Shlxthdl64 + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "shlxthdl_x64.dll"; + ComponentCondition = "VersionNT64"; +End + +#endif + #if defined M1310 File gid_File_Lib_Shlxthdl_Msvcr71 TXT_FILE_BODY; @@ -56,4 +101,12 @@ File gid_File_Lib_Shlxtmsi Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); Dir = SCP2_OOO_BIN_DIR; Name = "shlxtmsi.dll"; -End
\ No newline at end of file +End + +File gid_File_Lib_Reg64 + TXT_FILE_BODY; + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); + Dir = SCP2_OOO_BIN_DIR; + Name = "reg64msi.dll"; +End + diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk index ce5ae0935ba6..6fc8ef03b382 100644 --- a/scp2/source/winexplorerext/makefile.mk +++ b/scp2/source/winexplorerext/makefile.mk @@ -41,6 +41,10 @@ TARGETTYPE=CUI .INCLUDE : settings.mk +.IF "$(BUILD_X64)"!="" +SCPDEFS+=-DBUILD_X64 +.ENDIF + SCP_PRODUCT_TYPE=osl .IF "$(GUI)"=="WNT" diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 9bed40ec8f81..605f5e61dd04 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -38,7 +38,13 @@ Module gid_Module_Optional_Winexplorerext ParentID = gid_Module_Optional; Dirs = (gid_Dir_Shlxthdl); Files = (gid_File_Lib_Shlxthdl, + gid_File_Lib_Shlxthdl64, + gid_File_Lib_OOoFilt, + gid_File_Lib_OOoFiltProxy, + gid_File_Lib_OOoFilt64, + gid_File_Lib_OOoFiltProxy64, gid_File_Lib_Shlxthdl_Msvcr71, gid_File_Lib_Shlxtmsi, + gid_File_Lib_Reg64, gid_File_Tmp_Userinstall_Winexplorerext_Inf); End diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index 54974e9dac1c..87084695ada0 100644 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -36,16 +36,20 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; + Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; End RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; Name = "ThreadingModel"; Value = "Apartment"; + Val64 = "Apartment"; End // End registry items for the Infotip handler @@ -55,16 +59,20 @@ End RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; + Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; End RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; Name = "ThreadingModel"; Value = "Apartment"; + Val64 = "Apartment"; End // End registry items for the Thumbnail viewer @@ -74,42 +82,106 @@ End RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; Value = "OpenOffice.org Column Handler"; + Val64 = "OpenOffice.org Column Handler"; End RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; + Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; End RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; Name = "ThreadingModel"; Value = "Apartment"; + Val64 = "Apartment"; End // End registry items for the Column handler +// Begin registry items for the MS Indexing server filter component + +RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Root; + Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; +// Better?: "OpenOffice.org Format Filter" +// old: Value = "opendocument.org Filter"; + Styles = (X64_ONLY); // Values: X64 + Value = "OpenDocument Format Filter"; + Val64 = "OpenDocument Format Filter"; +End + +RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32 + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Root; + Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; + Styles = (X64); // Values: X64 / X64_ONLY + Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll"; +End + +RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Root; + Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; + Styles = (X64); // Values: X64 + Name = "ThreadingModel"; + Value = "Apartment"; + Val64 = "Apartment"; +End + +RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Root; + Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}"; +//? Better: "OpenOffice.org Persistent Handler" +// old: Value = "opendocument.org Persistent Handler"; + Styles = (X64); // Values: X64 + Value = "OpenDocument Format Persistent Handler"; + Val64 = "OpenDocument Format Persistent Handler"; +End + +RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Root; + Styles = (X64); // Values: X64 + Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}"; + Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; + Val64 = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; +End + +// End registry items for the MS Indexing server filter component + // Begin registry entries for the PropertySheet handler RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; + Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; End RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; + Styles = (X64); Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; Name = "ThreadingModel"; Value = "Apartment"; + Val64 = "Apartment"; End -// End registry entries for the PropertySheet handler +// End registry entries for the PropertySheet handler
\ No newline at end of file diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 545225ca8950..819ba6128663 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -84,8 +84,8 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + Styles = (); End RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable @@ -203,8 +203,8 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochand ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32"; - Value = "[BASISINSTALLLOCATION]program\inprocserv.dll"; - Styles = (PATCH); + Value = "<progpath>\program\inprocserv.dll"; + Styles = (); End RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable |