diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-02 18:12:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 15:19:55 +0100 |
| commit | 827430c8c0417396b3c1d2a049ccddb818c89646 (patch) | |
| tree | 2b249c14dcbfb725469b4dd70c125d00486d2a84 /scp2/source/ooo/ure.scp | |
| parent | 1924d05e706e6308b4de3b6103ebb73976866d66 (diff) | |
Fold URE: Windows
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.
Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
Diffstat (limited to 'scp2/source/ooo/ure.scp')
| -rw-r--r-- | scp2/source/ooo/ure.scp | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 9bb8ebea2b2c..61af96a79ead 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -20,32 +20,6 @@ #include "AutoInstall/ure" -#if !defined MACOSX - -#if defined WNT -Directory gid_Dir_Common_Ure - ParentID = gid_Dir_Brand_Root; - HostName = "URE"; - Styles = (UREDIRECTORY); -End -#endif - -#if defined WNT -Directory gid_Dir_Ure_Bin - ParentID = gid_Dir_Common_Ure; - DosName = "bin"; -End -#endif - -#if defined WNT && defined ENABLE_JAVA -Directory gid_Dir_Ure_Java - ParentID = gid_Dir_Common_Ure; - DosName = "java"; -End -#endif - -#endif // !MACOSX - #if defined MACOSX Directory gid_Dir_Ure_Share_Misc ParentID = gid_Brand_Dir_Share_Ure_Share; @@ -53,13 +27,6 @@ Directory gid_Dir_Ure_Share_Misc End #endif -#ifdef WNT -Directory gid_Dir_Ure_Misc - ParentID = gid_Dir_Common_Ure; - DosName = "misc"; -End -#endif - // Public Dynamic Libraries: #ifdef AIX @@ -293,9 +260,7 @@ End File gid_File_Misc_TypesRdb TXT_FILE_BODY; -#ifdef WNT - Dir = gid_Dir_Ure_Misc; -#elif defined MACOSX +#if defined MACOSX Dir = gid_Dir_Ure_Share_Misc; #else Dir = gid_Brand_Dir_Program; @@ -306,9 +271,7 @@ End File gid_File_Misc_ServicesRdb TXT_FILE_BODY; -#ifdef WNT - Dir = gid_Dir_Ure_Misc; -#elif defined MACOSX +#if defined MACOSX Dir = gid_Dir_Ure_Share_Misc; #else Dir = gid_Brand_Dir_Program; @@ -328,10 +291,7 @@ Module gid_Module_Root_Ure_Hidden Sortkey = "2200"; Default = YES; Styles = (HIDDEN_ROOT); - Dirs = (gid_Dir_Ure_Bin, - gid_Dir_Ure_Misc, - gid_Dir_Ure_Java, - gid_Dir_Ure_Share_Misc); + Dirs = (gid_Dir_Ure_Share_Misc); Files = (auto_ure_ALL, gid_File_ThirdpartylicensereadmeHtml_Ure, gid_File_Readme_Ure, |