mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

com::sun::star->css in winaccessibility/

Browse Source 
Change-Id: I644364fc6d8fc334044a3e53fcde24a6ef86c021
Reviewed-on: https://gerrit.libreoffice.org/20142
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2015-11-24 12:02:28 +02:00 committed by Noel Grandin
parent 55040ea134
commit 1f9264f9f8
55 changed files with 294 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winaccessibility/inc/AccComponentEventListener.hxx
View File

@ -38,11 +38,11 @@ class AccComponentEventListener: public AccEventListener
private: private:
static FILE *output, *output2, *output3, *outacc;//used for debugging static FILE *output, *output2, *output3, *outacc;//used for debugging
public: public:
AccComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccComponentEventListener(); virtual ~AccComponentEventListener();
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for value changed event //for value changed event
virtual void HandleValueChangedEvent( virtual void HandleValueChangedEvent(

10
winaccessibility/inc/AccContainerEventListener.hxx
View File

@ -38,11 +38,11 @@
class AccContainerEventListener: public AccEventListener class AccContainerEventListener: public AccEventListener
{ {
public: public:
AccContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccContainerEventListener(); virtual ~AccContainerEventListener();
//AccessibleEventListener //AccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for child changed event //for child changed event
virtual void HandleChildChangedEvent( virtual void HandleChildChangedEvent(
@ -69,12 +69,10 @@ public:
virtual void SetComponentState(short state, bool enable) override; virtual void SetComponentState(short state, bool enable) override;
virtual void FireStatePropertyChange(short state, bool set) override; virtual void FireStatePropertyChange(short state, bool set) override;
virtual void FireStateFocusedChange(bool enable) override; virtual void FireStateFocusedChange(bool enable) override;
virtual bool IsEditable( virtual bool IsEditable(css::uno::Reference<css::accessibility::XAccessibleContext> xContext);
css::uno::Reference<css::accessibility::XAccessibleContext> xContext);
// update all children's state // update all children's state
void UpdateAllChildrenState( void UpdateAllChildrenState( css::accessibility::XAccessible* pXAccessible);
com::sun::star::accessibility::XAccessible* pXAccessible);
bool NotifyChildEvent(short nWinEvent, const css::uno::Any &Value); bool NotifyChildEvent(short nWinEvent, const css::uno::Any &Value);

4
winaccessibility/inc/AccDescendantManagerEventListener.hxx
View File

@ -35,11 +35,11 @@ class AccDescendantManagerEventListener: public AccComponentEventListener
{ {
public: public:
AccDescendantManagerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccDescendantManagerEventListener(); virtual ~AccDescendantManagerEventListener();
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for selection changed event //for selection changed event
virtual void HandleSelectionChangedEvent( virtual void HandleSelectionChangedEvent(

4
winaccessibility/inc/AccDialogEventListener.hxx
View File

@ -34,11 +34,11 @@
class AccDialogEventListener: public AccEventListener class AccDialogEventListener: public AccEventListener
{ {
public: public:
AccDialogEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccDialogEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccDialogEventListener(); virtual ~AccDialogEventListener();
//AccessibleEventListener //AccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for child changed event //for child changed event
virtual void HandleChildChangedEvent( virtual void HandleChildChangedEvent(

11
winaccessibility/inc/AccEventListener.hxx
View File

@ -36,23 +36,22 @@ class AccObjectManagerAgent;
*/ */
class AccEventListener class AccEventListener
: public ::cppu::WeakImplHelper< : public ::cppu::WeakImplHelper<
com::sun::star::accessibility::XAccessibleEventListener> css::accessibility::XAccessibleEventListener>
{ {
protected: protected:
//accessible owner's pointer //accessible owner's pointer
com::sun::star::uno::Reference< css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
com::sun::star::accessibility::XAccessible> m_xAccessible;
//agent pointer for objects' manager //agent pointer for objects' manager
AccObjectManagerAgent* pAgent; AccObjectManagerAgent* pAgent;
public: public:
AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccEventListener( css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccEventListener(); virtual ~AccEventListener();
// XEventListener // XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException);
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for name changed event //for name changed event
virtual void HandleNameChangedEvent(css::uno::Any name); virtual void HandleNameChangedEvent(css::uno::Any name);

4
winaccessibility/inc/AccFrameEventListener.hxx
View File

@ -35,11 +35,11 @@
class AccFrameEventListener: public AccEventListener class AccFrameEventListener: public AccEventListener
{ {
public: public:
AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccFrameEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccFrameEventListener(); virtual ~AccFrameEventListener();
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for child changed event //for child changed event
virtual void HandleChildChangedEvent( virtual void HandleChildChangedEvent(

4
winaccessibility/inc/AccListEventListener.hxx
View File

@ -37,11 +37,11 @@ class AccListEventListener: public AccDescendantManagerEventListener
private: private:
bool shouldDeleteChild; bool shouldDeleteChild;
public: public:
AccListEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccListEventListener(); virtual ~AccListEventListener();
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for active descendant changed event //for active descendant changed event
virtual void HandleActiveDescendantChangedEvent( virtual void HandleActiveDescendantChangedEvent(

4
winaccessibility/inc/AccMenuEventListener.hxx
View File

@ -35,11 +35,11 @@
class AccMenuEventListener: public AccComponentEventListener class AccMenuEventListener: public AccComponentEventListener
{ {
public: public:
AccMenuEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccMenuEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccMenuEventListener(); virtual ~AccMenuEventListener();
//AccessibleEventListener //AccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for child changed event //for child changed event
virtual void HandleChildChangedEvent( virtual void HandleChildChangedEvent(

21
winaccessibility/inc/AccObject.hxx
View File

@ -56,9 +56,9 @@ private:
::rtl::Reference<AccEventListener> m_pListener; ::rtl::Reference<AccEventListener> m_pListener;
IAccSelectionList m_selectionList; IAccSelectionList m_selectionList;
::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > m_xAccRef; css::uno::Reference < css::accessibility::XAccessible > m_xAccRef;
::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleAction > m_xAccActionRef; css::uno::Reference < css::accessibility::XAccessibleAction > m_xAccActionRef;
::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext > m_xAccContextRef; css::uno::Reference < css::accessibility::XAccessibleContext > m_xAccContextRef;
void ImplInitializeCreateObj();//create COM object void ImplInitializeCreateObj();//create COM object
@ -66,21 +66,20 @@ private:
void UpdateRole(); void UpdateRole();
DWORD GetMSAAStateFromUNO(short xState);//translate state from UNO to MSAA value DWORD GetMSAAStateFromUNO(short xState);//translate state from UNO to MSAA value
::com::sun::star::accessibility::XAccessibleSelection* GetXAccessibleSelection(); css::accessibility::XAccessibleSelection* GetXAccessibleSelection();
void GetExpandedState(sal_Bool* isExpandable, sal_Bool* isExpanded); void GetExpandedState(sal_Bool* isExpandable, sal_Bool* isExpanded);
::rtl::OUString GetMAccessibleValueFromAny(::com::sun::star::uno::Any pAny); ::rtl::OUString GetMAccessibleValueFromAny(css::uno::Any pAny);
public: public:
AccObject ( ::com::sun::star::accessibility::XAccessible* pXAcc = NULL,AccObjectManagerAgent* pAgent = NULL ,AccEventListener* accListener=NULL); AccObject ( css::accessibility::XAccessible* pXAcc = NULL,AccObjectManagerAgent* pAgent = NULL ,AccEventListener* accListener=NULL);
virtual ~AccObject(); virtual ~AccObject();
sal_Bool UpdateAccessibleInfoFromUnoToMSAA( ); //implement accessible information mapping sal_Bool UpdateAccessibleInfoFromUnoToMSAA( ); //implement accessible information mapping
void UpdateDefaultAction(); void UpdateDefaultAction();
IMAccessible* GetIMAccessible(); //return COM interface in acc object IMAccessible* GetIMAccessible(); //return COM interface in acc object
::com::sun::star::uno::Reference< css::uno::Reference<css::accessibility::XAccessible> const& GetXAccessible();
::com::sun::star::accessibility::XAccessible> const& GetXAccessible();
void SetResID(long id);//ResID means ChildID in MSAA void SetResID(long id);//ResID means ChildID in MSAA
long GetResID(); long GetResID();
@ -105,9 +104,9 @@ public:
void DecreaseState(short xState );//call COM interface DecreaseState method void DecreaseState(short xState );//call COM interface DecreaseState method
void IncreaseState( short xState );//call COM interface IncreaseState method void IncreaseState( short xState );//call COM interface IncreaseState method
void SetName( com::sun::star::uno::Any newName); void SetName( css::uno::Any newName);
void SetValue( com::sun::star::uno::Any pAny ); void SetValue( css::uno::Any pAny );
void SetDescription( com::sun::star::uno::Any newDesc ); void SetDescription( css::uno::Any newDesc );
void SetRole( short Role ); void SetRole( short Role );
short GetRole() const; short GetRole() const;

2
winaccessibility/inc/AccObjectContainerEventListener.hxx
View File

@ -35,7 +35,7 @@
class AccObjectContainerEventListener: public AccContainerEventListener class AccObjectContainerEventListener: public AccContainerEventListener
{ {
public: public:
AccObjectContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccObjectContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccObjectContainerEventListener(); virtual ~AccObjectContainerEventListener();
virtual void HandleStateChangedEvent( virtual void HandleStateChangedEvent(

61
winaccessibility/inc/AccObjectManagerAgent.hxx
View File

@ -44,58 +44,57 @@ public:
AccObjectManagerAgent(); AccObjectManagerAgent();
virtual ~AccObjectManagerAgent(); virtual ~AccObjectManagerAgent();
virtual bool InsertAccObj(com::sun::star::accessibility::XAccessible* pXAcc, virtual bool InsertAccObj(css::accessibility::XAccessible* pXAcc,
com::sun::star::accessibility::XAccessible* pParentXAcc, css::accessibility::XAccessible* pParentXAcc,
sal_Int64 pWnd=0); sal_Int64 pWnd=0);
virtual void GetIAccessibleFromResID(long childID,IMAccessible**); virtual void GetIAccessibleFromResID(long childID,IMAccessible**);
virtual bool GetIAccessibleFromXAccessible(com::sun::star::accessibility::XAccessible* pXAcc, IAccessible** ppIA); virtual bool GetIAccessibleFromXAccessible(css::accessibility::XAccessible* pXAcc, IAccessible** ppIA);
virtual void DeleteAccObj( com::sun::star::accessibility::XAccessible* pXAcc ); virtual void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
virtual IMAccessible* GetIMAccByXAcc(com::sun::star::accessibility::XAccessible* pXAcc); virtual IMAccessible* GetIMAccByXAcc(css::accessibility::XAccessible* pXAcc);
bool NotifyAccEvent(short pEvent = 0, com::sun::star::accessibility::XAccessible* pXAcc = 0); bool NotifyAccEvent(short pEvent = 0, css::accessibility::XAccessible* pXAcc = 0);
bool InsertChildrenAccObj(com::sun::star::accessibility::XAccessible* pXAcc, bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
sal_Int64 pWnd=0); sal_Int64 pWnd=0);
void DeleteChildrenAccObj( com::sun::star::accessibility::XAccessible* pXAcc ); void DeleteChildrenAccObj( css::accessibility::XAccessible* pXAcc );
void DecreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState ); void DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
void IncreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState ); void IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
void UpdateState( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateState( css::accessibility::XAccessible* pXAcc );
void UpdateLocation( com::sun::star::accessibility::XAccessible* pXAcc, void UpdateLocation( css::accessibility::XAccessible* pXAcc,
long Top = 0,long left = 0,long width = 0,long height = 0 ); long Top = 0,long left = 0,long width = 0,long height = 0 );
void UpdateAction( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateAction( css::accessibility::XAccessible* pXAcc );
void UpdateValue( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateValue( css::accessibility::XAccessible* pXAcc );
void UpdateValue( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any ); void UpdateValue( css::accessibility::XAccessible* pXAcc, css::uno::Any );
void UpdateAccName( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newName); void UpdateAccName( css::accessibility::XAccessible* pXAcc, css::uno::Any newName);
void UpdateAccName( com::sun::star::accessibility::XAccessible* pXAcc); void UpdateAccName( css::accessibility::XAccessible* pXAcc);
void UpdateDescription( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newDesc ); void UpdateDescription( css::accessibility::XAccessible* pXAcc, css::uno::Any newDesc );
void UpdateDescription( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateDescription( css::accessibility::XAccessible* pXAcc );
void NotifyDestroy(com::sun::star::accessibility::XAccessible* pXAcc); void NotifyDestroy(css::accessibility::XAccessible* pXAcc);
com::sun::star::accessibility::XAccessible* GetParentXAccessible( css::accessibility::XAccessible* GetParentXAccessible( css::accessibility::XAccessible* pXAcc );
com::sun::star::accessibility::XAccessible* pXAcc ); short GetParentRole(css::accessibility::XAccessible* pXAcc );
short GetParentRole(com::sun::star::accessibility::XAccessible* pXAcc ); bool IsContainer(css::accessibility::XAccessible* pXAcc);
bool IsContainer(com::sun::star::accessibility::XAccessible* pXAcc);
void SaveTopWindowHandle(sal_Int64 hWnd, void SaveTopWindowHandle(sal_Int64 hWnd,
com::sun::star::accessibility::XAccessible* pXAcc); css::accessibility::XAccessible* pXAcc);
void UpdateChildState(com::sun::star::accessibility::XAccessible* pXAcc); void UpdateChildState(css::accessibility::XAccessible* pXAcc);
bool IsSpecialToolboItem(com::sun::star::accessibility::XAccessible* pXAcc); bool IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc);
short GetRole(com::sun::star::accessibility::XAccessible* pXAcc); short GetRole(css::accessibility::XAccessible* pXAcc);
com::sun::star::accessibility::XAccessible* GetAccDocByAccTopWin( com::sun::star::accessibility::XAccessible* pXAcc ); css::accessibility::XAccessible* GetAccDocByAccTopWin( css::accessibility::XAccessible* pXAcc );
bool IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc ); bool IsTopWinAcc( css::accessibility::XAccessible* pXAcc );
bool IsStateManageDescendant(com::sun::star::accessibility::XAccessible* pXAcc); bool IsStateManageDescendant(css::accessibility::XAccessible* pXAcc);
sal_Int64 Get_ToATInterface(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam); sal_Int64 Get_ToATInterface(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);

74
winaccessibility/inc/AccObjectWinManager.hxx
View File

@ -50,7 +50,7 @@ private:
typedef std::map<HWND, void*> XHWNDToXAccHash; typedef std::map<HWND, void*> XHWNDToXAccHash;
typedef std::map<const long, AccObject*> XResIdToAccObjHash; typedef std::map<const long, AccObject*> XResIdToAccObjHash;
typedef std::map<const HWND, com::sun::star::accessibility::XAccessible* > typedef std::map<const HWND, css::accessibility::XAccessible* >
XHWNDToDocumentHash; XHWNDToDocumentHash;
//XAccessible to AccObject //XAccessible to AccObject
@ -65,7 +65,7 @@ private:
//for file name support //for file name support
XHWNDToDocumentHash XHWNDDocList; XHWNDToDocumentHash XHWNDDocList;
com::sun::star::accessibility::XAccessible* oldFocus; css::accessibility::XAccessible* oldFocus;
AccObjectManagerAgent* pAgent; AccObjectManagerAgent* pAgent;
ResIDGenerator ResIdGen; ResIDGenerator ResIdGen;
@ -74,72 +74,72 @@ private:
private: private:
long ImpleGenerateResID(); long ImpleGenerateResID();
AccObject* GetAccObjByXAcc( com::sun::star::accessibility::XAccessible* pXAcc); AccObject* GetAccObjByXAcc( css::accessibility::XAccessible* pXAcc);
AccObject* GetTopWindowAccObj(HWND hWnd); AccObject* GetTopWindowAccObj(HWND hWnd);
com::sun::star::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd); css::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd);
void DeleteAccListener( AccObject* pAccObj ); void DeleteAccListener( AccObject* pAccObj );
void InsertAccChildNode(AccObject* pCurObj,AccObject* pParentObj,HWND pWnd); void InsertAccChildNode(AccObject* pCurObj,AccObject* pParentObj,HWND pWnd);
void DeleteAccChildNode(AccObject* pChild); void DeleteAccChildNode(AccObject* pChild);
void DeleteFromHwndXAcc(com::sun::star::accessibility::XAccessible* pXAcc ); void DeleteFromHwndXAcc(css::accessibility::XAccessible* pXAcc );
int UpdateAccSelection(com::sun::star::accessibility::XAccessible* pXAcc); int UpdateAccSelection(css::accessibility::XAccessible* pXAcc);
::rtl::Reference<AccEventListener> CreateAccEventListener( ::rtl::Reference<AccEventListener> CreateAccEventListener(
com::sun::star::accessibility::XAccessible* pXAcc); css::accessibility::XAccessible* pXAcc);
public: public:
virtual ~AccObjectWinManager(); virtual ~AccObjectWinManager();
sal_Bool InsertAccObj( com::sun::star::accessibility::XAccessible* pXAcc,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWnd); sal_Bool InsertAccObj( css::accessibility::XAccessible* pXAcc,css::accessibility::XAccessible* pParentXAcc,HWND pWnd);
sal_Bool InsertChildrenAccObj( com::sun::star::accessibility::XAccessible* pXAcc,HWND pWnd=0); sal_Bool InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc,HWND pWnd=0);
void DeleteAccObj( com::sun::star::accessibility::XAccessible* pXAcc ); void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
void DeleteChildrenAccObj(com::sun::star::accessibility::XAccessible* pAccObj); void DeleteChildrenAccObj(css::accessibility::XAccessible* pAccObj);
sal_Bool NotifyAccEvent( com::sun::star::accessibility::XAccessible* pXAcc,short state = 0 ); sal_Bool NotifyAccEvent( css::accessibility::XAccessible* pXAcc,short state = 0 );
LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam); LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
void DecreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState ); void DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
void IncreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState ); void IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
void UpdateState( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateState( css::accessibility::XAccessible* pXAcc );
void SetLocation( com::sun::star::accessibility::XAccessible* pXAcc, void SetLocation( css::accessibility::XAccessible* pXAcc,
long Top = 0,long left = 0,long width = 0,long height = 0); long Top = 0,long left = 0,long width = 0,long height = 0);
void SetValue( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any pAny ); void SetValue( css::accessibility::XAccessible* pXAcc, css::uno::Any pAny );
void UpdateValue( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateValue( css::accessibility::XAccessible* pXAcc );
void SetAccName( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newName); void SetAccName( css::accessibility::XAccessible* pXAcc, css::uno::Any newName);
void UpdateAccName( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateAccName( css::accessibility::XAccessible* pXAcc );
void SetDescription( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newDesc ); void SetDescription( css::accessibility::XAccessible* pXAcc, css::uno::Any newDesc );
void UpdateDescription( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateDescription( css::accessibility::XAccessible* pXAcc );
void SetRole( com::sun::star::accessibility::XAccessible* pXAcc, long Role ); void SetRole( css::accessibility::XAccessible* pXAcc, long Role );
void UpdateAccFocus( com::sun::star::accessibility::XAccessible* newFocus ); void UpdateAccFocus( css::accessibility::XAccessible* newFocus );
void UpdateAction( com::sun::star::accessibility::XAccessible* pXAcc ); void UpdateAction( css::accessibility::XAccessible* pXAcc );
sal_Bool IsContainer( com::sun::star::accessibility::XAccessible* pAccessible ); sal_Bool IsContainer( css::accessibility::XAccessible* pAccessible );
IMAccessible* GetIMAccByXAcc( com::sun::star::accessibility::XAccessible* pXAcc ); IMAccessible* GetIMAccByXAcc( css::accessibility::XAccessible* pXAcc );
IMAccessible* GetIAccessibleFromResID(long resID); IMAccessible* GetIAccessibleFromResID(long resID);
void NotifyDestroy( com::sun::star::accessibility::XAccessible* pXAcc ); void NotifyDestroy( css::accessibility::XAccessible* pXAcc );
com::sun::star::accessibility::XAccessible* GetParentXAccessible( com::sun::star::accessibility::XAccessible* pXAcc ); css::accessibility::XAccessible* GetParentXAccessible( css::accessibility::XAccessible* pXAcc );
short GetParentRole( com::sun::star::accessibility::XAccessible* pXAcc ); short GetParentRole( css::accessibility::XAccessible* pXAcc );
void SaveTopWindowHandle(HWND hWnd, com::sun::star::accessibility::XAccessible* pXAcc); void SaveTopWindowHandle(HWND hWnd, css::accessibility::XAccessible* pXAcc);
void UpdateChildState(com::sun::star::accessibility::XAccessible* pXAcc); void UpdateChildState(css::accessibility::XAccessible* pXAcc);
bool IsSpecialToolboItem(com::sun::star::accessibility::XAccessible* pXAcc); bool IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc);
short GetRole(com::sun::star::accessibility::XAccessible* pXAcc); short GetRole(css::accessibility::XAccessible* pXAcc);
com::sun::star::accessibility::XAccessible* GetAccDocByAccTopWin( com::sun::star::accessibility::XAccessible* pXAcc ); css::accessibility::XAccessible* GetAccDocByAccTopWin( css::accessibility::XAccessible* pXAcc );
bool IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc ); bool IsTopWinAcc( css::accessibility::XAccessible* pXAcc );
bool IsStateManageDescendant(com::sun::star::accessibility::XAccessible* pAccessible); bool IsStateManageDescendant(css::accessibility::XAccessible* pAccessible);
}; };
#endif // INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX #endif // INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX

4
winaccessibility/inc/AccParagraphEventListener.hxx
View File

@ -35,11 +35,11 @@
class AccParagraphEventListener: public AccContainerEventListener class AccParagraphEventListener: public AccContainerEventListener
{ {
public: public:
AccParagraphEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccParagraphEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccParagraphEventListener(); virtual ~AccParagraphEventListener();
//AccessibleEventListener //AccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for caret changed event //for caret changed event
virtual void HandleCaretChangedEvent( virtual void HandleCaretChangedEvent(

4
winaccessibility/inc/AccTableEventListener.hxx
View File

@ -35,11 +35,11 @@
class AccTableEventListener: public AccDescendantManagerEventListener class AccTableEventListener: public AccDescendantManagerEventListener
{ {
public: public:
AccTableEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccTableEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccTableEventListener(); virtual ~AccTableEventListener();
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for active descendant changed event //for active descendant changed event
virtual void HandleActiveDescendantChangedEvent( virtual void HandleActiveDescendantChangedEvent(

2
winaccessibility/inc/AccTextComponentEventListener.hxx
View File

@ -35,7 +35,7 @@
class AccTextComponentEventListener: public AccComponentEventListener class AccTextComponentEventListener: public AccComponentEventListener
{ {
public: public:
AccTextComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccTextComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccTextComponentEventListener(); virtual ~AccTextComponentEventListener();
virtual void SetComponentState(short state, bool enable) override; virtual void SetComponentState(short state, bool enable) override;

22
winaccessibility/inc/AccTopWindowListener.hxx
View File

@ -36,7 +36,7 @@
* cached into bridge managers, and they are monitored by listeners for later accessible event handling. * cached into bridge managers, and they are monitored by listeners for later accessible event handling.
*/ */
class AccTopWindowListener class AccTopWindowListener
: public ::cppu::WeakImplHelper<com::sun::star::awt::XTopWindowListener> : public ::cppu::WeakImplHelper<css::awt::XTopWindowListener>
{ {
private: private:
AccObjectManagerAgent accManagerAgent; AccObjectManagerAgent accManagerAgent;
@ -45,20 +45,20 @@ public:
virtual ~AccTopWindowListener(); virtual ~AccTopWindowListener();
// XTopWindowListener // XTopWindowListener
virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
// XEventListener // XEventListener
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException);
virtual void AddAllListeners(com::sun::star::accessibility::XAccessible* pAccessible,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWND ); virtual void AddAllListeners(css::accessibility::XAccessible* pAccessible,css::accessibility::XAccessible* pParentXAcc,HWND pWND );
//for On-Demand load. //for On-Demand load.
virtual void HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible ); virtual void HandleWindowOpened( css::accessibility::XAccessible* pAccessible );
sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam); sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
}; };

4
winaccessibility/inc/AccTreeEventListener.hxx
View File

@ -35,11 +35,11 @@
class AccTreeEventListener: public AccDescendantManagerEventListener class AccTreeEventListener: public AccDescendantManagerEventListener
{ {
public: public:
AccTreeEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccTreeEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccTreeEventListener(); virtual ~AccTreeEventListener();
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for active descendant changed event //for active descendant changed event
virtual void HandleActiveDescendantChangedEvent( virtual void HandleActiveDescendantChangedEvent(

4
winaccessibility/inc/AccWindowEventListener.hxx
View File

@ -35,11 +35,11 @@
class AccWindowEventListener: public AccEventListener class AccWindowEventListener: public AccEventListener
{ {
public: public:
AccWindowEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccWindowEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccWindowEventListener(); virtual ~AccWindowEventListener();
// XAccessibleEventListener // XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
//for child changed event //for child changed event
virtual void HandleChildChangedEvent( virtual void HandleChildChangedEvent(

6
winaccessibility/source/UAccCOM/AccActionBase.h
View File

@ -64,16 +64,16 @@ public:
// Override of IUNOXWrapper. // Override of IUNOXWrapper.
STDMETHOD(put_XInterface)(hyper pXInterface); STDMETHOD(put_XInterface)(hyper pXInterface);
static void GetkeyBindingStrByXkeyBinding( const com::sun::star::uno::Sequence< com::sun::star::awt::KeyStroke > &keySet, OLECHAR* pString ); static void GetkeyBindingStrByXkeyBinding( const css::uno::Sequence< css::awt::KeyStroke > &keySet, OLECHAR* pString );
protected: protected:
static OLECHAR* getOLECHARFromKeyCode(long key); static OLECHAR* getOLECHARFromKeyCode(long key);
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleAction> pRXAct; css::uno::Reference<css::accessibility::XAccessibleAction> pRXAct;
private: private:
inline com::sun::star::accessibility::XAccessibleAction* GetXInterface() inline css::accessibility::XAccessibleAction* GetXInterface()
{ {
return pRXAct.get(); return pRXAct.get();
} }

4
winaccessibility/source/UAccCOM/AccComponentBase.cxx
View File

@ -56,7 +56,7 @@ STDMETHODIMP CAccComponentBase::get_locationInParent(long *x, long *y)
if(!pRXComp.is()) if(!pRXComp.is())
return E_FAIL; return E_FAIL;
const ::com::sun::star::awt::Point& pt = GetXInterface()->getLocation(); const css::awt::Point& pt = GetXInterface()->getLocation();
*x = pt.X; *x = pt.X;
*y = pt.Y; *y = pt.Y;
return S_OK; return S_OK;
@ -86,7 +86,7 @@ STDMETHODIMP CAccComponentBase::get_locationOnScreen(long *x, long *y)
if(!pRXComp.is()) if(!pRXComp.is())
return E_FAIL; return E_FAIL;
const ::com::sun::star::awt::Point& pt = GetXInterface()->getLocationOnScreen(); const css::awt::Point& pt = GetXInterface()->getLocationOnScreen();
*x = pt.X; *x = pt.X;
*y = pt.Y; *y = pt.Y;
return S_OK; return S_OK;

4
winaccessibility/source/UAccCOM/AccComponentBase.h
View File

@ -57,9 +57,9 @@ public:
protected: protected:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleComponent> pRXComp; css::uno::Reference<css::accessibility::XAccessibleComponent> pRXComp;
inline com::sun::star::accessibility::XAccessibleComponent* GetXInterface() inline css::accessibility::XAccessibleComponent* GetXInterface()
{ {
return pRXComp.get(); return pRXComp.get();
} }

20
winaccessibility/source/UAccCOM/AccEditableText.cxx
View File

@ -306,15 +306,15 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
else if(ouName.equals(L"CharPosture") ) else if(ouName.equals(L"CharPosture") )
{ {
// Convert to FontSlant. // Convert to FontSlant.
::com::sun::star::awt::FontSlant fontSlant = (::com::sun::star::awt::FontSlant)ouValue.toInt32(); css::awt::FontSlant fontSlant = (css::awt::FontSlant)ouValue.toInt32();
rAny.setValue(&fontSlant, cppu::UnoType<com::sun::star::awt::FontSlant>::get()); rAny.setValue(&fontSlant, cppu::UnoType<css::awt::FontSlant>::get());
} }
else if(ouName.equals(L"ParaTabStops") ) else if(ouName.equals(L"ParaTabStops") )
{ {
// Convert to the Sequence with TabStop element. // Convert to the Sequence with TabStop element.
vector< ::com::sun::star::style::TabStop > vecTabStop; vector< css::style::TabStop > vecTabStop;
::com::sun::star::style::TabStop tabStop; css::style::TabStop tabStop;
::rtl::OUString ouSubValue; ::rtl::OUString ouSubValue;
sal_Int32 pos = 0, posComma = 0; sal_Int32 pos = 0, posComma = 0;
@ -339,7 +339,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
if(posComma != -1) if(posComma != -1)
{ {
ouSubValue = ouValue.copy(pos + 9, posComma - pos - 9); ouSubValue = ouValue.copy(pos + 9, posComma - pos - 9);
tabStop.Alignment = (::com::sun::star::style::TabAlign)ouSubValue.toInt32(); tabStop.Alignment = (css::style::TabAlign)ouSubValue.toInt32();
pos = posComma + 1; pos = posComma + 1;
// DecimalChar. // DecimalChar.
@ -396,7 +396,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
// Dump into Sequence. // Dump into Sequence.
int iSeqLen = (vecTabStop.size() == 0) ? 1 : vecTabStop.size(); int iSeqLen = (vecTabStop.size() == 0) ? 1 : vecTabStop.size();
Sequence< ::com::sun::star::style::TabStop > seqTabStop(iSeqLen); Sequence< css::style::TabStop > seqTabStop(iSeqLen);
if(vecTabStop.size() != 0) if(vecTabStop.size() != 0)
{ {
@ -410,18 +410,18 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
{ {
// Create default value. // Create default value.
seqTabStop[0].Position = 0; seqTabStop[0].Position = 0;
seqTabStop[0].Alignment = ::com::sun::star::style::TabAlign_DEFAULT; seqTabStop[0].Alignment = css::style::TabAlign_DEFAULT;
seqTabStop[0].DecimalChar = '.'; seqTabStop[0].DecimalChar = '.';
seqTabStop[0].FillChar = ' '; seqTabStop[0].FillChar = ' ';
} }
// Assign to Any object. // Assign to Any object.
rAny.setValue(&seqTabStop, cppu::UnoType<Sequence< ::com::sun::star::style::TabStop >>::get()); rAny.setValue(&seqTabStop, cppu::UnoType<Sequence< css::style::TabStop >>::get());
} }
else if(ouName.equals(L"ParaLineSpacing") ) else if(ouName.equals(L"ParaLineSpacing") )
{ {
// Parse value string. // Parse value string.
::com::sun::star::style::LineSpacing lineSpacing; css::style::LineSpacing lineSpacing;
::rtl::OUString ouSubValue; ::rtl::OUString ouSubValue;
sal_Int32 pos = 0, posComma = 0; sal_Int32 pos = 0, posComma = 0;
@ -459,7 +459,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
} }
// Convert to Any object. // Convert to Any object.
rAny.setValue(&lineSpacing, cppu::UnoType<com::sun::star::style::LineSpacing>::get()); rAny.setValue(&lineSpacing, cppu::UnoType<css::style::LineSpacing>::get());
} }
else else
{ {

6
winaccessibility/source/UAccCOM/AccEditableText.h
View File

@ -95,11 +95,11 @@ public:
private: private:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleEditableText> pRXEdtTxt; css::uno::Reference<css::accessibility::XAccessibleEditableText> pRXEdtTxt;
void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, com::sun::star::uno::Any &rAny); void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, css::uno::Any &rAny);
inline com::sun::star::accessibility::XAccessibleEditableText* GetXInterface() inline css::accessibility::XAccessibleEditableText* GetXInterface()
{ {
return pRXEdtTxt.get(); return pRXEdtTxt.get();
} }

4
winaccessibility/source/UAccCOM/AccHyperLink.cxx
View File

@ -120,7 +120,7 @@ STDMETHODIMP CAccHyperLink::get_anchor(/* [in] */ long index,
return E_FAIL; return E_FAIL;
} }
// Get Any type value via pRXLink. // Get Any type value via pRXLink.
::com::sun::star::uno::Any anyVal = GetXInterface()->getAccessibleActionAnchor(index); css::uno::Any anyVal = GetXInterface()->getAccessibleActionAnchor(index);
// Convert Any to VARIANT. // Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, anchor); CMAccessible::ConvertAnyToVariant(anyVal, anchor);
@ -152,7 +152,7 @@ STDMETHODIMP CAccHyperLink::get_anchorTarget(/* [in] */ long index,
return E_FAIL; return E_FAIL;
} }
// Get Any type value via pRXLink. // Get Any type value via pRXLink.
::com::sun::star::uno::Any anyVal = GetXInterface()->getAccessibleActionObject(index); css::uno::Any anyVal = GetXInterface()->getAccessibleActionObject(index);
// Convert Any to VARIANT. // Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, anchorTarget); CMAccessible::ConvertAnyToVariant(anyVal, anchorTarget);

4
winaccessibility/source/UAccCOM/AccHyperLink.h
View File

@ -121,9 +121,9 @@ public:
private: private:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleHyperlink> pRXLink; css::uno::Reference<css::accessibility::XAccessibleHyperlink> pRXLink;
inline com::sun::star::accessibility::XAccessibleHyperlink* GetXInterface() inline css::accessibility::XAccessibleHyperlink* GetXInterface()
{ {
return pRXLink.get(); return pRXLink.get();
} }

2
winaccessibility/source/UAccCOM/AccHypertext.h
View File

@ -146,7 +146,7 @@ public:
private: private:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleHypertext> pHyperText; css::uno::Reference<css::accessibility::XAccessibleHypertext> pHyperText;
}; };

4
winaccessibility/source/UAccCOM/AccImage.cxx
View File

@ -26,8 +26,8 @@
#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp>
using namespace com::sun::star::accessibility; using namespace css::accessibility;
using namespace com::sun::star::uno; using namespace css::uno;
/** /**
* Get description. * Get description.

4
winaccessibility/source/UAccCOM/AccImage.h
View File

@ -82,9 +82,9 @@ public:
private: private:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleImage> pRXImg; css::uno::Reference<css::accessibility::XAccessibleImage> pRXImg;
inline com::sun::star::accessibility::XAccessibleImage* GetXInterface() inline css::accessibility::XAccessibleImage* GetXInterface()
{ {
return pRXImg.get(); return pRXImg.get();
} }

2
winaccessibility/source/UAccCOM/AccRelation.h
View File

@ -79,7 +79,7 @@ public:
private: private:
com::sun::star::accessibility::AccessibleRelation relation; css::accessibility::AccessibleRelation relation;
}; };
#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H

4
winaccessibility/source/UAccCOM/AccTable.h
View File

@ -161,9 +161,9 @@ public:
private: private:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleTable> pRXTable; css::uno::Reference<css::accessibility::XAccessibleTable> pRXTable;
inline com::sun::star::accessibility::XAccessibleTable* GetXInterface() inline css::accessibility::XAccessibleTable* GetXInterface()
{ {
return pRXTable.get(); return pRXTable.get();
} }

18
winaccessibility/source/UAccCOM/AccTextBase.cxx
View File

@ -34,8 +34,8 @@
#include <com/sun/star/accessibility/XAccessibleTextSelection.hpp> #include <com/sun/star/accessibility/XAccessibleTextSelection.hpp>
#include "MAccessible.h" #include "MAccessible.h"
using namespace com::sun::star::accessibility; using namespace css::accessibility;
using namespace com::sun::star::uno; using namespace css::uno;
// Construction/Destruction // Construction/Destruction
@ -114,7 +114,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long
strAttrs += L"Version:1;"; strAttrs += L"Version:1;";
Sequence< ::com::sun::star::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< rtl::OUString >()); Sequence< css::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< rtl::OUString >());
int nCount = pValues.getLength(); int nCount = pValues.getLength();
short numberingLevel = 0; short numberingLevel = 0;
@ -126,7 +126,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long
for(int i =0; i<nCount; i++) for(int i =0; i<nCount; i++)
{ {
::com::sun::star::beans::PropertyValue &pValue = pValues[i]; css::beans::PropertyValue &pValue = pValues[i];
if(pValue.Name == "NumberingLevel") if(pValue.Name == "NumberingLevel")
{ {
if (pValue.Value != Any()) if (pValue.Value != Any())
@ -286,11 +286,11 @@ STDMETHODIMP CAccTextBase::get_characterExtents(long offset, IA2CoordinateType c
if(offset < 0 || offset > GetXInterface()->getCharacterCount() ) if(offset < 0 || offset > GetXInterface()->getCharacterCount() )
return E_FAIL; return E_FAIL;
com::sun::star::awt::Rectangle rectangle; css::awt::Rectangle rectangle;
rectangle = GetXInterface()->getCharacterBounds(offset); rectangle = GetXInterface()->getCharacterBounds(offset);
//IA2Point aPoint; //IA2Point aPoint;
com::sun::star::awt::Point aPoint; css::awt::Point aPoint;
Reference<XAccessibleContext> pRContext = pUNOInterface->getAccessibleContext(); Reference<XAccessibleContext> pRContext = pUNOInterface->getAccessibleContext();
if( !pRContext.is() ) if( !pRContext.is() )
@ -302,13 +302,13 @@ STDMETHODIMP CAccTextBase::get_characterExtents(long offset, IA2CoordinateType c
{ {
if(coordType == IA2_COORDTYPE_SCREEN_RELATIVE) if(coordType == IA2_COORDTYPE_SCREEN_RELATIVE)
{ {
::com::sun::star::awt::Point pt = pRComp->getLocationOnScreen(); css::awt::Point pt = pRComp->getLocationOnScreen();
aPoint.X = pt.X; aPoint.X = pt.X;
aPoint.Y = pt.Y; aPoint.Y = pt.Y;
} }
else if(coordType == IA2_COORDTYPE_PARENT_RELATIVE) else if(coordType == IA2_COORDTYPE_PARENT_RELATIVE)
{ {
::com::sun::star::awt::Point pt = pRComp->getLocation(); css::awt::Point pt = pRComp->getLocation();
aPoint.X = pt.X; aPoint.X = pt.X;
aPoint.Y = pt.Y; aPoint.Y = pt.Y;
} }
@ -401,7 +401,7 @@ STDMETHODIMP CAccTextBase::get_offsetAtPoint(long x, long y, IA2CoordinateType,
if(!pRXText.is()) if(!pRXText.is())
return E_FAIL; return E_FAIL;
com::sun::star::awt::Point point; css::awt::Point point;
point.X = x; point.X = x;
point.Y = y; point.Y = y;
*offset = GetXInterface()->getIndexAtPoint(point); *offset = GetXInterface()->getIndexAtPoint(point);

4
winaccessibility/source/UAccCOM/AccTextBase.h
View File

@ -101,9 +101,9 @@ public:
private: private:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleText> pRXText; css::uno::Reference<css::accessibility::XAccessibleText> pRXText;
inline com::sun::star::accessibility::XAccessibleText* GetXInterface() inline css::accessibility::XAccessibleText* GetXInterface()
{ {
return pRXText.get(); return pRXText.get();
} }

20
winaccessibility/source/UAccCOM/AccValue.cxx
View File

@ -48,7 +48,7 @@ STDMETHODIMP CAccValue::get_currentValue(VARIANT * currentValue)
return E_FAIL; return E_FAIL;
// Get Any type value from UNO. // Get Any type value from UNO.
::com::sun::star::uno::Any anyVal = GetXInterface()->getCurrentValue(); css::uno::Any anyVal = GetXInterface()->getCurrentValue();
// Convert Any to VARIANT. // Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, currentValue); CMAccessible::ConvertAnyToVariant(anyVal, currentValue);
@ -73,49 +73,49 @@ STDMETHODIMP CAccValue::setCurrentValue(VARIANT value)
return E_FAIL; return E_FAIL;
HRESULT hRet = S_OK; HRESULT hRet = S_OK;
::com::sun::star::uno::Any anyVal; css::uno::Any anyVal;
// Set value according to value type. // Set value according to value type.
switch(value.vt) switch(value.vt)
{ {
case VT_UI1: case VT_UI1:
{ {
::com::sun::star::uno::Type typeInfo(TypeClass_CHAR, (sal_Char *)"char"); css::uno::Type typeInfo(TypeClass_CHAR, (sal_Char *)"char");
anyVal.setValue(&value.bVal, typeInfo); anyVal.setValue(&value.bVal, typeInfo);
} }
break; break;
case VT_BOOL: case VT_BOOL:
{ {
::com::sun::star::uno::Type typeInfo(TypeClass_BOOLEAN, (sal_Char *)"bool"); css::uno::Type typeInfo(TypeClass_BOOLEAN, (sal_Char *)"bool");
anyVal.setValue(&value.boolVal, typeInfo); anyVal.setValue(&value.boolVal, typeInfo);
} }
break; break;
case VT_I2: case VT_I2:
{ {
::com::sun::star::uno::Type typeInfo(TypeClass_SHORT, (sal_Char *)"short"); css::uno::Type typeInfo(TypeClass_SHORT, (sal_Char *)"short");
anyVal.setValue(&value.iVal, typeInfo); anyVal.setValue(&value.iVal, typeInfo);
} }
break; break;
case VT_I4: case VT_I4:
{ {
::com::sun::star::uno::Type typeInfo(TypeClass_LONG, (sal_Char *)"long"); css::uno::Type typeInfo(TypeClass_LONG, (sal_Char *)"long");
anyVal.setValue(&value.lVal, typeInfo); anyVal.setValue(&value.lVal, typeInfo);
} }
break; break;
case VT_R4: case VT_R4:
{ {
::com::sun::star::uno::Type typeInfo(TypeClass_FLOAT, (sal_Char *)"float"); css::uno::Type typeInfo(TypeClass_FLOAT, (sal_Char *)"float");
anyVal.setValue(&value.fltVal, typeInfo); anyVal.setValue(&value.fltVal, typeInfo);
} }
break; break;
case VT_R8: case VT_R8:
{ {
::com::sun::star::uno::Type typeInfo(TypeClass_DOUBLE, (sal_Char *)"double"); css::uno::Type typeInfo(TypeClass_DOUBLE, (sal_Char *)"double");
anyVal.setValue(&value.dblVal, typeInfo); anyVal.setValue(&value.dblVal, typeInfo);
} }
break; break;
@ -155,7 +155,7 @@ STDMETHODIMP CAccValue::get_maximumValue(VARIANT *maximumValue)
return E_FAIL; return E_FAIL;
// Get Any type value from UNO. // Get Any type value from UNO.
::com::sun::star::uno::Any anyVal = GetXInterface()->getMaximumValue(); css::uno::Any anyVal = GetXInterface()->getMaximumValue();
// Convert Any to VARIANT. // Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, maximumValue); CMAccessible::ConvertAnyToVariant(anyVal, maximumValue);
@ -181,7 +181,7 @@ STDMETHODIMP CAccValue::get_minimumValue(VARIANT *mininumValue)
return E_FAIL; return E_FAIL;
// Get Any type value from UNO. // Get Any type value from UNO.
::com::sun::star::uno::Any anyVal = GetXInterface()->getMinimumValue(); css::uno::Any anyVal = GetXInterface()->getMinimumValue();
// Convert Any to VARIANT. // Convert Any to VARIANT.
CMAccessible::ConvertAnyToVariant(anyVal, mininumValue); CMAccessible::ConvertAnyToVariant(anyVal, mininumValue);

4
winaccessibility/source/UAccCOM/AccValue.h
View File

@ -84,9 +84,9 @@ public:
private: private:
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleValue> pRXVal; css::uno::Reference<css::accessibility::XAccessibleValue> pRXVal;
inline com::sun::star::accessibility::XAccessibleValue* GetXInterface() inline css::accessibility::XAccessibleValue* GetXInterface()
{ {
return pRXVal.get(); return pRXVal.get();
} }

38
winaccessibility/source/UAccCOM/MAccessible.cxx
View File

@ -944,8 +944,8 @@ STDMETHODIMP CMAccessible::accLocation(long *pxLeft, long *pyTop, long *pcxWidth
if( !pRComponent.is() ) if( !pRComponent.is() )
return S_FALSE; return S_FALSE;
::com::sun::star::awt::Point pCPoint = pRComponent->getLocationOnScreen(); css::awt::Point pCPoint = pRComponent->getLocationOnScreen();
::com::sun::star::awt::Size pCSize = pRComponent->getSize(); css::awt::Size pCSize = pRComponent->getSize();
*pxLeft = pCPoint.X; *pxLeft = pCPoint.X;
*pyTop = pCPoint.Y; *pyTop = pCPoint.Y;
*pcxWidth = pCSize.Width; *pcxWidth = pCSize.Width;
@ -2820,9 +2820,9 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
} }
wcscpy(pChar, pString.getStr()); wcscpy(pChar, pString.getStr());
} }
else if (pAny.getValueType() == cppu::UnoType<Sequence< ::com::sun::star::style::TabStop >>::get()) else if (pAny.getValueType() == cppu::UnoType<Sequence< css::style::TabStop >>::get())
{ {
Sequence < ::com::sun::star::style::TabStop > val; Sequence < css::style::TabStop > val;
pAny >>= val; pAny >>= val;
int count = val.getLength(); int count = val.getLength();
@ -2834,7 +2834,7 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
OLECHAR pAttrsDescimalChar[512] = {NULL}; OLECHAR pAttrsDescimalChar[512] = {NULL};
OLECHAR pAttrsFillChar[512] = {NULL}; OLECHAR pAttrsFillChar[512] = {NULL};
::com::sun::star::style::TabStop sigleVal = val[iIndex]; css::style::TabStop sigleVal = val[iIndex];
swprintf( pAttrsPosition, L"Position=%ld,TabAlign=%ld", swprintf( pAttrsPosition, L"Position=%ld,TabAlign=%ld",
sigleVal.Position, sigleVal.Alignment); sigleVal.Position, sigleVal.Alignment);
@ -2860,24 +2860,24 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
} }
case TypeClass_ENUM: case TypeClass_ENUM:
{ {
if (pAny.getValueType() == cppu::UnoType<com::sun::star::awt::FontSlant>::get()) if (pAny.getValueType() == cppu::UnoType<css::awt::FontSlant>::get())
{ {
com::sun::star::awt::FontSlant val; css::awt::FontSlant val;
pAny >>= val; pAny >>= val;
swprintf( pChar, L"%d", val); swprintf( pChar, L"%d", val);
} }
} }
case TypeClass_STRUCT: case TypeClass_STRUCT:
{ {
if (pAny.getValueType() == cppu::UnoType<com::sun::star::style::LineSpacing>::get()) if (pAny.getValueType() == cppu::UnoType<css::style::LineSpacing>::get())
{ {
com::sun::star::style::LineSpacing val; css::style::LineSpacing val;
pAny >>= val; pAny >>= val;
swprintf( pChar, L"Mode=%ld,Height=%ld,", val.Mode, val.Height); swprintf( pChar, L"Mode=%ld,Height=%ld,", val.Mode, val.Height);
} }
else if (pAny.getValueType() == cppu::UnoType<com::sun::star::accessibility::TextSegment>::get()) else if (pAny.getValueType() == cppu::UnoType<css::accessibility::TextSegment>::get())
{ {
com::sun::star::accessibility::TextSegment val; css::accessibility::TextSegment val;
pAny >>= val; pAny >>= val;
::rtl::OUString realVal(val.SegmentText); ::rtl::OUString realVal(val.SegmentText);
wcscpy(pChar, realVal.getStr()); wcscpy(pChar, realVal.getStr());
@ -2912,18 +2912,18 @@ void CMAccessible::get_OLECHAR4Numbering(const Any& pAny, short numberingLevel,c
{ {
if(pChar == NULL) if(pChar == NULL)
return; return;
Reference< ::com::sun::star::container::XIndexReplace > pXIndex; Reference< css::container::XIndexReplace > pXIndex;
if((pAny>>=pXIndex) && (numberingLevel !=-1))//numbering level is -1,means invalid value if((pAny>>=pXIndex) && (numberingLevel !=-1))//numbering level is -1,means invalid value
{ {
Any aAny = pXIndex->getByIndex(numberingLevel); Any aAny = pXIndex->getByIndex(numberingLevel);
Sequence< ::com::sun::star::beans::PropertyValue > aProps; Sequence< css::beans::PropertyValue > aProps;
aAny >>= aProps; aAny >>= aProps;
const ::com::sun::star::beans::PropertyValue* pPropArray = aProps.getConstArray(); const css::beans::PropertyValue* pPropArray = aProps.getConstArray();
sal_Int32 nCount = aProps.getLength(); sal_Int32 nCount = aProps.getLength();
swprintf(pChar,L"Numbering:NumberingLevel=%d,",numberingLevel); swprintf(pChar,L"Numbering:NumberingLevel=%d,",numberingLevel);
for( sal_Int32 i=0; i<nCount; i++ ) for( sal_Int32 i=0; i<nCount; i++ )
{ {
::com::sun::star::beans::PropertyValue rProp = pPropArray[i]; css::beans::PropertyValue rProp = pPropArray[i];
if( (rProp.Name == "BulletChar" ) || if( (rProp.Name == "BulletChar" ) ||
(rProp.Name == "GraphicURL" ) || (rProp.Name == "GraphicURL" ) ||
(rProp.Name == "NumberingType" )) (rProp.Name == "NumberingType" ))
@ -2970,7 +2970,7 @@ void CMAccessible::get_OLECHAR4Numbering(const Any& pAny, short numberingLevel,c
} }
} }
void CMAccessible::ConvertAnyToVariant(const ::com::sun::star::uno::Any &rAnyVal, VARIANT *pvData) void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pvData)
{ {
if(rAnyVal.hasValue()) if(rAnyVal.hasValue())
{ {
@ -3195,7 +3195,7 @@ STDMETHODIMP CMAccessible:: get_locale( IA2Locale __RPC_FAR *locale )
if (!m_xContext.is()) if (!m_xContext.is())
return E_FAIL; return E_FAIL;
::com::sun::star::lang::Locale unoLoc = m_xContext.get()->getLocale(); css::lang::Locale unoLoc = m_xContext.get()->getLocale();
locale->language = SysAllocString((OLECHAR*)unoLoc.Language.getStr()); locale->language = SysAllocString((OLECHAR*)unoLoc.Language.getStr());
locale->country = SysAllocString((OLECHAR*)unoLoc.Country.getStr()); locale->country = SysAllocString((OLECHAR*)unoLoc.Country.getStr());
locale->variant = SysAllocString((OLECHAR*)unoLoc.Variant.getStr()); locale->variant = SysAllocString((OLECHAR*)unoLoc.Variant.getStr());
@ -3329,9 +3329,9 @@ STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr)
return E_FAIL; return E_FAIL;
else else
{ {
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleExtendedAttributes> pRXAttr; css::uno::Reference<css::accessibility::XAccessibleExtendedAttributes> pRXAttr;
pRXAttr = pRXI.get(); pRXAttr = pRXI.get();
::com::sun::star::uno::Any anyVal = pRXAttr->getExtendedAttributes(); css::uno::Any anyVal = pRXAttr->getExtendedAttributes();
::rtl::OUString val; ::rtl::OUString val;
anyVal >>= val; anyVal >>= val;

2
winaccessibility/source/UAccCOM/UNOXWrapper.h
View File

@ -41,7 +41,7 @@ public:
protected: protected:
com::sun::star::accessibility::XAccessible* pUNOInterface; css::accessibility::XAccessible* pUNOInterface;
}; };
#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H

6
winaccessibility/source/service/AccComponentEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccComponentEventListener::AccComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccComponentEventListener::AccComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccEventListener(pAcc, Agent) :AccEventListener(pAcc, Agent)
{ {
} }
@ -46,8 +46,8 @@ AccComponentEventListener::~AccComponentEventListener()
* *
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccComponentEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccComponentEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

14
winaccessibility/source/service/AccContainerEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccContainerEventListener::AccContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccContainerEventListener::AccContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccEventListener(pAcc, Agent) :AccEventListener(pAcc, Agent)
{ {
} }
@ -46,8 +46,8 @@ AccContainerEventListener::~AccContainerEventListener()
* *
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccContainerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccContainerEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;
@ -488,12 +488,12 @@ void AccContainerEventListener::HandleSelectionChangedWithinEvent(const Any& /*o
void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible) void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible)
{ {
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pXAccessible->getAccessibleContext(),UNO_QUERY); Reference<css::accessibility::XAccessibleContext> xContext(pXAccessible->getAccessibleContext(),UNO_QUERY);
if(!xContext.is()) if(!xContext.is())
{ {
return; return;
} }
com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
if(pAccessibleContext == NULL) if(pAccessibleContext == NULL)
{ {
return; return;
@ -507,10 +507,10 @@ void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible
int count = pAccessibleContext->getAccessibleChildCount(); int count = pAccessibleContext->getAccessibleChildCount();
for (int i=0;i<count;i++) for (int i=0;i<count;i++)
{ {
Reference<com::sun::star::accessibility::XAccessible> mxAccessible Reference<css::accessibility::XAccessible> mxAccessible
= pAccessibleContext->getAccessibleChild(i); = pAccessibleContext->getAccessibleChild(i);
com::sun::star::accessibility::XAccessible* mpAccessible = mxAccessible.get(); css::accessibility::XAccessible* mpAccessible = mxAccessible.get();
if(mpAccessible != NULL) if(mpAccessible != NULL)
{ {
pAgent->UpdateState(mpAccessible); pAgent->UpdateState(mpAccessible);

6
winaccessibility/source/service/AccDescendantManagerEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccDescendantManagerEventListener::AccDescendantManagerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccDescendantManagerEventListener::AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
: AccComponentEventListener(pAcc, Agent) : AccComponentEventListener(pAcc, Agent)
{ {
} }
@ -45,8 +45,8 @@ AccDescendantManagerEventListener::~AccDescendantManagerEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccDescendantManagerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccDescendantManagerEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

6
winaccessibility/source/service/AccDialogEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccDialogEventListener::AccDialogEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccDialogEventListener::AccDialogEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccEventListener(pAcc, Agent) :AccEventListener(pAcc, Agent)
{} {}
AccDialogEventListener::~AccDialogEventListener() AccDialogEventListener::~AccDialogEventListener()
@ -43,8 +43,8 @@ AccDialogEventListener::~AccDialogEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccDialogEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccDialogEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

12
winaccessibility/source/service/AccEventListener.cxx
View File

@ -42,7 +42,7 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
using namespace cppu; using namespace cppu;
AccEventListener::AccEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccEventListener::AccEventListener(css::accessibility::XAccessible* pAcc,
AccObjectManagerAgent* Agent) AccObjectManagerAgent* Agent)
: m_xAccessible(pAcc) : m_xAccessible(pAcc)
, pAgent(Agent) , pAgent(Agent)
@ -56,8 +56,8 @@ AccEventListener::~AccEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;
@ -201,7 +201,7 @@ void AccEventListener::FireStatePropertyChange(short /*state*/, bool set )
*/ */
short AccEventListener::GetRole() short AccEventListener::GetRole()
{ {
css::uno::Reference<com::sun::star::accessibility::XAccessibleContext> const css::uno::Reference<css::accessibility::XAccessibleContext> const
xContext(m_xAccessible->getAccessibleContext()); xContext(m_xAccessible->getAccessibleContext());
if(xContext.is()) if(xContext.is())
{ {
@ -258,8 +258,8 @@ void AccEventListener::RemoveMeFromBroadcaster()
/** /**
* this method is invoked before listener is disposed * this method is invoked before listener is disposed
*/ */
void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) void AccEventListener::disposing( const css::lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

6
winaccessibility/source/service/AccFrameEventListener.cxx
View File

@ -36,7 +36,7 @@ using namespace com::sun::star::accessibility;
#include <toolkit/awt/Vclxwindow.hxx> #include <toolkit/awt/Vclxwindow.hxx>
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
AccFrameEventListener::AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccFrameEventListener::AccFrameEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccEventListener(pAcc, Agent) :AccEventListener(pAcc, Agent)
{ {
} }
@ -49,8 +49,8 @@ AccFrameEventListener::~AccFrameEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccFrameEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccFrameEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

4
winaccessibility/source/service/AccListEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccListEventListener::AccListEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccListEventListener::AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccDescendantManagerEventListener(pAcc, Agent), :AccDescendantManagerEventListener(pAcc, Agent),
shouldDeleteChild(true) shouldDeleteChild(true)
{ {
@ -46,7 +46,7 @@ AccListEventListener::~AccListEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) void AccListEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

6
winaccessibility/source/service/AccMenuEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccMenuEventListener::AccMenuEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccMenuEventListener::AccMenuEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccComponentEventListener(pAcc, Agent) :AccComponentEventListener(pAcc, Agent)
{} {}
AccMenuEventListener::~AccMenuEventListener() AccMenuEventListener::~AccMenuEventListener()
@ -43,8 +43,8 @@ AccMenuEventListener::~AccMenuEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccMenuEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccMenuEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

8
winaccessibility/source/service/AccObject.cxx
View File

@ -471,9 +471,9 @@ void AccObject::SetValue( Any pAny )
strValue=::rtl::OUString::number(val); strValue=::rtl::OUString::number(val);
} }
} }
else if (pAny.getValueType() == cppu::UnoType<com::sun::star::accessibility::TextSegment>::get()) else if (pAny.getValueType() == cppu::UnoType<css::accessibility::TextSegment>::get())
{ {
com::sun::star::accessibility::TextSegment val; css::accessibility::TextSegment val;
if (pAny >>= val) if (pAny >>= val)
{ {
::rtl::OUString realVal(val.SegmentText); ::rtl::OUString realVal(val.SegmentText);
@ -998,8 +998,8 @@ void AccObject::UpdateLocation()
Reference< XAccessibleComponent > pRComponent(pContext,UNO_QUERY); Reference< XAccessibleComponent > pRComponent(pContext,UNO_QUERY);
if( pRComponent.is() ) if( pRComponent.is() )
{ {
::com::sun::star::awt::Point pCPoint = pRComponent->getLocationOnScreen(); css::awt::Point pCPoint = pRComponent->getLocationOnScreen();
::com::sun::star::awt::Size pCSize = pRComponent->getSize(); css::awt::Size pCSize = pRComponent->getSize();
Location tempLocation; Location tempLocation;
tempLocation.m_dLeft = pCPoint.X; tempLocation.m_dLeft = pCPoint.X;
tempLocation.m_dTop = pCPoint.Y; tempLocation.m_dTop = pCPoint.Y;

2
winaccessibility/source/service/AccObjectContainerEventListener.cxx
View File

@ -34,7 +34,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccObjectContainerEventListener::AccObjectContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccObjectContainerEventListener::AccObjectContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccContainerEventListener(pAcc, Agent) :AccContainerEventListener(pAcc, Agent)
{} {}
AccObjectContainerEventListener::~AccObjectContainerEventListener() AccObjectContainerEventListener::~AccObjectContainerEventListener()

2
winaccessibility/source/service/AccObjectManagerAgent.cxx
View File

@ -227,7 +227,7 @@ void AccObjectManagerAgent::IncreaseState( XAccessible* pXAcc,unsigned short pSt
} }
} }
void AccObjectManagerAgent::UpdateState( com::sun::star::accessibility::XAccessible* pXAcc ) void AccObjectManagerAgent::UpdateState( css::accessibility::XAccessible* pXAcc )
{ {
if(pWinManager) if(pWinManager)
pWinManager->UpdateState(pXAcc); pWinManager->UpdateState(pXAcc);

28
winaccessibility/source/service/AccObjectWinManager.cxx
View File

@ -584,7 +584,7 @@ inline long AccObjectWinManager::ImpleGenerateResID()
* @param pWnd Top Window handle * @param pWnd Top Window handle
* @return The calling result. * @return The calling result.
*/ */
sal_Bool AccObjectWinManager::InsertChildrenAccObj( com::sun::star::accessibility::XAccessible* pXAcc, sal_Bool AccObjectWinManager::InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc,
HWND pWnd) HWND pWnd)
{ {
if(!IsContainer(pXAcc)) if(!IsContainer(pXAcc))
@ -600,10 +600,10 @@ sal_Bool AccObjectWinManager::InsertChildrenAccObj( com::sun::star::accessibilit
short role = pRContext->getAccessibleRole(); short role = pRContext->getAccessibleRole();
if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role || if(css::accessibility::AccessibleRole::DOCUMENT == role ||
com::sun::star::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role || css::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
com::sun::star::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role || css::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
com::sun::star::accessibility::AccessibleRole::DOCUMENT_TEXT == role) css::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
{ {
if(IsStateManageDescendant(pXAcc)) if(IsStateManageDescendant(pXAcc))
{ {
@ -761,7 +761,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar
* @param pXAcc XAccessible interface for top window * @param pXAcc XAccessible interface for top window
* @return void * @return void
*/ */
void AccObjectWinManager::SaveTopWindowHandle(HWND hWnd, com::sun::star::accessibility::XAccessible* pXAcc) void AccObjectWinManager::SaveTopWindowHandle(HWND hWnd, css::accessibility::XAccessible* pXAcc)
{ {
HwndXAcc.insert( XHWNDToXAccHash::value_type( hWnd,(void*)pXAcc ) ); HwndXAcc.insert( XHWNDToXAccHash::value_type( hWnd,(void*)pXAcc ) );
} }
@ -906,7 +906,7 @@ void AccObjectWinManager::IncreaseState( XAccessible* pXAcc,unsigned short pStat
pAccObj->IncreaseState( pState ); pAccObj->IncreaseState( pState );
} }
void AccObjectWinManager::UpdateState( com::sun::star::accessibility::XAccessible* pXAcc ) void AccObjectWinManager::UpdateState( css::accessibility::XAccessible* pXAcc )
{ {
AccObject* pAccObj = GetAccObjByXAcc( pXAcc ); AccObject* pAccObj = GetAccObjByXAcc( pXAcc );
if( pAccObj ) if( pAccObj )
@ -1169,9 +1169,9 @@ void AccObjectWinManager::NotifyDestroy(XAccessible* pXAcc)
} }
void AccObjectWinManager::UpdateChildState(com::sun::star::accessibility::XAccessible* pAccSubMenu) void AccObjectWinManager::UpdateChildState(css::accessibility::XAccessible* pAccSubMenu)
{ {
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccSubMenu,UNO_QUERY); Reference<css::accessibility::XAccessibleContext> xContext(pAccSubMenu,UNO_QUERY);
if (!xContext.is()) if (!xContext.is())
{ {
return; return;
@ -1179,7 +1179,7 @@ void AccObjectWinManager::UpdateChildState(com::sun::star::accessibility::XAcces
sal_Int32 nCount = xContext->getAccessibleChildCount(); sal_Int32 nCount = xContext->getAccessibleChildCount();
for (sal_Int32 i = 0 ; i < nCount ; ++i) for (sal_Int32 i = 0 ; i < nCount ; ++i)
{ {
Reference<com::sun::star::accessibility::XAccessible> xChild = xContext->getAccessibleChild(i); Reference<css::accessibility::XAccessible> xChild = xContext->getAccessibleChild(i);
if (xChild.is()) if (xChild.is())
{ {
AccObject *pObj = GetAccObjByXAcc(xChild.get()); AccObject *pObj = GetAccObjByXAcc(xChild.get());
@ -1192,7 +1192,7 @@ void AccObjectWinManager::UpdateChildState(com::sun::star::accessibility::XAcces
} }
bool AccObjectWinManager::IsSpecialToolboItem(com::sun::star::accessibility::XAccessible* pXAcc) bool AccObjectWinManager::IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc)
{ {
if (pXAcc && oldFocus != pXAcc) if (pXAcc && oldFocus != pXAcc)
{ {
@ -1211,10 +1211,10 @@ bool AccObjectWinManager::IsSpecialToolboItem(com::sun::star::accessibility::XAc
return false; return false;
} }
short AccObjectWinManager::GetRole(com::sun::star::accessibility::XAccessible* pXAcc) short AccObjectWinManager::GetRole(css::accessibility::XAccessible* pXAcc)
{ {
assert(pXAcc != NULL); assert(pXAcc != NULL);
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pXAcc->getAccessibleContext(),UNO_QUERY); Reference<css::accessibility::XAccessibleContext> xContext(pXAcc->getAccessibleContext(),UNO_QUERY);
if(xContext.is()) if(xContext.is())
{ {
return xContext->getAccessibleRole(); return xContext->getAccessibleRole();
@ -1241,7 +1241,7 @@ XAccessible* AccObjectWinManager::GetAccDocByAccTopWin( XAccessible* pXAcc )
return GetAccDocByHWND(hWnd); return GetAccDocByHWND(hWnd);
} }
bool AccObjectWinManager::IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc ) bool AccObjectWinManager::IsTopWinAcc( css::accessibility::XAccessible* pXAcc )
{ {
bool bRet = false; bool bRet = false;
AccObject* pAccObj = GetAccObjByXAcc( pXAcc ); AccObject* pAccObj = GetAccObjByXAcc( pXAcc );

6
winaccessibility/source/service/AccParagraphEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccParagraphEventListener::AccParagraphEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccParagraphEventListener::AccParagraphEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccContainerEventListener(pAcc, Agent) :AccContainerEventListener(pAcc, Agent)
{} {}
AccParagraphEventListener::~AccParagraphEventListener() AccParagraphEventListener::~AccParagraphEventListener()
@ -43,8 +43,8 @@ AccParagraphEventListener::~AccParagraphEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccParagraphEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccParagraphEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

6
winaccessibility/source/service/AccTableEventListener.cxx
View File

@ -33,7 +33,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccTableEventListener::AccTableEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccTableEventListener::AccTableEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccDescendantManagerEventListener(pAcc, Agent) :AccDescendantManagerEventListener(pAcc, Agent)
{} {}
AccTableEventListener::~AccTableEventListener() AccTableEventListener::~AccTableEventListener()
@ -44,8 +44,8 @@ AccTableEventListener::~AccTableEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccTableEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) void AccTableEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

2
winaccessibility/source/service/AccTextComponentEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccTextComponentEventListener::AccTextComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccTextComponentEventListener::AccTextComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccComponentEventListener(pAcc, Agent) :AccComponentEventListener(pAcc, Agent)
{} {}
AccTextComponentEventListener::~AccTextComponentEventListener() AccTextComponentEventListener::~AccTextComponentEventListener()

74
winaccessibility/source/service/AccTopWindowListener.cxx
View File

@ -48,7 +48,7 @@ using namespace cppu;
* accessible listener to monitor all these objects. * accessible listener to monitor all these objects.
* @param pAccessible the accessible of the new opened window * @param pAccessible the accessible of the new opened window
*/ */
void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible ) void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* pAccessible )
{ {
//get SystemData from window //get SystemData from window
VCLXWindow* pvclwindow = (VCLXWindow*)pAccessible; VCLXWindow* pvclwindow = (VCLXWindow*)pAccessible;
@ -63,11 +63,11 @@ void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XA
{ {
systemdata = NULL; systemdata = NULL;
} }
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY); Reference<css::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
if(!xContext.is()) if(!xContext.is())
return; return;
com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
//Only AccessibleContext exist, add all listeners //Only AccessibleContext exist, add all listeners
if(pAccessibleContext != NULL && systemdata != NULL) if(pAccessibleContext != NULL && systemdata != NULL)
{ {
@ -81,16 +81,16 @@ void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XA
short role = pAccessibleContext->getAccessibleRole(); short role = pAccessibleContext->getAccessibleRole();
if (role == com::sun::star::accessibility::AccessibleRole::POPUP_MENU || if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
role == com::sun::star::accessibility::AccessibleRole::MENU ) role == css::accessibility::AccessibleRole::MENU )
{ {
accManagerAgent.NotifyAccEvent(UM_EVENT_MENUPOPUPSTART, pAccessible); accManagerAgent.NotifyAccEvent(UM_EVENT_MENUPOPUPSTART, pAccessible);
} }
if (role == com::sun::star::accessibility::AccessibleRole::FRAME || if (role == css::accessibility::AccessibleRole::FRAME ||
role == com::sun::star::accessibility::AccessibleRole::DIALOG || role == css::accessibility::AccessibleRole::DIALOG ||
role == com::sun::star::accessibility::AccessibleRole::WINDOW || role == css::accessibility::AccessibleRole::WINDOW ||
role == com::sun::star::accessibility::AccessibleRole::ALERT) role == css::accessibility::AccessibleRole::ALERT)
{ {
accManagerAgent.NotifyAccEvent(UM_EVENT_SHOW, pAccessible); accManagerAgent.NotifyAccEvent(UM_EVENT_SHOW, pAccessible);
} }
@ -109,15 +109,15 @@ AccTopWindowListener::~AccTopWindowListener()
/** /**
* It is invoked when a new window is opened, the source of this EventObject is the window * It is invoked when a new window is opened, the source of this EventObject is the window
*/ */
void AccTopWindowListener::windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException)
{ {
SAL_INFO( "iacc2", "windowOpened triggered" ); SAL_INFO( "iacc2", "windowOpened triggered" );
if ( !e.Source.is()) if ( !e.Source.is())
return; return;
Reference< com::sun::star::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY ); Reference< css::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY );
com::sun::star::accessibility::XAccessible* pAccessible = xAccessible.get(); css::accessibility::XAccessible* pAccessible = xAccessible.get();
if ( !pAccessible ) if ( !pAccessible )
return; return;
@ -132,14 +132,14 @@ void AccTopWindowListener::windowOpened( const ::com::sun::star::lang::EventObje
* @param pParentXAcc the parent of current accessible object * @param pParentXAcc the parent of current accessible object
* @param pWND the handle of top window which current object resides * @param pWND the handle of top window which current object resides
*/ */
void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAccessible* pAccessible, com::sun::star::accessibility::XAccessible* pParentXAcc, HWND pWND) void AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAccessible, css::accessibility::XAccessible* pParentXAcc, HWND pWND)
{ {
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY); Reference<css::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
if(!xContext.is()) if(!xContext.is())
{ {
return; return;
} }
com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
if(pAccessibleContext == NULL) if(pAccessibleContext == NULL)
{ {
return; return;
@ -155,10 +155,10 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
short role = pAccessibleContext->getAccessibleRole(); short role = pAccessibleContext->getAccessibleRole();
if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role || if(css::accessibility::AccessibleRole::DOCUMENT == role ||
com::sun::star::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role || css::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
com::sun::star::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role || css::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
com::sun::star::accessibility::AccessibleRole::DOCUMENT_TEXT == role) css::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
{ {
if(accManagerAgent.IsStateManageDescendant(pAccessible)) if(accManagerAgent.IsStateManageDescendant(pAccessible))
{ {
@ -170,22 +170,22 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
int count = pAccessibleContext->getAccessibleChildCount(); int count = pAccessibleContext->getAccessibleChildCount();
for (int i=0;i<count;i++) for (int i=0;i<count;i++)
{ {
Reference<com::sun::star::accessibility::XAccessible> mxAccessible Reference<css::accessibility::XAccessible> mxAccessible
= pAccessibleContext->getAccessibleChild(i); = pAccessibleContext->getAccessibleChild(i);
com::sun::star::accessibility::XAccessible* mpAccessible = mxAccessible.get(); css::accessibility::XAccessible* mpAccessible = mxAccessible.get();
if(mpAccessible != NULL) if(mpAccessible != NULL)
{ {
Reference<com::sun::star::accessibility::XAccessibleContext> mxAccessibleContext Reference<css::accessibility::XAccessibleContext> mxAccessibleContext
= mpAccessible->getAccessibleContext(); = mpAccessible->getAccessibleContext();
com::sun::star::accessibility::XAccessibleContext* mpContext = mxAccessibleContext.get(); css::accessibility::XAccessibleContext* mpContext = mxAccessibleContext.get();
if(mpContext != NULL) if(mpContext != NULL)
AddAllListeners( mpAccessible, pAccessible, pWND); AddAllListeners( mpAccessible, pAccessible, pWND);
} }
} }
} }
void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::windowClosing( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
{ {
SAL_INFO( "iacc2", "windowClosing triggered" ); SAL_INFO( "iacc2", "windowClosing triggered" );
} }
@ -195,32 +195,32 @@ void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObj
* from current manager's cache, and remove the COM object and the accessible event listener * from current manager's cache, and remove the COM object and the accessible event listener
* assigned to the accessible objects. * assigned to the accessible objects.
*/ */
void AccTopWindowListener::windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException)
{ {
SAL_INFO( "iacc2", "windowClosed triggered" ); SAL_INFO( "iacc2", "windowClosed triggered" );
if ( !e.Source.is()) if ( !e.Source.is())
return; return;
Reference< com::sun::star::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY ); Reference< css::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY );
com::sun::star::accessibility::XAccessible* pAccessible = xAccessible.get(); css::accessibility::XAccessible* pAccessible = xAccessible.get();
if ( pAccessible == NULL) if ( pAccessible == NULL)
return; return;
Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY); Reference<css::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
if(!xContext.is()) if(!xContext.is())
{ {
return; return;
} }
com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
short role = -1; short role = -1;
if(pAccessibleContext != NULL) if(pAccessibleContext != NULL)
{ {
role = pAccessibleContext->getAccessibleRole(); role = pAccessibleContext->getAccessibleRole();
if (role == com::sun::star::accessibility::AccessibleRole::POPUP_MENU || if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
role == com::sun::star::accessibility::AccessibleRole::MENU) role == css::accessibility::AccessibleRole::MENU)
{ {
accManagerAgent.NotifyAccEvent(UM_EVENT_MENUPOPUPEND, pAccessible); accManagerAgent.NotifyAccEvent(UM_EVENT_MENUPOPUPEND, pAccessible);
} }
@ -228,28 +228,28 @@ void AccTopWindowListener::windowClosed( const ::com::sun::star::lang::EventObje
accManagerAgent.DeleteChildrenAccObj( pAccessible ); accManagerAgent.DeleteChildrenAccObj( pAccessible );
if( role != com::sun::star::accessibility::AccessibleRole::POPUP_MENU ) if( role != css::accessibility::AccessibleRole::POPUP_MENU )
accManagerAgent.DeleteAccObj( pAccessible ); accManagerAgent.DeleteAccObj( pAccessible );
} }
void AccTopWindowListener::windowMinimized( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::windowMinimized( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
{ {
} }
void AccTopWindowListener::windowNormalized( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::windowNormalized( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
{ {
} }
void AccTopWindowListener::windowActivated( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::windowActivated( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
{ {
} }
void AccTopWindowListener::windowDeactivated( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::windowDeactivated( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
{ {
} }
void AccTopWindowListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) void AccTopWindowListener::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
{ {
} }

4
winaccessibility/source/service/AccTreeEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccTreeEventListener::AccTreeEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccTreeEventListener::AccTreeEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccDescendantManagerEventListener(pAcc, Agent) :AccDescendantManagerEventListener(pAcc, Agent)
{} {}
AccTreeEventListener::~AccTreeEventListener() AccTreeEventListener::~AccTreeEventListener()
@ -43,7 +43,7 @@ AccTreeEventListener::~AccTreeEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject the event object which contains information about event * @param AccessibleEventObject the event object which contains information about event
*/ */
void AccTreeEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) void AccTreeEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

4
winaccessibility/source/service/AccWindowEventListener.cxx
View File

@ -32,7 +32,7 @@
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility; using namespace com::sun::star::accessibility;
AccWindowEventListener::AccWindowEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent) AccWindowEventListener::AccWindowEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
:AccEventListener(pAcc, Agent) :AccEventListener(pAcc, Agent)
{} {}
AccWindowEventListener::~AccWindowEventListener() AccWindowEventListener::~AccWindowEventListener()
@ -43,7 +43,7 @@ AccWindowEventListener::~AccWindowEventListener()
* Uno's event notifier when event is captured * Uno's event notifier when event is captured
* @param AccessibleEventObject: the event object which contains information about event * @param AccessibleEventObject: the event object which contains information about event
*/ */
void AccWindowEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) void AccWindowEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
{ {
SolarMutexGuard g; SolarMutexGuard g;

4
winaccessibility/source/service/msaaservice_impl.cxx
View File

@ -115,7 +115,7 @@ void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
if (m_pTopWindowListener.is() && nAcc) if (m_pTopWindowListener.is() && nAcc)
{ {
m_pTopWindowListener->HandleWindowOpened( m_pTopWindowListener->HandleWindowOpened(
static_cast<com::sun::star::accessibility::XAccessible*>( static_cast<css::accessibility::XAccessible*>(
reinterpret_cast<void*>(nAcc))); reinterpret_cast<void*>(nAcc)));
} }
} }
@ -186,7 +186,7 @@ static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xA
} }
} }
} }
catch (::com::sun::star::uno::RuntimeException const&) catch (css::uno::RuntimeException const&)
{ {
// Ignore show events that throw DisposedExceptions in getAccessibleContext(), // Ignore show events that throw DisposedExceptions in getAccessibleContext(),
// but keep revoking these windows in hide(s). // but keep revoking these windows in hide(s).