diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:55:30 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:55:30 +0000 |
| commit | c85d818a4c11e32b17539605ef15d63600a5a49f (patch) | |
| tree | 7a9e73f3f7c9eddb78d2b74471b1116b2e89c8bd /scp2 | |
| parent | a824acbaa0b890d7f9dc69b01656cd74dee1e5da (diff) | |
INTEGRATION: CWS nojava1 (1.25.4); FILE MERGED
2004/11/02 22:34:04 haggai 1.25.4.6: RESYNC: (1.38-1.41); FILE MERGED
2004/10/21 11:30:29 cmc 1.25.4.5: RESYNC: (1.37-1.38); FILE MERGED
2004/10/19 14:42:12 haggai 1.25.4.4: RESYNC: (1.36-1.37); FILE MERGED
2004/10/15 19:44:05 haggai 1.25.4.3: #i35639# helpcontent2 needs Java - do not include files when building without Java
2004/09/24 14:42:59 haggai 1.25.4.2: RESYNC: (1.25-1.36); FILE MERGED
2004/08/16 15:33:58 cmc 1.25.4.1: #i33045# update scp2 to include jvmaccess and jvmfwk even without java, but drop xslt jars
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 94292ac06f54..a8b075b592ae 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2,9 +2,9 @@ * * $RCSfile: file_ooo.scp,v $ * -* $Revision: 1.42 $ +* $Revision: 1.43 $ * -* last change: $Author: pjunck $ $Date: 2004-11-02 14:57:48 $ +* last change: $Author: hr $ $Date: 2004-11-09 11:55:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -542,6 +542,8 @@ File gid_File_Fonts_Truetype_All_Delete_Only Styles = (DELETE_ONLY,CHECK_TIMESTAMP); End +#ifdef SOLAR_JAVA + File gid_File_Help_Common_Zip Dir = gid_Dir_Help_Isolanguage; ARCHIVE_TXT_FILE_BODY; @@ -566,6 +568,8 @@ File gid_File_Help_Schart_Zip EXTRA_ALL_LANG(schart); End +#endif + File gid_File_Html_Thirdpartylicensereadme Name = "THIRDPARTYLICENSEREADME.html"; Dir = PREDEFINED_PROGDIR; |