uia: merge VCL pieces of IAccessible2 work.

Original code from:
    Author: Steve Yin <steve_y@apache.org>
    Date:   Sat Nov 16 23:58:19 2013 +0100

        Integrate branch of IAccessible2

With these improvements:

Make IAccessible2 an experimental feature, with fallback to Java a11y.
Move initial setup of windows into the bridge and clean, remove conditionals
Check for presence of AT in the bridge as well to clean. Merge VCL events
extensions and their handling. Clean and split WB_GETOBJECT handling out to
it's own method. Add component prefix namespacing.
Cleanup msaa service info, and implement XComponent to share mxAccessBridge.
Add suitable debugging output, remove VCL dependency from UAccCOM causing
registration issues.

Change-Id: Ib19e38ddca71182018df438df27dcdb555d91402

1 files changed, 28 insertions, 6 deletions

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 64664b167c15..1ef62c1d36cb 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8818,10 +8818,10 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
         case WINDOW_CANCELBUTTON:
         case WINDOW_HELPBUTTON:
         case WINDOW_IMAGEBUTTON:
-        case WINDOW_MENUBUTTON:
         case WINDOW_MOREBUTTON:
         case WINDOW_SPINBUTTON:
         case WINDOW_BUTTON: nRole = accessibility::AccessibleRole::PUSH_BUTTON; break;
+        case WINDOW_MENUBUTTON: nRole = accessibility::AccessibleRole::BUTTON_MENU; break;
 
         case WINDOW_PATHDIALOG: nRole = accessibility::AccessibleRole::DIRECTORY_PANE; break;
         case WINDOW_FILEDIALOG: nRole = accessibility::AccessibleRole::FILE_CHOOSER; break;
@@ -8835,10 +8835,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
         case WINDOW_MULTILINEEDIT: nRole = accessibility::AccessibleRole::SCROLL_PANE; break;
 
         case WINDOW_PATTERNFIELD:
-        case WINDOW_NUMERICFIELD:
-        case WINDOW_METRICFIELD:
-        case WINDOW_CURRENCYFIELD:
-        case WINDOW_LONGCURRENCYFIELD:
         case WINDOW_CALCINPUTLINE:
         case WINDOW_EDIT: nRole = ( GetStyle() & WB_PASSWORD ) ? (accessibility::AccessibleRole::PASSWORD_TEXT) : (accessibility::AccessibleRole::TEXT); break;
 
@@ -8855,7 +8851,13 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
         case WINDOW_TREELISTBOX: nRole = accessibility::AccessibleRole::TREE; break;
 
         case WINDOW_FIXEDTEXT: nRole = accessibility::AccessibleRole::LABEL; break;
-        case WINDOW_FIXEDLINE: nRole = accessibility::AccessibleRole::SEPARATOR; break;
+        case WINDOW_FIXEDLINE:
+            if( !GetText().isEmpty() )
+                nRole = accessibility::AccessibleRole::LABEL;
+            else
+                nRole = accessibility::AccessibleRole::SEPARATOR;
+            break;
+
         case WINDOW_FIXEDBITMAP:
         case WINDOW_FIXEDIMAGE: nRole = accessibility::AccessibleRole::ICON; break;
         case WINDOW_GROUPBOX: nRole = accessibility::AccessibleRole::GROUP_BOX; break;
@@ -8870,6 +8872,10 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
         case WINDOW_DATEFIELD:
         case WINDOW_TIMEFIELD: nRole = accessibility::AccessibleRole::DATE_EDITOR; break;
 
+        case WINDOW_NUMERICFIELD:
+        case WINDOW_METRICFIELD:
+        case WINDOW_CURRENCYFIELD:
+        case WINDOW_LONGCURRENCYFIELD:
         case WINDOW_SPINFIELD: nRole = accessibility::AccessibleRole::SPIN_BOX; break;
 
         case WINDOW_TOOLBOX: nRole = accessibility::AccessibleRole::TOOL_BAR; break;
@@ -8933,8 +8939,12 @@ void Window::SetAccessibleName( const OUString& rName )
    if ( !mpWindowImpl->mpAccessibleInfos )
         mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
 
+    OUString oldName = GetAccessibleName();
+
     delete mpWindowImpl->mpAccessibleInfos->pAccessibleName;
     mpWindowImpl->mpAccessibleInfos->pAccessibleName = new OUString( rName );
+
+    ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName );
 }
 
 OUString Window::GetAccessibleName() const
@@ -8975,6 +8985,8 @@ OUString Window::getDefaultAccessibleName() const
             Window *pLabel = GetAccessibleRelationLabeledBy();
             if ( pLabel && pLabel != this )
                 aAccessibleName = pLabel->GetText();
+            if (aAccessibleName.isEmpty())
+                aAccessibleName = GetQuickHelpText();
         }
         break;
 
@@ -8989,6 +9001,16 @@ OUString Window::getDefaultAccessibleName() const
             }
         break;
 
+        case WINDOW_TOOLBOX:
+            aAccessibleName = GetText();
+            if( aAccessibleName.isEmpty() )
+                aAccessibleName = "Tool Bar";
+            break;
+
+        case WINDOW_MOREBUTTON:
+            aAccessibleName = mpWindowImpl->maText;
+            break;
+
         default:
             aAccessibleName = GetText();
             break;