diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:20 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:20 +0100 |
| commit | d1862bfe1aa1d2e0357b2f6573c0c164e37bb832 (patch) | |
| tree | ceaa9be7ffed4c8e31d76a2ef8a85e4835fe98c0 /scp2 | |
| parent | 5f08d6e5a4383db99a1ed314181b594a338200dc (diff) | |
| parent | ad6c30fb49061ea7c65581823212e94ba1e82061 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 20 |
2 files changed, 6 insertions, 18 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index e70da019dc90..3bf0366c6313 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -514,6 +514,8 @@ File gid_Brand_File_Bin_Soffice_Bin Name = "soffice.bin"; End +#if defined UNX && ! defined MACOSX + File gid_File_Bin_QStart_Bin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; @@ -521,6 +523,8 @@ File gid_File_Bin_QStart_Bin Name = "oosplash.bin"; End +#endif + // use this for high detail file open dialog >= 5.1 windows #ifdef WNT File gid_Brand_File_Bin_Soffice_Bin_Manifest diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 035ab2cccaa2..65769d268113 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -108,7 +108,7 @@ File gid_File_Basic_Tutorials Name = "basicsrvtutorials.zip"; End -#ifdef UNX +#if defined UNX && ! defined MACOSX File gid_File_Bin_Pagein BIN_FILE_BODY; @@ -1286,7 +1286,7 @@ End #endif -#ifdef UNX +#if defined UNX && ! defined MACOSX File gid_File_Txt_Pagein_Calc TXT_FILE_BODY; @@ -1295,10 +1295,6 @@ File gid_File_Txt_Pagein_Calc Name = "pagein-calc"; End -#endif - -#ifdef UNX - File gid_File_Txt_Pagein_Common TXT_FILE_BODY; Dir = gid_Dir_Program; @@ -1306,10 +1302,6 @@ File gid_File_Txt_Pagein_Common Name = "pagein-common"; End -#endif - -#ifdef UNX - File gid_File_Txt_Pagein_Draw TXT_FILE_BODY; Dir = gid_Dir_Program; @@ -1317,10 +1309,6 @@ File gid_File_Txt_Pagein_Draw Name = "pagein-draw"; End -#endif - -#ifdef UNX - File gid_File_Txt_Pagein_Impress TXT_FILE_BODY; Dir = gid_Dir_Program; @@ -1328,10 +1316,6 @@ File gid_File_Txt_Pagein_Impress Name = "pagein-impress"; End -#endif - -#ifdef UNX - File gid_File_Txt_Pagein_Writer TXT_FILE_BODY; Dir = gid_Dir_Program; |