INTEGRATION: CWS gcj3 (1.87.6); FILE MERGED

2005/03/08 15:28:20 cmc 1.87.6.2: #i44359# filter now compilable with gcj
2005/03/08 12:27:08 cmc 1.87.6.1: #i44359# bean now compilable with gcj
This commit is contained in:
Oliver Bolte 2005-03-15 08:23:14 +00:00
parent 3b26a0d3f2
commit 556356510c

View file

@ -2,9 +2,9 @@
*
* $RCSfile: file_library_ooo.scp,v $
*
* $Revision: 1.89 $
* $Revision: 1.90 $
*
* last change: $Author: vg $ $Date: 2005-03-10 18:23:28 $
* last change: $Author: obo $ $Date: 2005-03-15 09:23:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1251,7 +1251,6 @@ End
STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc)
#ifdef SOLAR_JAVA
#ifndef GCJ
#ifndef MACOSX
File gid_File_Lib_Officebean
@ -1265,7 +1264,6 @@ File gid_File_Lib_Officebean
#endif
End
#endif
#endif
#endif
@ -1995,11 +1993,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
STD_UNO_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
#ifdef SOLAR_JAVA
#ifndef GCJ
UNO_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
#endif
#endif
#ifdef UNX