diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 720fb689e9b4..792fcd8fa328 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -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)