diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:55:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:55:18 +0000 |
| commit | a824acbaa0b890d7f9dc69b01656cd74dee1e5da (patch) | |
| tree | c3ea449270186d0eca19a823009a66b07df2491f /scp2/source | |
| parent | 397875556b5d7a622b4c5714fcb120e72530e0e3 (diff) | |
INTEGRATION: CWS nojava1 (1.25.22); FILE MERGED
2004/11/02 22:33:56 haggai 1.25.22.4: RESYNC: (1.53-1.59); FILE MERGED
2004/10/19 14:42:02 haggai 1.25.22.3: RESYNC: (1.45-1.53); FILE MERGED
2004/09/24 14:42:52 haggai 1.25.22.2: RESYNC: (1.25-1.45); FILE MERGED
2004/08/16 15:33:58 cmc 1.25.22.1: #i33045# update scp2 to include jvmaccess and jvmfwk even without java, but drop xslt jars
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4c90620496b7..f304c0bdbc4f 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.61 $ +* $Revision: 1.62 $ * -* last change: $Author: pjunck $ $Date: 2004-11-03 09:19:40 $ +* last change: $Author: hr $ $Date: 2004-11-09 11:55:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1000,9 +1000,6 @@ End #endif - -#ifdef SOLAR_JAVA - File gid_File_Lib_Jvmaccess TXT_FILE_BODY; Dir = gid_Dir_Program; @@ -1014,8 +1011,6 @@ File gid_File_Lib_Jvmaccess Styles = (PACKED, SETUPZIP); End -#endif - STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng) File gid_File_Lib_Localedata_En |