strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS configure17 (1.191.12); FILE MERGED

Browse source 
2006/04/12 19:49:30 rene 1.191.12.5: RESYNC: (1.195-1.197); FILE MERGED
2006/04/03 16:43:42 rene 1.191.12.4: #i63782# improve ldap configure patch, patch by geki
2006/04/03 16:04:37 rene 1.191.12.3: RESYNC: (1.192-1.195); FILE MERGED
2006/03/22 13:53:13 rene 1.191.12.2: RESYNC: (1.191-1.192); FILE MERGED
2006/03/22 13:13:24 rene 1.191.12.1: #i61380# make it possible to disable neon, patch by "geki"
This commit is contained in:
Jens-Heiner Rechtien 2006-04-20 12:34:52 +00:00
parent 9f06c8280f
commit d0533e39ff
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scp2/source/ooo/file_library_ooo.scp
View file

@ -4,9 +4,9 @@
*
* $RCSfile: file_library_ooo.scp,v $
*
* $Revision: 1.198 $
* $Revision: 1.199 $
*
* last change: $Author: hr $ $Date: 2006-04-19 13:50:25 $
* last change: $Author: hr $ $Date: 2006-04-20 13:34:52 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -157,8 +157,7 @@ File gid_File_Lib_Behelper
#endif
End
#ifndef WITHOUT_LDAP
#if !defined WITHOUT_MOZILLA || defined WITH_OPENLDAP
#ifdef WITH_LDAP
File gid_File_Lib_Ldapbe2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
@ -171,7 +170,6 @@ File gid_File_Lib_Ldapbe2
#endif
End
#endif
#endif
// BM: #117495# remove chart2 from setup. I just comment this
// out, because it will later be re-added
@ -2091,7 +2089,9 @@ File gid_File_Lib_Ucpchelp1
RegistryID = gid_Starregistry_Services_Rdb;
End
#ifndef DISABLE_NEON
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)