From e5618f1707626a8c096ea2ca8da3cbe2c5f3db16 Mon Sep 17 00:00:00 2001 From: Steve Yin Date: Sat, 16 Nov 2013 23:58:19 +0100 Subject: Integrate branch of IAccessible2 Change-Id: Ied8b6941765c86a849467cb5df312ca7124f32b3 --- .../sun/star/accessibility/AccessibleEventId.idl | 10 ++++ .../star/accessibility/AccessibleRelationType.idl | 8 +++ .../sun/star/accessibility/AccessibleStateType.idl | 21 +++++++ offapi/com/sun/star/accessibility/MSAAService.idl | 45 +++++++++++++++ .../XAccessibleExtendedAttributes.idl | 49 ++++++++++++++++ .../accessibility/XAccessibleGroupPosition.idl | 52 +++++++++++++++++ .../accessibility/XAccessibleTableSelection.idl | 54 +++++++++++++++++ .../accessibility/XAccessibleTextSelection.idl | 67 ++++++++++++++++++++++ offapi/com/sun/star/accessibility/XMSAAService.idl | 56 ++++++++++++++++++ 9 files changed, 362 insertions(+) create mode 100644 offapi/com/sun/star/accessibility/MSAAService.idl create mode 100644 offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl create mode 100644 offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl create mode 100644 offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl create mode 100644 offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl create mode 100644 offapi/com/sun/star/accessibility/XMSAAService.idl (limited to 'offapi') diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl index d378f7ded79d..efafc1ae329b 100644 --- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl +++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl @@ -372,6 +372,16 @@ constants AccessibleEventId @since OOo 3.2 */ const short LISTBOX_ENTRY_COLLAPSED = 33; + + //IAccessibility2 Implementation 2009----- + const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34; + const short SELECTION_CHANGED_ADD =35; + const short SELECTION_CHANGED_REMOVE =36; + const short SELECTION_CHANGED_WITHIN =37; + const short PAGE_CHANGED =38; + const short SECTION_CHANGED =39; + const short COLUMN_CHANGED =40; + //-----IAccessibility2 Implementation 2009 }; }; }; }; }; diff --git a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl index 2219c26cfd8f..0ea803a8166a 100644 --- a/offapi/com/sun/star/accessibility/AccessibleRelationType.idl +++ b/offapi/com/sun/star/accessibility/AccessibleRelationType.idl @@ -106,6 +106,14 @@ constants AccessibleRelationType @since OOo 3.0 */ const short NODE_CHILD_OF = 9; + + /** Described-by relation type. + +

Indicates an object is described by the target object.

+ + @since OOo 3.5 + */ + const short DESCRIBED_BY = 10; }; }; }; }; }; diff --git a/offapi/com/sun/star/accessibility/AccessibleStateType.idl b/offapi/com/sun/star/accessibility/AccessibleStateType.idl index cdde9c5e6838..25ac3ab5dcb2 100644 --- a/offapi/com/sun/star/accessibility/AccessibleStateType.idl +++ b/offapi/com/sun/star/accessibility/AccessibleStateType.idl @@ -210,6 +210,27 @@ constants AccessibleStateType partly in the visible area of its parent.

