diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-08 15:14:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-08 17:27:05 +0000 |
| commit | 8228227168a7eb3ebf14629bec87f01536c23970 (patch) | |
| tree | 8f3dc4787057b4fc7706fd81892dd47ada79c608 /comphelper | |
| parent | e794ce1eef6730e5a46d5fb0aa6db2895ede85e7 (diff) | |
convert OSL_ENSURE to assert in AccessibleEventNotifier
and fix the places that trigger it
Change-Id: I97a04cff25ab5aa1d42c79a971d15ba742bf384e
Reviewed-on: https://gerrit.libreoffice.org/31760
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'comphelper')
| -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?)!" ); |