changefileheader2: #i10000#: convert files with CR/LF characters to CR only

4 files changed, 222 insertions, 222 deletions

diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 4639135bd9da..f61aac114bf9 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -27,18 +27,18 @@
 #ifndef CONNECTIVITY_SCONNECTION_HXX
 #define CONNECTIVITY_SCONNECTION_HXX
 
-#include "connectivity/CommonTools.hxx"

-

-#include "MCatalog.hxx"

+#include "connectivity/CommonTools.hxx"
+
+#include "MCatalog.hxx"
 #include "MColumnAlias.hxx"
-#include "OSubComponent.hxx"

-#include "TConnection.hxx"

+#include "OSubComponent.hxx"
+#include "TConnection.hxx"
 
-#include <com/sun/star/beans/PropertyValue.hpp>

-#include <com/sun/star/mozilla/MozillaProductType.hpp>

+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/mozilla/MozillaProductType.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-

+
 #include <cppuhelper/weakref.hxx>
 
 #include <memory>
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index df9bd444bac1..73c3fb16908b 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -23,7 +23,7 @@
  * for a copy of the LGPLv3 License.
  *
 ************************************************************************/
-

+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
 
@@ -89,44 +89,44 @@ namespace connectivity { namespace mozab {
                     CardPropertySetter  PropSetter;
                 };
                 const MapEntry aEntries[] = {
-                    { "FirstName",          "givenname",                                    DEF_CARD_ACCESS( FirstName ) },

-                    { "LastName",           "sn,surnname",                                  DEF_CARD_ACCESS( LastName ) },

-                    { "DisplayName",        "cn,commonname,displayname",                    DEF_CARD_ACCESS( DisplayName ) },

-                    { "NickName",           "xmozillanickname",                             DEF_CARD_ACCESS( NickName ) },

-                    { "PrimaryEmail",       "mail",                                         DEF_CARD_ACCESS( PrimaryEmail ) },

-                    { "SecondEmail",        "xmozillasecondemail",                          DEF_CARD_ACCESS( SecondEmail ) },

-                    { "WorkPhone",          "telephonenumber",                              DEF_CARD_ACCESS( WorkPhone ) },

-                    { "HomePhone",          "homephone",                                    DEF_CARD_ACCESS( HomePhone ) },

-                    { "FaxNumber",          "fax,facsimiletelephonenumber",                 DEF_CARD_ACCESS( FaxNumber ) },

-                    { "PagerNumber",        "pager,pagerphone",                             DEF_CARD_ACCESS( PagerNumber ) },

-                    { "CellularNumber",     "mobile,cellphone,carphone",                    DEF_CARD_ACCESS( CellularNumber ) },

-                    { "HomeAddress",        "homepostaladdress,mozillaHomeStreet",          DEF_CARD_ACCESS( HomeAddress ) },

-                    { "HomeAddress2",       "mozillaHomeStreet2",                           DEF_CARD_ACCESS( HomeAddress2 ) },

-                    { "HomeCity",           "homelocality,mozillaHomeLocalityName",         DEF_CARD_ACCESS( HomeCity ) },

-                    { "HomeState",          "homeregion,mozillaHomeState",                  DEF_CARD_ACCESS( HomeState ) },

-                    { "HomeZipCode",        "homepostalcode,mozillaHomePostalCode",         DEF_CARD_ACCESS( HomeZipCode ) },

-                    { "HomeCountry",        "homecountryname,mozillaHomeCountryName",       DEF_CARD_ACCESS( HomeCountry ) },

-                    { "WorkAddress",        "postofficebox,streetaddress,streetaddress1",   DEF_CARD_ACCESS( WorkAddress ) },

-                    { "WorkAddress2",       "streetaddress2",                               DEF_CARD_ACCESS( WorkAddress2 ) },

-                    { "WorkCity",           "l,locality",                                   DEF_CARD_ACCESS( WorkCity ) },

-                    { "WorkState",          "st,region",                                    DEF_CARD_ACCESS( WorkState ) },

-                    { "WorkZipCode",        "postalcode,zip",                               DEF_CARD_ACCESS( WorkZipCode ) },

-                    { "WorkCountry",        "countryname",                                  DEF_CARD_ACCESS( WorkCountry ) },

-                    { "JobTitle",           "title",                                        DEF_CARD_ACCESS( JobTitle ) },

-                    { "Department",         "ou,orgunit,department,departmentnumber",       DEF_CARD_ACCESS( Department ) },

-                    { "Company",            "o,company",                                    DEF_CARD_ACCESS( Company ) },

-                    { "WebPage1",           "workurl",                                      DEF_CARD_ACCESS( WebPage1 ) },

-                    { "WebPage2",           "homeurl",                                      DEF_CARD_ACCESS( WebPage2 ) },

-                    { "BirthYear",          "birthyear",                                    DEF_CARD_ACCESS( BirthYear ) },

-                    { "BirthMonth",         "birthmonth",                                   DEF_CARD_ACCESS( BirthMonth ) },

-                    { "BirthYear",          "birthday",                                     DEF_CARD_ACCESS( BirthDay ) },

-                    { "Custom1",            "custom1",                                      DEF_CARD_ACCESS( Custom1 ) },

-                    { "Custom2",            "custom2",                                      DEF_CARD_ACCESS( Custom2 ) },

-                    { "Custom3",            "custom3",                                      DEF_CARD_ACCESS( Custom3 ) },

-                    { "Custom4",            "custom4",                                      DEF_CARD_ACCESS( Custom4 ) },

-                    { "Notes",              "notes,description",                            DEF_CARD_ACCESS( Notes ) },

-                    { "PreferMailFormat",   "xmozillausehtmlmail",                          NULL, NULL },

-                    { NULL, NULL, NULL, NULL }

+                    { "FirstName",          "givenname",                                    DEF_CARD_ACCESS( FirstName ) },
+                    { "LastName",           "sn,surnname",                                  DEF_CARD_ACCESS( LastName ) },
+                    { "DisplayName",        "cn,commonname,displayname",                    DEF_CARD_ACCESS( DisplayName ) },
+                    { "NickName",           "xmozillanickname",                             DEF_CARD_ACCESS( NickName ) },
+                    { "PrimaryEmail",       "mail",                                         DEF_CARD_ACCESS( PrimaryEmail ) },
+                    { "SecondEmail",        "xmozillasecondemail",                          DEF_CARD_ACCESS( SecondEmail ) },
+                    { "WorkPhone",          "telephonenumber",                              DEF_CARD_ACCESS( WorkPhone ) },
+                    { "HomePhone",          "homephone",                                    DEF_CARD_ACCESS( HomePhone ) },
+                    { "FaxNumber",          "fax,facsimiletelephonenumber",                 DEF_CARD_ACCESS( FaxNumber ) },
+                    { "PagerNumber",        "pager,pagerphone",                             DEF_CARD_ACCESS( PagerNumber ) },
+                    { "CellularNumber",     "mobile,cellphone,carphone",                    DEF_CARD_ACCESS( CellularNumber ) },
+                    { "HomeAddress",        "homepostaladdress,mozillaHomeStreet",          DEF_CARD_ACCESS( HomeAddress ) },
+                    { "HomeAddress2",       "mozillaHomeStreet2",                           DEF_CARD_ACCESS( HomeAddress2 ) },
+                    { "HomeCity",           "homelocality,mozillaHomeLocalityName",         DEF_CARD_ACCESS( HomeCity ) },
+                    { "HomeState",          "homeregion,mozillaHomeState",                  DEF_CARD_ACCESS( HomeState ) },
+                    { "HomeZipCode",        "homepostalcode,mozillaHomePostalCode",         DEF_CARD_ACCESS( HomeZipCode ) },
+                    { "HomeCountry",        "homecountryname,mozillaHomeCountryName",       DEF_CARD_ACCESS( HomeCountry ) },
+                    { "WorkAddress",        "postofficebox,streetaddress,streetaddress1",   DEF_CARD_ACCESS( WorkAddress ) },
+                    { "WorkAddress2",       "streetaddress2",                               DEF_CARD_ACCESS( WorkAddress2 ) },
+                    { "WorkCity",           "l,locality",                                   DEF_CARD_ACCESS( WorkCity ) },
+                    { "WorkState",          "st,region",                                    DEF_CARD_ACCESS( WorkState ) },
+                    { "WorkZipCode",        "postalcode,zip",                               DEF_CARD_ACCESS( WorkZipCode ) },
+                    { "WorkCountry",        "countryname",                                  DEF_CARD_ACCESS( WorkCountry ) },
+                    { "JobTitle",           "title",                                        DEF_CARD_ACCESS( JobTitle ) },
+                    { "Department",         "ou,orgunit,department,departmentnumber",       DEF_CARD_ACCESS( Department ) },
+                    { "Company",            "o,company",                                    DEF_CARD_ACCESS( Company ) },
+                    { "WebPage1",           "workurl",                                      DEF_CARD_ACCESS( WebPage1 ) },
+                    { "WebPage2",           "homeurl",                                      DEF_CARD_ACCESS( WebPage2 ) },
+                    { "BirthYear",          "birthyear",                                    DEF_CARD_ACCESS( BirthYear ) },
+                    { "BirthMonth",         "birthmonth",                                   DEF_CARD_ACCESS( BirthMonth ) },
+                    { "BirthYear",          "birthday",                                     DEF_CARD_ACCESS( BirthDay ) },
+                    { "Custom1",            "custom1",                                      DEF_CARD_ACCESS( Custom1 ) },
+                    { "Custom2",            "custom2",                                      DEF_CARD_ACCESS( Custom2 ) },
+                    { "Custom3",            "custom3",                                      DEF_CARD_ACCESS( Custom3 ) },
+                    { "Custom4",            "custom4",                                      DEF_CARD_ACCESS( Custom4 ) },
+                    { "Notes",              "notes,description",                            DEF_CARD_ACCESS( Notes ) },
+                    { "PreferMailFormat",   "xmozillausehtmlmail",                          NULL, NULL },
+                    { NULL, NULL, NULL, NULL }
                 };
                 const MapEntry* loop = aEntries;
                 while ( loop->pAsciiPropertyName )
@@ -138,8 +138,8 @@ namespace connectivity { namespace mozab {
             }
             return aMap;
         }
-    }

