diff options
Diffstat (limited to 'winaccessibility/inc')
18 files changed, 44 insertions, 44 deletions
diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx index 37b20d0c31f6..67cfc44312a9 100644 --- a/winaccessibility/inc/AccComponentEventListener.hxx +++ b/winaccessibility/inc/AccComponentEventListener.hxx @@ -39,7 +39,7 @@ private: static FILE *output, *output2, *output3, *outacc;//used for debugging public: AccComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccComponentEventListener(); + virtual ~AccComponentEventListener() override; // XAccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx index 08d0f3c2bc97..55c09acd9867 100644 --- a/winaccessibility/inc/AccContainerEventListener.hxx +++ b/winaccessibility/inc/AccContainerEventListener.hxx @@ -39,7 +39,7 @@ class AccContainerEventListener: public AccEventListener { public: AccContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccContainerEventListener(); + virtual ~AccContainerEventListener() override; //AccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; @@ -69,7 +69,7 @@ public: virtual void SetComponentState(short state, bool enable) override; virtual void FireStatePropertyChange(short state, bool set) override; virtual void FireStateFocusedChange(bool enable) override; - virtual bool IsEditable(css::uno::Reference<css::accessibility::XAccessibleContext> xContext); + virtual bool IsEditable(css::uno::Reference<css::accessibility::XAccessibleContext> const & xContext); // update all children's state void UpdateAllChildrenState( css::accessibility::XAccessible* pXAccessible); diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx index bb310f7d3d80..26aec84e29e6 100644 --- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx +++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx @@ -36,10 +36,10 @@ class AccDescendantManagerEventListener: public AccComponentEventListener public: AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccDescendantManagerEventListener(); + virtual ~AccDescendantManagerEventListener() override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for selection changed event virtual void HandleSelectionChangedEvent( diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx index 6318757ef499..f7f9dfe35bae 100644 --- a/winaccessibility/inc/AccDialogEventListener.hxx +++ b/winaccessibility/inc/AccDialogEventListener.hxx @@ -35,7 +35,7 @@ class AccDialogEventListener: public AccEventListener { public: AccDialogEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccDialogEventListener(); + virtual ~AccDialogEventListener() override; //AccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx index 0b629feb2f6b..d4e2a1b7daa0 100644 --- a/winaccessibility/inc/AccEventListener.hxx +++ b/winaccessibility/inc/AccEventListener.hxx @@ -45,7 +45,7 @@ protected: AccObjectManagerAgent* pAgent; public: AccEventListener( css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccEventListener(); + virtual ~AccEventListener() override; // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override; diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx index 0e9a642ce3b2..cab26c3f0410 100644 --- a/winaccessibility/inc/AccFrameEventListener.hxx +++ b/winaccessibility/inc/AccFrameEventListener.hxx @@ -36,7 +36,7 @@ class AccFrameEventListener: public AccEventListener { public: AccFrameEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccFrameEventListener(); + virtual ~AccFrameEventListener() override; // XAccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx index 4a036e134e4d..2b414f40fb15 100644 --- a/winaccessibility/inc/AccListEventListener.hxx +++ b/winaccessibility/inc/AccListEventListener.hxx @@ -36,7 +36,7 @@ class AccListEventListener: public AccDescendantManagerEventListener { public: AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccListEventListener(); + virtual ~AccListEventListener() override; // XAccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx index 4b96e1b6b832..585c42aab171 100644 --- a/winaccessibility/inc/AccMenuEventListener.hxx +++ b/winaccessibility/inc/AccMenuEventListener.hxx @@ -36,7 +36,7 @@ class AccMenuEventListener: public AccComponentEventListener { public: AccMenuEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccMenuEventListener(); + virtual ~AccMenuEventListener() override; //AccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx index 3b1bf98e5ab3..89ae14b5e011 100644 --- a/winaccessibility/inc/AccObject.hxx +++ b/winaccessibility/inc/AccObject.hxx @@ -57,7 +57,7 @@ private: short m_accRole; long m_resID; HWND m_pParantID; - sal_Bool m_bShouldDestroy; //avoid access COM interface when acc object is deleted + bool m_bShouldDestroy; //avoid access COM interface when acc object is deleted IMAccessible* m_pIMAcc; AccObject* m_pParentObj; IAccChildList m_childrenList; @@ -80,10 +80,10 @@ private: public: - AccObject ( css::accessibility::XAccessible* pXAcc = NULL,AccObjectManagerAgent* pAgent = NULL ,AccEventListener* accListener=NULL); + AccObject ( css::accessibility::XAccessible* pXAcc = nullptr,AccObjectManagerAgent* pAgent = nullptr ,AccEventListener* accListener=nullptr); virtual ~AccObject(); - sal_Bool UpdateAccessibleInfoFromUnoToMSAA( ); //implement accessible information mapping + bool UpdateAccessibleInfoFromUnoToMSAA( ); //implement accessible information mapping void UpdateDefaultAction(); IMAccessible* GetIMAccessible(); //return COM interface in acc object @@ -106,8 +106,8 @@ public: void DeleteChild( AccObject* pChild ); AccObject* NextChild(); - void NotifyDestroy(sal_Bool ifDelete); - sal_Bool ifShouldDestroy(); + void NotifyDestroy(bool ifDelete); + bool ifShouldDestroy(); void DecreaseState(short xState );//call COM interface DecreaseState method void IncreaseState( short xState );//call COM interface IncreaseState method diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx index 6a89a117dce2..54bad1f4b049 100644 --- a/winaccessibility/inc/AccObjectContainerEventListener.hxx +++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx @@ -36,7 +36,7 @@ class AccObjectContainerEventListener: public AccContainerEventListener { public: AccObjectContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccObjectContainerEventListener(); + virtual ~AccObjectContainerEventListener() override; virtual void HandleStateChangedEvent( css::uno::Any oldValue, css::uno::Any newValue) override; diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx index 6247260e1e19..065210512067 100644 --- a/winaccessibility/inc/AccObjectManagerAgent.hxx +++ b/winaccessibility/inc/AccObjectManagerAgent.hxx @@ -53,7 +53,7 @@ public: virtual void DeleteAccObj( css::accessibility::XAccessible* pXAcc ); virtual IMAccessible* GetIMAccByXAcc(css::accessibility::XAccessible* pXAcc); - bool NotifyAccEvent(short pEvent = 0, css::accessibility::XAccessible* pXAcc = 0); + bool NotifyAccEvent(short pEvent = 0, css::accessibility::XAccessible* pXAcc = nullptr); bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc, sal_Int64 pWnd=0); @@ -63,7 +63,7 @@ public: void IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState ); void UpdateState( css::accessibility::XAccessible* pXAcc ); - void UpdateLocation( css::accessibility::XAccessible* pXAcc, + static void UpdateLocation( css::accessibility::XAccessible* pXAcc, long Top = 0,long left = 0,long width = 0,long height = 0 ); void UpdateAction( css::accessibility::XAccessible* pXAcc ); diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index e0fd8e7c9081..ba04f217b436 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -78,7 +78,7 @@ private: AccObjectManagerAgent* pAgent; ResIDGenerator ResIdGen; - AccObjectWinManager(AccObjectManagerAgent* Agent=NULL); + AccObjectWinManager(AccObjectManagerAgent* Agent=nullptr); private: long ImpleGenerateResID(); @@ -88,9 +88,9 @@ private: css::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd); - void DeleteAccListener( AccObject* pAccObj ); - void InsertAccChildNode(AccObject* pCurObj,AccObject* pParentObj,HWND pWnd); - void DeleteAccChildNode(AccObject* pChild); + static void DeleteAccListener( AccObject* pAccObj ); + static void InsertAccChildNode(AccObject* pCurObj,AccObject* pParentObj,HWND pWnd); + static void DeleteAccChildNode(AccObject* pChild); void DeleteFromHwndXAcc(css::accessibility::XAccessible* pXAcc ); int UpdateAccSelection(css::accessibility::XAccessible* pXAcc); @@ -98,12 +98,12 @@ private: css::accessibility::XAccessible* pXAcc); public: virtual ~AccObjectWinManager(); - sal_Bool InsertAccObj( css::accessibility::XAccessible* pXAcc,css::accessibility::XAccessible* pParentXAcc,HWND pWnd); - sal_Bool InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc,HWND pWnd=0); + bool InsertAccObj( css::accessibility::XAccessible* pXAcc,css::accessibility::XAccessible* pParentXAcc,HWND pWnd); + bool InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc,HWND pWnd=nullptr); void DeleteAccObj( css::accessibility::XAccessible* pXAcc ); void DeleteChildrenAccObj(css::accessibility::XAccessible* pAccObj); - sal_Bool NotifyAccEvent( css::accessibility::XAccessible* pXAcc,short state = 0 ); + bool NotifyAccEvent( css::accessibility::XAccessible* pXAcc,short state = 0 ); LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam); @@ -127,7 +127,7 @@ public: void UpdateAccFocus( css::accessibility::XAccessible* newFocus ); void UpdateAction( css::accessibility::XAccessible* pXAcc ); - sal_Bool IsContainer( css::accessibility::XAccessible* pAccessible ); + static bool IsContainer( css::accessibility::XAccessible* pAccessible ); IMAccessible* GetIMAccByXAcc( css::accessibility::XAccessible* pXAcc ); IMAccessible* GetIAccessibleFromResID(long resID); @@ -142,12 +142,12 @@ public: bool IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc); - short GetRole(css::accessibility::XAccessible* pXAcc); + static short GetRole(css::accessibility::XAccessible* pXAcc); css::accessibility::XAccessible* GetAccDocByAccTopWin( css::accessibility::XAccessible* pXAcc ); bool IsTopWinAcc( css::accessibility::XAccessible* pXAcc ); - bool IsStateManageDescendant(css::accessibility::XAccessible* pAccessible); + static bool IsStateManageDescendant(css::accessibility::XAccessible* pAccessible); }; #endif // INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx index aecdacfeb128..55b6618f4f6d 100644 --- a/winaccessibility/inc/AccParagraphEventListener.hxx +++ b/winaccessibility/inc/AccParagraphEventListener.hxx @@ -36,7 +36,7 @@ class AccParagraphEventListener: public AccContainerEventListener { public: AccParagraphEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccParagraphEventListener(); + virtual ~AccParagraphEventListener() override; //AccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx index 958d7e06ab31..1fd2bb4b5a73 100644 --- a/winaccessibility/inc/AccTableEventListener.hxx +++ b/winaccessibility/inc/AccTableEventListener.hxx @@ -36,10 +36,10 @@ class AccTableEventListener: public AccDescendantManagerEventListener { public: AccTableEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccTableEventListener(); + virtual ~AccTableEventListener() override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for active descendant changed event virtual void HandleActiveDescendantChangedEvent( diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx index 6ca166b0644a..4032415e5b2a 100644 --- a/winaccessibility/inc/AccTextComponentEventListener.hxx +++ b/winaccessibility/inc/AccTextComponentEventListener.hxx @@ -36,7 +36,7 @@ class AccTextComponentEventListener: public AccComponentEventListener { public: AccTextComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccTextComponentEventListener(); + virtual ~AccTextComponentEventListener() override; virtual void SetComponentState(short state, bool enable) override; diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx index b11be4a81c23..4281dbeba72a 100644 --- a/winaccessibility/inc/AccTopWindowListener.hxx +++ b/winaccessibility/inc/AccTopWindowListener.hxx @@ -42,19 +42,19 @@ private: AccObjectManagerAgent accManagerAgent; public: AccTopWindowListener(); - virtual ~AccTopWindowListener(); + virtual ~AccTopWindowListener() override; // XTopWindowListener - virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException); - virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException); - virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException); - virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException); - virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException); - virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException); - virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException); + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override; virtual void AddAllListeners(css::accessibility::XAccessible* pAccessible,css::accessibility::XAccessible* pParentXAcc,HWND pWND ); //for On-Demand load. diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx index d1f86334d8e5..4455933cc1fc 100644 --- a/winaccessibility/inc/AccTreeEventListener.hxx +++ b/winaccessibility/inc/AccTreeEventListener.hxx @@ -36,10 +36,10 @@ class AccTreeEventListener: public AccDescendantManagerEventListener { public: AccTreeEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccTreeEventListener(); + virtual ~AccTreeEventListener() override; // XAccessibleEventListener - virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; //for active descendant changed event virtual void HandleActiveDescendantChangedEvent( diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx index 9c01afa5859c..e6d4582d56e1 100644 --- a/winaccessibility/inc/AccWindowEventListener.hxx +++ b/winaccessibility/inc/AccWindowEventListener.hxx @@ -36,7 +36,7 @@ class AccWindowEventListener: public AccEventListener { public: AccWindowEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); - virtual ~AccWindowEventListener(); + virtual ~AccWindowEventListener() override; // XAccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override; |