diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
| commit | fd6649175956c9d322fe02fd413fe6970aa6819e (patch) | |
| tree | ce2691616f82ef55d3b8f3e45812777477e8668f /extensions/source/config | |
| parent | 79b252a56db8f1c2159d3269de415ffe2f2d9bb1 (diff) | |
| parent | a8feb5b1df99c12a5cb644097f935e9ccf512ed5 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions
Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk
Diffstat (limited to 'extensions/source/config')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/config/ldap/ldapuserprofilebe.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 30977dd23be4..681c33c40553 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -163,7 +163,7 @@ void LdapConnection::connectSimple() void LdapConnection::initConnection() throw (ldap::LdapConnectionException) { - if (mLdapDefinition.mServer.getLength() == 0) + if (mLdapDefinition.mServer.isEmpty()) { rtl::OUStringBuffer message ; @@ -230,7 +230,7 @@ void LdapConnection::initConnection() { if (!isValid()) { connectSimple(); } - if (aUser.getLength() == 0) + if (aUser.isEmpty()) { throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 3f59431ab224..8c9d24702416 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -178,7 +178,7 @@ bool LdapUserProfileBe::getLdapStringParam( xAccess->getByName(aLdapSetting) >>= sParam; aServerParameter = rtl::OUStringToOString(sParam, RTL_TEXTENCODING_ASCII_US); - return aServerParameter.getLength() != 0; + return !aServerParameter.isEmpty(); } //------------------------------------------------------------------------------ void LdapUserProfileBe::setPropertyValue( |