diff options
Diffstat (limited to 'comphelper/source')
| -rw-r--r-- | comphelper/source/misc/accessiblecontexthelper.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/accessibleeventnotifier.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index 5f855ed20681..bbc4102c10a8 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -151,7 +151,7 @@ namespace comphelper if ( !isAlive() ) return; - if ( _rxListener.is() ) + if ( _rxListener.is() && m_pImpl->getClientId() ) { sal_Int32 nListenerCount = AccessibleEventNotifier::removeEventListener( m_pImpl->getClientId( ), _rxListener ); if ( !nListenerCount ) diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index 9c7d89a12985..742de12ff6cb 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -130,7 +130,7 @@ namespace // look up this client ClientMap &rClients = Clients::get(); rPos = rClients.find( nClient ); - OSL_ENSURE( rClients.end() != rPos, + assert( rClients.end() != rPos && "AccessibleEventNotifier::implLookupClient: invalid client id " "(did you register your client?)!" ); |