summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorJacobo Aragunde PĂ©rez <jaragunde@igalia.com>2014-02-03 19:08:31 +0100
committerMichael Meeks <michael.meeks@collabora.com>2014-02-04 13:08:57 +0000
commit2bb87dd6596f8e961f5618d8e7686fa12c64e2cf (patch)
tree3b473eec6bcaa2c168e18fe39a8497cfb34ceae8 /winaccessibility
parentac8cb745d7b385b24a3576aa6c40780fdcfe9b15 (diff)
fdo#39944: Add DOCUMENT_* accessibility UNO roles
Added a set of UNO accessibility roles for specific kinds of documents: * DOCUMENT_PRESENTATION for Impress * DOCUMENT_SPREADSHEET for Calc * DOCUMENT_TEXT for Writer The other applications still use the existing DOCUMENT role. These roles translates directly to ATK but in the other toolkits we keep using the same association that DOCUMENT role had. Change-Id: Ibac47527e5effdecb28d2314cde8558cf4fb010a Reviewed-on: https://gerrit.libreoffice.org/7847 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/source/UAccCOM/MAccessible.cxx3
-rw-r--r--winaccessibility/source/service/AccObjectWinManager.cxx5
-rw-r--r--winaccessibility/source/service/AccTopWindowListener.cxx5
3 files changed, 10 insertions, 3 deletions
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 4a1e3331b22c..e5c5eb09bc03 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -1965,7 +1965,8 @@ STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FAR *groupLevel,long __
*similarItemsInGroup = 0;
*positionInGroup = 0;
- if (Role != AccessibleRole::DOCUMENT)
+ if (Role != AccessibleRole::DOCUMENT && Role != AccessibleRole::DOCUMENT_PRESENTATION &&
+ Role != AccessibleRole::DOCUMENT_SPREADSHEET && Role != AccessibleRole::DOCUMENT_TEXT)
{
Reference< XAccessibleGroupPosition > xGroupPosition( pRContext, UNO_QUERY );
if ( xGroupPosition.is() )
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index dc87c451db4e..32c155e87977 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -601,7 +601,10 @@ sal_Bool AccObjectWinManager::InsertChildrenAccObj( com::sun::star::accessibilit
short role = pRContext->getAccessibleRole();
- if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role )
+ if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role ||
+ com::sun::star::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
+ com::sun::star::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
+ com::sun::star::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
{
if(IsStateManageDescendant(pXAcc))
{
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index db87f23f0bf5..df30a1a4dcd1 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -156,7 +156,10 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
short role = pAccessibleContext->getAccessibleRole();
- if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role )
+ if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role ||
+ com::sun::star::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
+ com::sun::star::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
+ com::sun::star::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
{
if(accManagerAgent.IsStateManageDescendant(pAccessible))
{