diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-05-06 12:16:21 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-05-06 12:16:21 +0200 |
| commit | 9c40c11b9a3b0f09c701670f97c4192c3d8215d7 (patch) | |
| tree | 61a9b558292d1d576398e91050d0e3aa7e0c6a59 /scp2 | |
| parent | 707230d6160c018a04ae460d73bc828ed8ae623a (diff) | |
| parent | 9873688fef0e3c5b7b17eb3f6ac6d026b94cf56f (diff) | |
jl152 merging with sb122
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/crashrep/file_crashrep.scp | 18 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
2 files changed, 2 insertions, 18 deletions
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp index f92f93f0b1d8..53ec1ac245eb 100644 --- a/scp2/source/crashrep/file_crashrep.scp +++ b/scp2/source/crashrep/file_crashrep.scp @@ -31,11 +31,7 @@ File gid_Brand_File_Bin_Crashreport BIN_FILE_BODY; - #ifdef UNX - Name = "crash_report.bin"; - #else - Name = "crashrep.exe"; - #endif + Name = EXENAME(crashrep); Dir = gid_Brand_Dir_Program; #ifdef WNT FileDescription = "%PRODUCTNAME Crashreporter"; @@ -66,15 +62,3 @@ File gid_Brand_File_Lib_Dbghelp End #endif - -#ifdef UNX - -File gid_Brand_File_Bin_Crashreport_Script - BIN_FILE_BODY; - Name = "crash_report"; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -End - -#endif - diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 400baaa5ef04..cc44163568d8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -84,7 +84,7 @@ File gid_File_Lib_Cached1 #endif End -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr) +SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) #ifdef WITH_LDAP File gid_File_Lib_Ldapbe2 |