diff options
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 7 | ||||
-rw-r--r-- | extensions/source/logging/loggerconfig.cxx | 2 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.cxx | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 405c721b5174..2acd02731973 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -153,7 +153,7 @@ void LdapConnection::initConnection() OUStringBuffer message ; message.appendAscii("Cannot initialise connection to LDAP: No server specified.") ; - throw ldap::LdapConnectionException(message.makeStringAndClear(), NULL) ; + throw ldap::LdapConnectionException(message.makeStringAndClear()) ; } if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT; @@ -173,8 +173,7 @@ void LdapConnection::initConnection() message.append(mLdapDefinition.mServer) ; message.appendAscii(":") ; message.append(mLdapDefinition.mPort) ; - throw ldap::LdapConnectionException(message.makeStringAndClear(), - NULL) ; + throw ldap::LdapConnectionException(message.makeStringAndClear()); } } @@ -246,7 +245,7 @@ void LdapConnection::initConnection() if (aUser.isEmpty()) { throw lang::IllegalArgumentException( - OUString("LdapConnection::findUserDn -User id is empty"), + "LdapConnection::findUserDn -User id is empty", NULL, 0) ; } diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 2c9b462c2464..b951945fee18 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -227,7 +227,7 @@ namespace logging } if ( !bSuccess ) - throw ServiceNotRegisteredException( sServiceName, NULL ); + throw ServiceNotRegisteredException( sServiceName ); } return xInstance; diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 2547f87468ee..c0b6958964e0 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -81,10 +81,10 @@ namespace logging m_rMutex.acquire(); if ( !getIsInitialized() ) - throw DisposedException("component not initialized", NULL ); + throw DisposedException("component not initialized" ); if ( m_rBHelper.bDisposed ) - throw DisposedException("component already disposed", NULL ); + throw DisposedException("component already disposed" ); // fallback settings, in case they weren't passed at construction time if ( !getFormatter().is() ) |