[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/aqua

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jun 29 03:22:24 PDT 2011


 vcl/aqua/source/a11y/aqua11yrolehelper.mm |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 30d4566c9685c091d08867adeb147a1cb2070c9e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 29 10:24:43 2011 +0100

    Related: fdo#38704 make simpleMapNativeRoleFrom::accessibleContext safer
    (cherry picked from commit 5efca1417e430a0f1ba169638955d3b5cf921dde)

diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
index b8ebdb0..55161bd 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
@@ -40,6 +40,10 @@ using namespace ::com::sun::star::uno;
 
 +(id)simpleMapNativeRoleFrom: (XAccessibleContext *) accessibleContext {
     id nativeRole = nil;
+
+    if (accessibleContext == NULL)
+        return nativeRole;
+
     switch( accessibleContext -> getAccessibleRole() ) {
 #define MAP(a,b) \
         case a: nativeRole = b; break


More information about the Libreoffice-commits mailing list