*/ const short VISIBLE = 30; + + // The following constants have been introduced with the IA2 CWS: + + // MOVEABLE only exists in MSAA/IA2, but not in ATK/JAA/NSAccessibility. + /** Indicates the position of the object is not fixed. + */ + const short MOVEABLE = 31; + + // DEFAULT exists in MSAA/IA2, and now also in ATK and NSAccessibility. + /** Indicates the object is the default button in a window + */ + const short DEFAULT = 32; + + // OFFSCREEN only exists in MSAA/IA2, but not in ATK/JAA/NSAccessibility. + // MT: Shouldn't this be the same like !SHOWING in UAA/ATK? + const short OFFSCREEN = 33; + + // COLLAPSED exists in MSAA/IA2, and now also in JAA, but not in ATK/NSAccessibility. In NSAccessibility, there is a notification for collapse. + // In opposite to MSAA, UAA has EXPANDABLE, so EXPANDABLE && !EXPANDED should be the same like COLLAPSED. + const short COLLAPSE = 34; + }; }; }; }; }; diff --git a/offapi/com/sun/star/accessibility/MSAAService.idl b/offapi/com/sun/star/accessibility/MSAAService.idl new file mode 100644 index 000000000000..b7c4efe4f9aa --- /dev/null +++ b/offapi/com/sun/star/accessibility/MSAAService.idl @@ -0,0 +1,45 @@ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright IBM Corporation 2010. +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* +* for a copy of the LGPLv3 License. +* +************************************************************************/ +#ifndef __com_sun_star_accessibility_Accessible_idl__ +#define __com_sun_star_accessibility_Accessible_idl__ + +#include +#include +#include "XMSAAService.idl" + +module com { module sun { module star { module accessibility { + +service MSAAService +{ + interface XMSAAService; + interface com::sun::star::lang::XInitialization; +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl new file mode 100644 index 000000000000..978acc726fbd --- /dev/null +++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl @@ -0,0 +1,49 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright IBM Corporation 2010. + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_accessibility_XAccessibleAttribute_idl__ +#define __com_sun_star_accessibility_XAccessibleAttribute_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include +#endif +#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ +#include +#endif + +module com { module sun { module star { module accessibility { + +interface XAccessibleExtendedAttributes : ::com::sun::star::uno::XInterface +{ + /* Returns the attribute of this object' formula */ // MT: I guess it's not formula only? + any getExtendedAttributes() raises (::com::sun::star::lang::IndexOutOfBoundsException); +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl b/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl new file mode 100644 index 000000000000..c31ff8b9ae0c --- /dev/null +++ b/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl @@ -0,0 +1,52 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright IBM Corporation 2010. + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_accessibility_XAccessibleGroupPosition_idl__ +#define __com_sun_star_accessibility_XAccessibleGroupPosition_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include +#endif +#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ +#include +#endif + +module com { module sun { module star { module accessibility { + +interface XAccessibleGroupPosition : ::com::sun::star::uno::XInterface +{ + /* Returns the group position of the object */ + sequence getGroupPosition( [in] any accoject ) raises (::com::sun::star::lang::IndexOutOfBoundsException); + + /* Returns the hyperlink URL info of the object */ + string getObjectLink( [in] any accoject ) raises (::com::sun::star::lang::IndexOutOfBoundsException); +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl new file mode 100644 index 000000000000..68da2262452c --- /dev/null +++ b/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl @@ -0,0 +1,54 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright IBM Corporation 2010. + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_accessibility_XAccessibleTableSelection_idl__ +#define __com_sun_star_accessibility_XAccessibleTableSelection_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include +#endif +#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ +#include +#endif + +module com { module sun { module star { module accessibility { + +interface XAccessible; + +interface XAccessibleTableSelection : ::com::sun::star::uno::XInterface +{ + boolean selectRow ([in] long row) raises (::com::sun::star::lang::IndexOutOfBoundsException); + boolean unselectRow ([in] long row) raises (::com::sun::star::lang::IndexOutOfBoundsException); + + boolean selectColumn ([in] long column) raises (::com::sun::star::lang::IndexOutOfBoundsException); + boolean unselectColumn ([in] long column) raises (::com::sun::star::lang::IndexOutOfBoundsException); +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl new file mode 100644 index 000000000000..6ac4cd267902 --- /dev/null +++ b/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl @@ -0,0 +1,67 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright IBM Corporation 2010. + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_accessibility_XAccessibleTextSelection_idl__ +#define __com_sun_star_accessibility_XAccessibleTextSelection_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include +#endif +#ifndef __com_sun_star_awt_Point_idl__ +#include +#endif +#ifndef __com_sun_star_awt_Rectangle_idl__ +#include +#endif +#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ +#include +#endif +#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ +#include +#endif + +module com { module sun { module star { module accessibility { + +interface XAccessibleTextSelection : ::com::sun::star::uno::XInterface +{ + boolean scrollToPosition ([in] ::com::sun::star::awt::Point aPoint, [in] boolean isLeftTop) raises (::com::sun::star::lang::IllegalArgumentException); + + long getSelectedPortionCount(); + + long getSeletedPositionStart ([in] long nSelectedPortionIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); + + long getSeletedPositionEnd ([in] long nSelectedPortionIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); + + long addSelection( [in] long selectionIndex, [in]long startOffset, [in] long endOffset) raises (::com::sun::star::lang::IndexOutOfBoundsException); + + boolean removeSelection( [in] long selectionIndex ) raises (::com::sun::star::lang::IndexOutOfBoundsException); +}; + +}; }; }; }; + +#endif diff --git a/offapi/com/sun/star/accessibility/XMSAAService.idl b/offapi/com/sun/star/accessibility/XMSAAService.idl new file mode 100644 index 000000000000..01fa3a2bbadb --- /dev/null +++ b/offapi/com/sun/star/accessibility/XMSAAService.idl @@ -0,0 +1,56 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright IBM Corporation 2010. + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_accessibility_XMSAASERVICE_idl__ +#define __com_sun_star_accessibility_XMSAASERVICE_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include +#endif + +module com { module sun { module star { module accessibility { + +/** The interface must be implemented for a server that can support MSAA com objects and send win32 accessible events +*/ +interface XMSAAService : ::com::sun::star::uno::XInterface +{ + /** Return com object pointer. + + @return + A reference to the object that contains the actual accessibility information. + + @see AccessibleContext + */ + long getAccObjectPtr ([in] long hWnd, [in] long lParam, [in] long wParam); + + [oneway] void handleWindowOpened ([in] long i); +}; + +}; }; }; }; + +#endif -- cgit v1.2.3