[Libreoffice-commits] core.git: svx/source

[Caolán McNamara]

 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 66ebc285320b8dfb064ed6a06a13e5c78158b950
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 7 12:22:32 2017 +0100

    a11y: assert on switching hatch/bitmap area radio button tab things
    
    Change-Id: I2525123dfe2c2dedcbf808f5d2f8e054e4c4bdf1
    Reviewed-on: https://gerrit.libreoffice.org/39690
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index d27f18abe8b1..c2a048a82853 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -355,7 +355,7 @@ void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Refe
     {
         ::osl::MutexGuard   aGuard( m_aMutex );
         if (!mnClientId)
-                mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
+            mnClientId = comphelper::AccessibleEventNotifier::registerClient( );
         comphelper::AccessibleEventNotifier::addEventListener( mnClientId, xListener );
     }
 }
@@ -365,7 +365,8 @@ void SAL_CALL SvxPixelCtlAccessible::removeAccessibleEventListener( const uno::R
     if (xListener.is())
     {
         ::osl::MutexGuard   aGuard( m_aMutex );
-
+        if (!mnClientId)
+            return;
         sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener );
         if ( !nListenerCount )
         {