diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 13:36:51 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 13:36:51 +1000 |
| commit | fbf171d1adf3e260f6a93217e82a1b74cc4f670c (patch) | |
| tree | 61d54716ca4cf9afc9b45b8e0151903293ec654b /extensions/source/config/ldap | |
| parent | f1ac23866db030bd4489ab79a7e2e669070b9dab (diff) | |
tdf#43157: convert extensions module away from OSL_ASSERT to assert
Change-Id: Ib0de4a05ca14af4e5760d36bf56eab23995daa5b
Diffstat (limited to 'extensions/source/config/ldap')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/config/ldap/ldapuserprofilebe.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 5d2982315f25..0b94c9bf7751 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -170,7 +170,7 @@ void LdapConnection::initConnection() void LdapConnection::getUserProfile( const OUString& aUser, LdapData * data) { - OSL_ASSERT(data != nullptr); + assert(data != nullptr); if (!isValid()) { connectSimple(); } OUString aUserDn =findUserDn( aUser ); diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 54d60e335c50..1c1374b32451 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -90,7 +90,7 @@ bool LdapUserProfileBe::readLdapConfiguration( css::uno::Reference< css::uno::XComponentContext > const & context, LdapDefinition * definition, OUString * loggedOnUser) { - OSL_ASSERT(context.is() && definition != nullptr && loggedOnUser != nullptr); + assert(context.is() && definition != nullptr && loggedOnUser != nullptr); const OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; const OUString kComponent("org.openoffice.LDAP/UserDirectory"); const OUString kServerDefiniton("ServerDefinition"); |