summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 10:54:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 10:54:53 +0000
commitad7d63b5d338a322cd7bbe14a562d68e17ece2c2 (patch)
tree033b1790d4b721ad0e01df69062ad7105ffc66e0 /scp2
parent94e8b81105e1f2a3459d6d19a20eaa12f6f7afa7 (diff)
INTEGRATION: CWS nojava1 (1.5.64); FILE MERGED
2004/10/19 14:41:38 haggai 1.5.64.2: RESYNC: (1.5-1.6); FILE MERGED 2004/10/15 19:44:05 haggai 1.5.64.1: #i35639# helpcontent2 needs Java - do not include files when building without Java
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/impress/file_impress.scp8
1 files changed, 6 insertions, 2 deletions
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 69c02ee820aa..f4787b366648 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -2,9 +2,9 @@
*
* $RCSfile: file_impress.scp,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: kz $ $Date: 2004-10-04 18:08:32 $
+ * last change: $Author: hr $ $Date: 2004-11-09 11:54:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,8 @@ File gid_File_Oo_Office_Embedding_Impress_Pkg
Name = "embedding_impress.zip";
End
+#ifdef SOLAR_JAVA
+
File gid_File_Help_Simpress_Zip
Dir = gid_Dir_Help_Isolanguage;
TXT_FILE_BODY;
@@ -87,6 +89,8 @@ File gid_File_Help_Simpress_Zip
EXTRA_ALL_LANG(simpress);
End
+#endif
+
File gid_File_Exe_Simpress
BIN_FILE_BODY;
Dir = gid_Dir_Program;