INTEGRATION: CWS cfgldapfix (1.2.28); FILE MERGED

2004/10/13 12:59:58 jb 1.2.28.1: #i34115# Thorough review of the LDAP backend; Fixed some problems in initialization, error handling, as well as resource leaks and exception safety issues

1 files changed, 16 insertions, 16 deletions

diff --git a/extensions/source/config/ldap/ldapuserprof.hxx b/extensions/source/config/ldap/ldapuserprof.hxx
index e6ee62024ec0..7825d033c2f5 100644
--- a/extensions/source/config/ldap/ldapuserprof.hxx
+++ b/extensions/source/config/ldap/ldapuserprof.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ldapuserprof.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-03 14:38:29 $
+ *  last change: $Author: rt $ $Date: 2004-10-22 08:05:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,14 +62,18 @@
 #ifndef EXTENSIONS_CONFIG_LDAP_LDAPUSERPROF_HXX_
 #define EXTENSIONS_CONFIG_LDAP_LDAPUSERPROF_HXX_
 
+#ifndef LDAP_INCLUDED
+#define LDAP_INCLUDED
+#include <ldap/ldap.h>
+#endif // LDAP_INCLUDED
+
 #ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
 #endif // _RTL_USTRING_HXX_
 
-#ifndef MAP_INCLUDED
-#define MAP_INCLUDED
-#include <map>
-#endif // MAP_INCLUDED
+#ifndef _RTL_STRING_HXX_
+#include <rtl/string.hxx>
+#endif // _RTL_STRING_HXX_
 
 #ifndef VECTOR_INCLUDED
 #define VECTOR_INCLUDED
@@ -81,11 +85,6 @@
 #include <set>
 #endif // SET_INCLUDED
 
-#ifndef LDAP_INCLUDED
-#define LDAP_INCLUDED
-#include <mozilla/ldap/ldap.h>
-#endif // LDAP_INCLUDED
-
 
 namespace extensions { namespace config { namespace ldap {
 
@@ -98,15 +97,18 @@ struct LdapUserProfile {
     } ;
     /** List of attribute/value pairs */
     std::vector<ProfileEntry> mProfile ;
+
+    typedef std::vector<ProfileEntry>::const_iterator Iterator;
 } ;
 
 /** Provider of UserProfile mapping services */
-class LdapUserProfileMap {
+class LdapUserProfileMap
+{
     public :
         /** Default constructor, doesn't do much. */
-        LdapUserProfileMap(void) : mAttributes(NULL) {}
+        LdapUserProfileMap() : mAttributes(NULL) {}
         /** Destructor */
-        ~LdapUserProfileMap(void) ;
+        ~LdapUserProfileMap() ;
 
         /**
           Fills the map using a string description of the mapping.
@@ -174,8 +176,6 @@ class LdapUserProfileMap {
                                LDAPMessage *aEntry,
                                LdapUserProfile& aProfile) const ;
 
-    protected :
-
     private :
         /** Contains the mapping entries */
         std::vector<Mapping> mMapping ;