-

+    }
+
     //====================================================================
     //= AttributeMap_Data
     //====================================================================
@@ -165,120 +165,120 @@ namespace connectivity { namespace mozab {
     NS_IMPL_THREADSAFE_ISUPPORTS1( MLdapAttributeMap, nsIAbLDAPAttributeMap )
 
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval)

-    {

-        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );

-

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

-        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );

-

-        if ( pos == rPropertyMap.end() )

-        {

-            _retval.SetIsVoid( PR_TRUE );

-        }

-        else

-        {

-            MTypeConverter::asciiToNsACString( pos->second.pLDAPAttributeList, _retval );

-        }

-

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval)
+    {
+        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
+
+        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
+        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );
+
+        if ( pos == rPropertyMap.end() )
+        {
+            _retval.SetIsVoid( PR_TRUE );
+        }
+        else
+        {
+            MTypeConverter::asciiToNsACString( pos->second.pLDAPAttributeList, _retval );
+        }
+
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::GetAttributes: not implemented!" );

-        (void)aProperty;

-        (void)aCount;

-        (void)aAttrs;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::GetAttributes: not implemented!" );
+        (void)aProperty;
+        (void)aCount;
+        (void)aAttrs;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval)

-    {

-        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );

-

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

-        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );

-

-        if ( pos == rPropertyMap.end() )

