INTEGRATION: CWS uaa02 (1.6.130); FILE MERGED
2003/04/22 08:14:48 mt 1.6.130.1: #108656# Moved Accessibility from drafts to final
This commit is contained in:
parent
19779e2807
commit
802817a8d8
1 changed files with 22 additions and 22 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: AccessibleDataPilotControl.cxx,v $
|
||||
*
|
||||
* $Revision: 1.6 $
|
||||
* $Revision: 1.7 $
|
||||
*
|
||||
* last change: $Author: sab $ $Date: 2002-11-05 07:59:06 $
|
||||
* last change: $Author: vg $ $Date: 2003-04-24 17:10:52 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -69,14 +69,14 @@
|
|||
#include "fieldwnd.hxx"
|
||||
#endif
|
||||
|
||||
#ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
|
||||
#include <drafts/com/sun/star/accessibility/AccessibleRole.hpp>
|
||||
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
|
||||
#include <com/sun/star/accessibility/AccessibleRole.hpp>
|
||||
#endif
|
||||
#ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
|
||||
#include <drafts/com/sun/star/accessibility/AccessibleStateType.hpp>
|
||||
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESTATETYPE_HPP_
|
||||
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
|
||||
#endif
|
||||
#ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_
|
||||
#include <drafts/com/sun/star/accessibility/AccessibleEventId.hpp>
|
||||
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_
|
||||
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
|
||||
#endif
|
||||
|
||||
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
|
||||
|
@ -96,7 +96,7 @@
|
|||
#endif
|
||||
|
||||
using namespace ::com::sun::star;
|
||||
using namespace ::drafts::com::sun::star::accessibility;
|
||||
using namespace ::com::sun::star::accessibility;
|
||||
|
||||
class ScAccessibleDataPilotButton
|
||||
: public ScAccessibleContextBase
|
||||
|
@ -105,7 +105,7 @@ public:
|
|||
//===== internal ========================================================
|
||||
ScAccessibleDataPilotButton(
|
||||
const ::com::sun::star::uno::Reference<
|
||||
::drafts::com::sun::star::accessibility::XAccessible>& rxParent,
|
||||
::com::sun::star::accessibility::XAccessible>& rxParent,
|
||||
ScDPFieldWindow* pDPFieldWindow,
|
||||
sal_Int32 nIndex);
|
||||
|
||||
|
@ -121,8 +121,8 @@ protected:
|
|||
public:
|
||||
///===== XAccessibleComponent ============================================
|
||||
|
||||
virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible >
|
||||
SAL_CALL getAccessibleAt(
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
|
||||
SAL_CALL getAccessibleAtPoint(
|
||||
const ::com::sun::star::awt::Point& rPoint )
|
||||
throw (::com::sun::star::uno::RuntimeException);
|
||||
|
||||
|
@ -145,7 +145,7 @@ public:
|
|||
getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException);
|
||||
|
||||
/// Return the specified child or NULL if index is invalid.
|
||||
virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible> SAL_CALL
|
||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
|
||||
getAccessibleChild(sal_Int32 nIndex)
|
||||
throw (::com::sun::star::uno::RuntimeException,
|
||||
::com::sun::star::lang::IndexOutOfBoundsException);
|
||||
|
@ -157,7 +157,7 @@ public:
|
|||
|
||||
/// Return the set of current states.
|
||||
virtual ::com::sun::star::uno::Reference<
|
||||
::drafts::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
|
||||
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
|
||||
getAccessibleStateSet(void)
|
||||
throw (::com::sun::star::uno::RuntimeException);
|
||||
|
||||
|
@ -206,7 +206,7 @@ ScAccessibleDataPilotControl::ScAccessibleDataPilotControl(
|
|||
const uno::Reference<XAccessible>& rxParent,
|
||||
ScDPFieldWindow* pDPFieldWindow)
|
||||
:
|
||||
ScAccessibleContextBase(rxParent, AccessibleRole::GROUPBOX),
|
||||
ScAccessibleContextBase(rxParent, AccessibleRole::GROUP_BOX),
|
||||
mpDPFieldWindow(pDPFieldWindow)
|
||||
{
|
||||
if (mpDPFieldWindow)
|
||||
|
@ -268,7 +268,7 @@ void ScAccessibleDataPilotControl::AddField(sal_Int32 nNewIndex)
|
|||
if (bAdded)
|
||||
{
|
||||
AccessibleEventObject aEvent;
|
||||
aEvent.EventId = AccessibleEventId::ACCESSIBLE_CHILD_EVENT;
|
||||
aEvent.EventId = AccessibleEventId::CHILD;
|
||||
aEvent.Source = uno::Reference< XAccessible >(this);
|
||||
aEvent.NewValue <<= getAccessibleChild(nNewIndex);
|
||||
|
||||
|
@ -307,7 +307,7 @@ void ScAccessibleDataPilotControl::RemoveField(sal_Int32 nOldIndex)
|
|||
if (bRemoved)
|
||||
{
|
||||
AccessibleEventObject aEvent;
|
||||
aEvent.EventId = AccessibleEventId::ACCESSIBLE_CHILD_EVENT;
|
||||
aEvent.EventId = AccessibleEventId::CHILD;
|
||||
aEvent.Source = uno::Reference< XAccessible >(this);
|
||||
aEvent.NewValue <<= xTempAcc;
|
||||
|
||||
|
@ -369,12 +369,12 @@ void ScAccessibleDataPilotControl::LostFocus()
|
|||
|
||||
///===== XAccessibleComponent ============================================
|
||||
|
||||
uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotControl::getAccessibleAt(
|
||||
uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotControl::getAccessibleAtPoint(
|
||||
const awt::Point& rPoint )
|
||||
throw (uno::RuntimeException)
|
||||
{
|
||||
uno::Reference<XAccessible> xAcc;
|
||||
if (contains(rPoint))
|
||||
if (containsPoint(rPoint))
|
||||
{
|
||||
ScUnoGuard aGuard;
|
||||
IsObjectValid();
|
||||
|
@ -572,10 +572,10 @@ Rectangle ScAccessibleDataPilotControl::GetBoundingBox(void) const
|
|||
|
||||
ScAccessibleDataPilotButton::ScAccessibleDataPilotButton(
|
||||
const ::com::sun::star::uno::Reference<
|
||||
::drafts::com::sun::star::accessibility::XAccessible>& rxParent,
|
||||
::com::sun::star::accessibility::XAccessible>& rxParent,
|
||||
ScDPFieldWindow* pDPFieldWindow,
|
||||
sal_Int32 nIndex)
|
||||
: ScAccessibleContextBase(rxParent, AccessibleRole::PUSHBUTTON),
|
||||
: ScAccessibleContextBase(rxParent, AccessibleRole::PUSH_BUTTON),
|
||||
mpDPFieldWindow(pDPFieldWindow),
|
||||
mnIndex(nIndex)
|
||||
{
|
||||
|
@ -616,7 +616,7 @@ void ScAccessibleDataPilotButton::ResetFocused()
|
|||
|
||||
///===== XAccessibleComponent ============================================
|
||||
|
||||
uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotButton::getAccessibleAt(
|
||||
uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotButton::getAccessibleAtPoint(
|
||||
const ::com::sun::star::awt::Point& rPoint )
|
||||
throw (::com::sun::star::uno::RuntimeException)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue