INTEGRATION: CWS systemmozilla (1.2.18); FILE MERGED

2005/03/03 14:46:20 rene 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED
2005/03/03 13:40:19 rene 1.2.18.1: #i17187# reanimate --disable-mozilla
This commit is contained in:
Rüdiger Timm 2005-03-30 10:41:08 +00:00
parent 2e629aab43
commit 80912f991c

View file

@ -2,9 +2,9 @@
*
* $RCSfile: module_hidden_ooo.scp,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: rt $ $Date: 2005-03-29 12:48:32 $
* last change: $Author: rt $ $Date: 2005-03-30 11:41:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -336,11 +336,13 @@ Module gid_Module_Root_Files_5
gid_File_Jar_AVmedia,
gid_File_Lib_AVMediaWin,
gid_File_Lib_XSec_Framework,
#ifndef WITHOUT_MOZILLA
gid_File_Lib_XSec_XmlSec,
gid_File_Lib_XSec_XMLSecurity,
gid_File_Lib_LibXMLSec_xmlseccore,
gid_File_Lib_LibXMLSec_xmlsecmscrypto,
gid_File_Lib_LibXMLSec_xmlsecnss,
#endif
gid_File_Lib_Migrationoo2);
End
@ -797,8 +799,12 @@ Module gid_Module_Root_Files_8
gid_File_Res_Uui,
gid_File_Res_Vcl,
gid_File_Res_Xsltdlg,
#ifndef WITHOUT_MOZILLA
gid_File_Res_AVMedia,
gid_File_Res_XMLSecurity);
#else
gid_File_Res_AVMedia);
#endif
End
#ifndef WITHOUT_FONTS