commit d0c26c83c5e5cfd99be56aea2a01cc83a1dc8e7a
Author: Samuel Thibault <sthibault@hypra.fr>
Date:   Wed Aug 8 13:43:02 2018 +0200

    tdf#116542 a11y: Make fixedtext use STATIC role
    
    Change-Id: I2d6dc805aa5e1e75a0aabe515fe566405224640c

diff --git a/offapi/com/sun/star/awt/AccessibleFixedText.idl b/offapi/com/sun/star/awt/AccessibleFixedText.idl
index bf50561..e6759f6 100644
--- a/offapi/com/sun/star/awt/AccessibleFixedText.idl
+++ b/offapi/com/sun/star/awt/AccessibleFixedText.idl
@@ -39,7 +39,8 @@ service AccessibleFixedText
 
         <ul>
         <li>Role: The role of a fixed text is
-        com::sun::star::accessibility::AccessibleRole::LABEL.</li>
+        com::sun::star::accessibility::AccessibleRole::LABEL or
+        com::sun::star::accessibility::AccessibleRole::STATIC.</li>
         <li>Name: The name of a fixed text is its localized label.</li>
         <li>Description: The description of a fixed text is its localized
             help text.</li>
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
index 0fc71d6..aa474a0 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
@@ -147,7 +147,7 @@ public class AccessibleFixedText extends TestCase {
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
 
-        oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL);
+        oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL); // STATIC?
 
         log.println("ImplementationName " + utils.getImplName(oObj));
 
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 7500f05..bb2a879 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -333,7 +333,12 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
 
         case WindowType::TREELISTBOX: nRole = accessibility::AccessibleRole::TREE; break;
 
-        case WindowType::FIXEDTEXT: nRole = accessibility::AccessibleRole::LABEL; break;
+        case WindowType::FIXEDTEXT:
+            if (getAccessibleRelationLabelFor())
+                nRole = accessibility::AccessibleRole::LABEL;
+            else
+                nRole = accessibility::AccessibleRole::STATIC; // really? Might bring a lot of spurious announces in bogus dialogs :/
+            break;
         case WindowType::FIXEDLINE:
             if( !GetText().isEmpty() )
                 nRole = accessibility::AccessibleRole::LABEL;