diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-10-09 10:53:28 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-10-09 11:05:25 +0200 |
commit | bf7657fc2a91f71a8e9d380f77470ff8d07f2f8c (patch) | |
tree | f9857ccf3c2e1487b143a74c502863f1a5a1af83 /scp2 | |
parent | same identifier for different resources (diff) | |
download | core-bf7657fc2a91f71a8e9d380f77470ff8d07f2f8c.tar.gz core-bf7657fc2a91f71a8e9d380f77470ff8d07f2f8c.zip |
Killing even the last remenants of rebase
Change-Id: I649275360a1d57aeec03d3cecdb02f5f7ccdd1e8
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 11 | ||||
-rw-r--r-- | scp2/source/ooo/windowscustomaction_ooo.scp | 10 |
2 files changed, 0 insertions, 21 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3cc740ba3daa..66f3a77e59f6 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -824,17 +824,6 @@ End #endif -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_Rebasemsi - LIB_FILE_BODY; - Name = "rebase.dll"; - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); -End - -#endif /* WNT && HAVE_WINDOWS_SDK */ - STD_LIB_FILE( gid_File_Lib_Lng, lng) File gid_File_Lib_Localedata_En diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 6d3b11b69d7c..b489c3298b5f 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -401,16 +401,6 @@ WindowsCustomAction gid_Customaction_SortTree Assignment1 = ("ControlEvent", "CustomSetup", "Tree", "DoAction", "SortTree", "1", "1"); End -WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties - Name = "RebaseLibrariesOnProperties"; - Typ = "65"; - Source = "rebase.dll"; - Target = "RebaseLibrariesOnProperties"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end"); - Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end"); -End - WindowsCustomAction gid_Customaction_LookForRegisteredExtensions Name = "LookForRegisteredExtensions"; Typ = "65"; |