-        {

-            _retval.SetIsVoid( PR_TRUE );

-        }

-        else

-        {

-            sal_Int32 tokenPos(0);

-            ::rtl::OString sAttributeList( pos->second.pLDAPAttributeList );

-            MTypeConverter::asciiToNsACString( sAttributeList.getToken( 0, ',', tokenPos ).getStr(), _retval );

-        }

-

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval)
+    {
+        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
+
+        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
+        MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );
+
+        if ( pos == rPropertyMap.end() )
+        {
+            _retval.SetIsVoid( PR_TRUE );
+        }
+        else
+        {
+            sal_Int32 tokenPos(0);
+            ::rtl::OString sAttributeList( pos->second.pLDAPAttributeList );
+            MTypeConverter::asciiToNsACString( sAttributeList.getToken( 0, ',', tokenPos ).getStr(), _retval );
+        }
+
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::SetAttributeList: not implemented!" );

-        (void)aProperty;

-        (void)aAttributeList;

-        (void)allowInconsistencies;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::SetAttributeList: not implemented!" );
+        (void)aProperty;
+        (void)aAttributeList;
+        (void)allowInconsistencies;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::GetProperty: not implemented!" );

-        (void)aAttribute;

-        (void)_retval;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::GetProperty: not implemented!" );
+        (void)aAttribute;
+        (void)_retval;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::GetAllCardAttributes(nsACString & _retval)

