diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:12:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:12:56 +0000 |
| commit | 3c9461315b61877c1db6d6bfe3204464097aa86b (patch) | |
| tree | 559601990070f891f6c0ec0f33cfbc310c9f78e6 /scp2/source | |
| parent | a7ac73f4dd3f93bc8e4ca08bc1f7968f78c87a23 (diff) | |
INTEGRATION: CWS macosx10 (1.129.2); FILE MERGED
2005/07/25 12:05:14 tra 1.129.2.2: RESYNC: (1.129-1.134); FILE MERGED
2005/07/23 23:08:24 ericb 1.129.2.1: #i52381# gtk plugin can be used with Mac OS X
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index e03a4b6b0cef..460888f63b4e 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -2,9 +2,9 @@ * * $RCSfile: file_library_ooo.scp,v $ * -* $Revision: 1.136 $ +* $Revision: 1.137 $ * -* last change: $Author: hr $ $Date: 2005-08-05 12:55:52 $ +* last change: $Author: rt $ $Date: 2005-08-18 08:12:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -636,7 +636,6 @@ End #ifdef UNX #ifdef ENABLE_GTK #ifdef GTK_TWO_FOUR -#ifndef MACOSX File gid_File_Lib_Fps_Gnome TXT_FILE_BODY; Styles = (PACKED,PATCH); @@ -648,7 +647,6 @@ End #endif #endif #endif -#endif SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) @@ -1378,7 +1376,6 @@ End #ifdef UNX #ifdef ENABLE_GTK -#ifndef MACOSX File gid_File_Lib_Vclplug_Gtk Name = LIBNAME(vclplug_gtk); TXT_FILE_BODY; @@ -1386,7 +1383,6 @@ File gid_File_Lib_Vclplug_Gtk Dir = gid_Dir_Program; End #endif -#endif #ifdef ENABLE_KDE #ifndef MACOSX File gid_File_Lib_Vclplug_Kde |