diff options
author | Dirk Voelzke <dv@openoffice.org> | 2010-01-20 14:07:34 +0100 |
---|---|---|
committer | Dirk Voelzke <dv@openoffice.org> | 2010-01-20 14:07:34 +0100 |
commit | 9f132f93858564c899189657a79ddd4528226ca8 (patch) | |
tree | dd80ac073e3926ce67868f74d3131fd3b4c3c86f /scp2/source/calc | |
parent | cdf426dc56cda6d9680cf13dde432aee6048766a (diff) | |
parent | 29215a2062903a6391d9903c2c8f47656181099d (diff) |
dv17: merge with DEV300_m69
Diffstat (limited to 'scp2/source/calc')
-rw-r--r-- | scp2/source/calc/file_calc.scp | 4 | ||||
-rwxr-xr-x | scp2/source/calc/registryitem_calc.scp | 8 |
2 files changed, 6 insertions, 6 deletions
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 fd1452fcb828..d787653dde76 100755 --- 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 |