INTEGRATION: CWS sb36 (1.98.2); FILE MERGED

2007/03/01 15:20:35 sb 1.98.2.7: #i51803# Added PATCH flags.
2007/02/22 10:23:48 sb 1.98.2.6: RESYNC: (1.181-1.183); FILE MERGED
2007/01/12 16:44:35 sb 1.98.2.5: RESYNC: (1.171-1.180); FILE MERGED
2006/11/08 18:48:11 sb 1.98.2.4: RESYNC: (1.144-1.171); FILE MERGED
2006/03/13 11:29:06 sb 1.98.2.3: RESYNC: (1.109-1.144); FILE MERGED
2005/09/22 12:45:58 sb 1.98.2.2: RESYNC: (1.98-1.109); FILE MERGED
2005/07/15 12:01:18 sb 1.98.2.1: #i51803# Removed obsolete xt.jar.
This commit is contained in:
Oliver Bolte 2007-03-12 10:01:30 +00:00
parent 911f8a434d
commit 6d04b41120

View file

@ -4,9 +4,9 @@
*
* $RCSfile: file_ooo.scp,v $
*
* $Revision: 1.183 $
* $Revision: 1.184 $
*
* last change: $Author: obo $ $Date: 2007-01-23 12:30:11 $
* last change: $Author: obo $ $Date: 2007-03-12 11:01:30 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -694,7 +694,7 @@ STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
#ifdef SOLAR_JAVA
STD_JAR_FILE( gid_File_Jar_Classes, classes )
STD_JAR_FILE_PATCH( gid_File_Jar_Classes, classes )
#endif
@ -778,7 +778,7 @@ UNO_JAR_FILE_PATCH( gid_File_Jar_Juh, juh )
#ifndef SYSTEM_HSQLDB
STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )
#endif
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif
#ifdef SOLAR_JAVA
@ -813,10 +813,10 @@ End
#endif
#ifdef SOLAR_JAVA
UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
UNO_JAR_FILE_PATCH( gid_File_Jar_Scriptframework, ScriptFramework )
UNO_JAR_FILE_PATCH( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
UNO_JAR_FILE_PATCH( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
UNO_JAR_FILE_PATCH( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
#endif
#ifdef SOLAR_JAVA