-    {

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

-

-        ::rtl::OStringBuffer aAllAttributes;

-        for (   MapPropertiesToAttributes::const_iterator loop = rPropertyMap.begin();

-                loop != rPropertyMap.end();

-                ++loop

-            )

-        {

-            aAllAttributes.append( loop->second.pLDAPAttributeList );

-            if ( loop != rPropertyMap.end() )

-                aAllAttributes.append( ',' );

-        }

-

-        MTypeConverter::asciiToNsACString( aAllAttributes.getStr(), _retval );

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::GetAllCardAttributes(nsACString & _retval)
+    {
+        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
+
+        ::rtl::OStringBuffer aAllAttributes;
+        for (   MapPropertiesToAttributes::const_iterator loop = rPropertyMap.begin();
+                loop != rPropertyMap.end();
+                ++loop
+            )
+        {
+            aAllAttributes.append( loop->second.pLDAPAttributeList );
+            if ( loop != rPropertyMap.end() )
+                aAllAttributes.append( ',' );
+        }
+
+        MTypeConverter::asciiToNsACString( aAllAttributes.getStr(), _retval );
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::CheckState(void)

-    {

-        // we do not allow modifying the map, so we're always in a valid state

-        return NS_OK;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::CheckState(void)
+    {
+        // we do not allow modifying the map, so we're always in a valid state
+        return NS_OK;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName)

-    {

-        OSL_ENSURE( false, "MLdapAttributeMap::SetFromPrefs: not implemented!" );

-        (void)aPrefBranchName;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

+    NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName)
+    {
+        OSL_ENSURE( false, "MLdapAttributeMap::SetFromPrefs: not implemented!" );
+        (void)aPrefBranchName;
+        return NS_ERROR_NOT_IMPLEMENTED;
+    }
+
     // -------------------------------------------------------------------
-    NS_IMETHODIMP MLdapAttributeMap::SetCardPropertiesFromLDAPMessage(nsILDAPMessage* aMessage, nsIAbCard* aCard)

-    {

-        NS_ENSURE_ARG_POINTER( aMessage );

-        NS_ENSURE_ARG_POINTER( aCard );

-

-        // in case that's not present in the LDAP message: set the "preferred mail format" to "none"

-        aCard->SetPreferMailFormat( nsIAbPreferMailFormat::unknown );

-

+    NS_IMETHODIMP MLdapAttributeMap::SetCardPropertiesFromLDAPMessage(nsILDAPMessage* aMessage, nsIAbCard* aCard)
+    {
+        NS_ENSURE_ARG_POINTER( aMessage );
+        NS_ENSURE_ARG_POINTER( aCard );
+
+        // in case that's not present in the LDAP message: set the "preferred mail format" to "none"
+        aCard->SetPreferMailFormat( nsIAbPreferMailFormat::unknown );
+
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         for (   MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin();
                 prop != rPropertyMap.end();
@@ -293,34 +293,34 @@ namespace connectivity { namespace mozab {
             while ( tokenPos != -1 )
             {
                 sAttribute = sAttributeList.getToken( 0, ',', tokenPos );
-

-                // retrieve the values for the current attribute

-                PRUint32 valueCount = 0;

-                PRUnichar** values = NULL;

-                nsresult rv = aMessage->GetValues( sAttribute.getStr(), &valueCount, &values );

-                if ( NS_FAILED( rv ) )

-                    // try the next attribute

-                    continue;

-

-                if ( valueCount )

-                {

-                    CardPropertySetter propSetter = prop->second.PropSetter;

-                    OSL_ENSURE( propSetter,

-                        "MLdapAttributeMap::SetCardPropertiesFromLDAPMessage: "

-                        "unexpected: could retrieve an attribute value, but have no setter for it!" );

-                    if ( propSetter )

-                    {

-                        (aCard->*propSetter)( values[0] );

-                    }

-

-                    // we're done with this property - no need to handle the remaining attributes which

-                    // map to it

-                    break;

-                }

+
+                // retrieve the values for the current attribute
+                PRUint32 valueCount = 0;
+                PRUnichar** values = NULL;
+                nsresult rv = aMessage->GetValues( sAttribute.getStr(), &valueCount, &values );
+                if ( NS_FAILED( rv ) )
+                    // try the next attribute
+                    continue;
+
+                if ( valueCount )
+                {
+                    CardPropertySetter propSetter = prop->second.PropSetter;
+                    OSL_ENSURE( propSetter,
+                        "MLdapAttributeMap::SetCardPropertiesFromLDAPMessage: "
+                        "unexpected: could retrieve an attribute value, but have no setter for it!" );
+                    if ( propSetter )
+                    {
+                        (aCard->*propSetter)( values[0] );
+                    }
+
+                    // we're done with this property - no need to handle the remaining attributes which
+                    // map to it
+                    break;
+                }
             }
-        }

-        return NS_OK;

-    }

+        }
+        return NS_OK;
+    }
 
     // -------------------------------------------------------------------
     namespace
@@ -359,10 +359,10 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     void MLdapAttributeMap::fillCardFromResult( nsIAbCard& _card, const MQueryHelperResultEntry& _result )
     {
-        _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown );

-

-        ::rtl::OUString resultValue;

-

+        _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown );
+
+        ::rtl::OUString resultValue;
+
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         for (   MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin();
                 prop != rPropertyMap.end();
@@ -371,16 +371,16 @@ namespace connectivity { namespace mozab {
         {
             resultValue = _result.getValue( prop->first );
 
-            CardPropertySetter propSetter = prop->second.PropSetter;

-            if ( propSetter )

-            {

-        // PRUnichar != sal_Unicode in mingw

-                (_card.*propSetter)( reinterpret_cast_mingw_only<const PRUnichar *>(resultValue.getStr()) );

-            }

-            else

-            {

-                if ( prop->first.equals( "PreferMailFormat" ) )

-                {

+            CardPropertySetter propSetter = prop->second.PropSetter;
+            if ( propSetter )
+            {
+        // PRUnichar != sal_Unicode in mingw
+                (_card.*propSetter)( reinterpret_cast_mingw_only<const PRUnichar *>(resultValue.getStr()) );
+            }
+            else
+            {
+                if ( prop->first.equals( "PreferMailFormat" ) )
+                {
                     unsigned int format = nsIAbPreferMailFormat::unknown;
                     const PreferMailFormatType* pMailFormatType = lcl_getMailFormatTypes();
                     while ( pMailFormatType->description )
@@ -393,10 +393,10 @@ namespace connectivity { namespace mozab {
                         ++pMailFormatType;
                     }
                     _card.SetPreferMailFormat(format);
-                }

-                else

-                    OSL_ENSURE( false, "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );

-            }

+                }
+                else
+                    OSL_ENSURE( false, "MLdapAttributeMap::fillCardFromResult: unexpected property without default setters!" );
+            }
         }
     }
 
@@ -412,18 +412,18 @@ namespace connectivity { namespace mozab {
                 ++prop
             )
         {
-            CardPropertyGetter propGetter = prop->second.PropGetter;

-            if ( propGetter )

-            {

-                (_card.*propGetter)( getter_Copies( value ) );

-

+            CardPropertyGetter propGetter = prop->second.PropGetter;
+            if ( propGetter )
+            {
+                (_card.*propGetter)( getter_Copies( value ) );
+
                 nsAutoString temp( value );
                 MTypeConverter::nsStringToOUString( temp, resultValue );
-            }

-            else

-            {

-                if ( prop->first.equals( "PreferMailFormat" ) )

-                {

+            }
+            else
+            {
+                if ( prop->first.equals( "PreferMailFormat" ) )
+                {
                     unsigned int format = nsIAbPreferMailFormat::unknown;
                     _card.GetPreferMailFormat( &format );
                     const PreferMailFormatType* pMailFormatType = lcl_getMailFormatTypes();
@@ -436,11 +436,11 @@ namespace connectivity { namespace mozab {
                         }
                         ++pMailFormatType;
                     }
-                }

-                else

-                    OSL_ENSURE( false, "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );

-            }

-

+                }
+                else
+                    OSL_ENSURE( false, "MLdapAttributeMap::fillResultFromCard: unexpected property without default getters!" );
+            }
+
             _result.insert( prop->first, resultValue );
         }
     }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index a229dd5aaf41..043b0179ee99 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
@@ -23,7 +23,7 @@
  * for a copy of the LGPLv3 License.
  *
 ************************************************************************/
-

+
 #ifndef CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX
 #define CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX
 
diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
index 06e3f704c5f4..93aaa5c4a725 100755
--- a/connectivity/util/makefile.mk
+++ b/connectivity/util/makefile.mk
@@ -54,12 +54,12 @@ PACKLANG_IN :=
 PACKLANG_PARAM := --stringparam
 PACKLANG_XSL :=
     
-$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : 

-      @echo ===================================================================

-      @echo Building language package for driver $(@:b:s/Filter_//) 

-      @echo ===================================================================

-      +-$(MKDIRHIER) $(@:d)

-      $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@

+$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : 
+      @echo ===================================================================
+      @echo Building language package for driver $(@:b:s/Filter_//) 
+      @echo ===================================================================
+      +-$(MKDIRHIER) $(@:d)
+      $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@
 
 $(MISC)$/$(TARGET)_delzip :
     -$(RM) $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip