From f8854116e1c3bbe971dcb754f7db501d5302b651 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 14 Oct 2016 16:43:38 +0200 Subject: clang-cl loplugin: winaccessibility Change-Id: I40f8a6fef9d66b28a1d72551a6873b041b38b09d Reviewed-on: https://gerrit.libreoffice.org/29840 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- winaccessibility/inc/AccComponentEventListener.hxx | 2 +- winaccessibility/inc/AccContainerEventListener.hxx | 4 +- .../inc/AccDescendantManagerEventListener.hxx | 4 +- winaccessibility/inc/AccDialogEventListener.hxx | 2 +- winaccessibility/inc/AccEventListener.hxx | 2 +- winaccessibility/inc/AccFrameEventListener.hxx | 2 +- winaccessibility/inc/AccListEventListener.hxx | 2 +- winaccessibility/inc/AccMenuEventListener.hxx | 2 +- winaccessibility/inc/AccObject.hxx | 10 +- .../inc/AccObjectContainerEventListener.hxx | 2 +- winaccessibility/inc/AccObjectManagerAgent.hxx | 4 +- winaccessibility/inc/AccObjectWinManager.hxx | 20 +- winaccessibility/inc/AccParagraphEventListener.hxx | 2 +- winaccessibility/inc/AccTableEventListener.hxx | 4 +- .../inc/AccTextComponentEventListener.hxx | 2 +- winaccessibility/inc/AccTopWindowListener.hxx | 18 +- winaccessibility/inc/AccTreeEventListener.hxx | 4 +- winaccessibility/inc/AccWindowEventListener.hxx | 2 +- winaccessibility/source/UAccCOM/AccAction.cxx | 10 - winaccessibility/source/UAccCOM/AccAction.h | 32 +- winaccessibility/source/UAccCOM/AccActionBase.cxx | 69 +---- winaccessibility/source/UAccCOM/AccActionBase.h | 2 +- winaccessibility/source/UAccCOM/AccComponent.cxx | 11 - winaccessibility/source/UAccCOM/AccComponent.h | 25 +- .../source/UAccCOM/AccComponentBase.cxx | 14 +- winaccessibility/source/UAccCOM/AccComponentBase.h | 2 +- .../source/UAccCOM/AccEditableText.cxx | 12 +- winaccessibility/source/UAccCOM/AccEditableText.h | 31 +- winaccessibility/source/UAccCOM/AccHyperLink.cxx | 14 +- winaccessibility/source/UAccCOM/AccHyperLink.h | 39 ++- winaccessibility/source/UAccCOM/AccHypertext.cxx | 29 +- winaccessibility/source/UAccCOM/AccHypertext.h | 64 ++-- winaccessibility/source/UAccCOM/AccImage.cxx | 8 +- winaccessibility/source/UAccCOM/AccImage.h | 21 +- winaccessibility/source/UAccCOM/AccRelation.cxx | 20 +- winaccessibility/source/UAccCOM/AccRelation.h | 19 +- winaccessibility/source/UAccCOM/AccTable.cxx | 94 +++--- winaccessibility/source/UAccCOM/AccTable.h | 73 +++-- winaccessibility/source/UAccCOM/AccText.cxx | 22 -- winaccessibility/source/UAccCOM/AccText.h | 60 ++-- winaccessibility/source/UAccCOM/AccTextBase.cxx | 76 ++--- winaccessibility/source/UAccCOM/AccTextBase.h | 2 +- winaccessibility/source/UAccCOM/AccValue.cxx | 20 +- winaccessibility/source/UAccCOM/AccValue.h | 23 +- .../source/UAccCOM/AccessibleKeyStroke.h | 4 +- winaccessibility/source/UAccCOM/EnumVariant.cxx | 30 +- winaccessibility/source/UAccCOM/EnumVariant.h | 23 +- winaccessibility/source/UAccCOM/MAccessible.cxx | 331 +++++++++------------ winaccessibility/source/UAccCOM/MAccessible.h | 143 ++++----- winaccessibility/source/UAccCOM/UAccCOM.cxx | 4 +- winaccessibility/source/UAccCOM/UNOXWrapper.h | 4 +- winaccessibility/source/UAccCOM/acccommon.h | 18 +- winaccessibility/source/UAccCOM/stdafx.h | 4 +- .../source/service/AccContainerEventListener.cxx | 6 +- .../source/service/AccEventListener.cxx | 2 +- winaccessibility/source/service/AccObject.cxx | 94 +++--- .../source/service/AccObjectManagerAgent.cxx | 16 +- .../source/service/AccObjectWinManager.cxx | 156 +++++----- .../source/service/AccParagraphEventListener.cxx | 2 +- winaccessibility/source/service/AccResource.cxx | 2 +- .../source/service/AccTopWindowListener.cxx | 20 +- .../source/service/msaaservice_impl.cxx | 22 +- 62 files changed, 836 insertions(+), 925 deletions(-) (limited to 'winaccessibility') 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 xContext); + virtual bool IsEditable(css::uno::Reference 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; diff --git a/winaccessibility/source/UAccCOM/AccAction.cxx b/winaccessibility/source/UAccCOM/AccAction.cxx index 06cfa3b0176b..2a7e2b887d89 100644 --- a/winaccessibility/source/UAccCOM/AccAction.cxx +++ b/winaccessibility/source/UAccCOM/AccAction.cxx @@ -101,16 +101,6 @@ STDMETHODIMP CAccAction::get_keyBinding( return CAccActionBase::get_keyBinding(actionIndex, nMaxBinding, keyBinding, nBinding); } -/** - * Override of IUNOXWrapper. - * - * @param pXInterface the pointer of UNO interface. - */ -STDMETHODIMP CAccAction::put_XInterface(hyper pXInterface) -{ - - return CAccActionBase::put_XInterface(pXInterface); -} /** * Put UNO interface. * @param pXSubInterface XAccessibleHyperlink interface. diff --git a/winaccessibility/source/UAccCOM/AccAction.h b/winaccessibility/source/UAccCOM/AccAction.h index 2bbd0d26aa59..e3dba2bd35c7 100644 --- a/winaccessibility/source/UAccCOM/AccAction.h +++ b/winaccessibility/source/UAccCOM/AccAction.h @@ -37,7 +37,7 @@ public: { } - ~CAccAction() + ~CAccAction() override { } @@ -47,13 +47,20 @@ public: BEGIN_COM_MAP(CAccAction) COM_INTERFACE_ENTRY(IAccessibleAction) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccAction*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -68,20 +75,20 @@ public: // IAccessibleAction // Returns the number of action. - STDMETHOD(nActions)(/*[out,retval]*/long* nActions); + STDMETHOD(nActions)(/*[out,retval]*/long* nActions) override; // Performs specified action on the object. - STDMETHOD(doAction)(/* [in] */ long actionIndex); + STDMETHOD(doAction)(/* [in] */ long actionIndex) override; // Gets description of specified action. - STDMETHOD(get_description)(long actionIndex,BSTR __RPC_FAR *description); + STDMETHOD(get_description)(long actionIndex,BSTR __RPC_FAR *description) override; // added , 2006/06/28, for driver 07/11 // get the action name - STDMETHOD(get_name)( long actionIndex, BSTR __RPC_FAR *name); + STDMETHOD(get_name)( long actionIndex, BSTR __RPC_FAR *name) override; // get the localized action name - STDMETHOD(get_localizedName)( long actionIndex, BSTR __RPC_FAR *localizedName); + STDMETHOD(get_localizedName)( long actionIndex, BSTR __RPC_FAR *localizedName) override; // Returns key binding object (if any) associated with specified action // key binding is string. @@ -90,13 +97,10 @@ public: /* [in] */ long actionIndex, /* [in] */ long nMaxBinding, /* [length_is][length_is][size_is][size_is][out] */ BSTR __RPC_FAR *__RPC_FAR *keyBinding, - /* [retval][out] */ long __RPC_FAR *nBinding); + /* [retval][out] */ long __RPC_FAR *nBinding) override; // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); - - // Override of IUNOXWrapper. - STDMETHOD(put_XSubInterface)(hyper pXSubInterface); + STDMETHOD(put_XSubInterface)(hyper pXSubInterface) override; }; diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx index 0ad4db09c867..485dc6b5da84 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.cxx +++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx @@ -49,57 +49,6 @@ CAccActionBase::CAccActionBase() CAccActionBase::~CAccActionBase() {} -/** - * Helper function used for getting default action by UNO role. - * - * @param pRContext UNO context interface pointer. - * @param pRet the corresponding string to be returned. - */ -void GetDfActionByUNORole(XAccessibleContext* pRContext, BSTR* pRet) -{ - // #CHECK# - if(pRContext == NULL || pRet == NULL) - { - return; - } - - long Role = pRContext->getAccessibleRole(); - - switch(Role) - { - case PUSH_BUTTON: - *pRet = ::SysAllocString(PRESS_STR); - break; - case RADIO_BUTTON: - case MENU_ITEM: - case LIST_ITEM: - *pRet = ::SysAllocString(SELECT_STR); - break; - case CHECK_BOX: - { - Reference< XAccessibleStateSet > pRState = pRContext->getAccessibleStateSet(); - if( !pRState.is() ) - { - return; - } - - Sequence pStates = pRState->getStates(); - int count = pStates.getLength(); - *pRet = ::SysAllocString(CHECK_STR); - for( int iIndex = 0;iIndex < count;iIndex++ ) - { - if( pStates[iIndex] == AccessibleStateType::CHECKED ) - { - SAFE_SYSFREESTRING(*pRet); - *pRet = ::SysAllocString(UNCHECK_STR); - break; - } - } - break; - } - } -} - /** * Returns the number of action. * @@ -112,7 +61,7 @@ STDMETHODIMP CAccActionBase::nActions(/*[out,retval]*/long* nActions) ENTER_PROTECTED_BLOCK // #CHECK# - if( pRXAct.is() && nActions != NULL ) + if( pRXAct.is() && nActions != nullptr ) { *nActions = GetXInterface()->getAccessibleActionCount(); return S_OK; @@ -157,7 +106,7 @@ STDMETHODIMP CAccActionBase::get_description(long actionIndex,BSTR __RPC_FAR *de ENTER_PROTECTED_BLOCK // #CHECK# - if(description == NULL) + if(description == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -168,7 +117,7 @@ STDMETHODIMP CAccActionBase::get_description(long actionIndex,BSTR __RPC_FAR *de // #CHECK# SAFE_SYSFREESTRING(*description); - *description = SysAllocString((OLECHAR*)ouStr.getStr()); + *description = SysAllocString(ouStr.getStr()); return S_OK; @@ -219,10 +168,10 @@ STDMETHODIMP CAccActionBase::get_keyBinding( OLECHAR wString[64]; - *keyBinding = (BSTR*)::CoTaskMemAlloc(nCount*sizeof(BSTR)); + *keyBinding = static_cast(::CoTaskMemAlloc(nCount*sizeof(BSTR))); // #CHECK Memory Allocation# - if(*keyBinding == NULL) + if(*keyBinding == nullptr) return E_FAIL; for( int index = 0;index < nCount;index++ ) @@ -253,7 +202,7 @@ STDMETHODIMP CAccActionBase::put_XInterface(hyper pXInterface) CUNOXWrapper::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); if( !pRContext.is() ) @@ -261,7 +210,7 @@ STDMETHODIMP CAccActionBase::put_XInterface(hyper pXInterface) Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pRXAct = NULL; + pRXAct = nullptr; else pRXAct = pRXI.get(); return S_OK; @@ -278,7 +227,7 @@ STDMETHODIMP CAccActionBase::put_XInterface(hyper pXInterface) void CAccActionBase::GetkeyBindingStrByXkeyBinding( const Sequence< KeyStroke > &keySet, OLECHAR* pString ) { // #CHECK# - if(pString == NULL) + if(pString == nullptr) return; for( int iIndex = 0;iIndex < keySet.getLength();iIndex++ ) @@ -381,7 +330,7 @@ OLECHAR const * CAccActionBase::getOLECHARFromKeyCode(long key) } else { - return NULL; + return nullptr; } } diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h index 8e58eb79c6d4..204edf58bce5 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.h +++ b/winaccessibility/source/UAccCOM/AccActionBase.h @@ -62,7 +62,7 @@ public: /* [retval][out] */ long __RPC_FAR *nBinding); // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; static void GetkeyBindingStrByXkeyBinding( const css::uno::Sequence< css::awt::KeyStroke > &keySet, OLECHAR* pString ); diff --git a/winaccessibility/source/UAccCOM/AccComponent.cxx b/winaccessibility/source/UAccCOM/AccComponent.cxx index 140388157266..340a222d65cd 100644 --- a/winaccessibility/source/UAccCOM/AccComponent.cxx +++ b/winaccessibility/source/UAccCOM/AccComponent.cxx @@ -66,15 +66,4 @@ STDMETHODIMP CAccComponent::get_background(IA2Color * background) return CAccComponentBase::get_background(background); } -/** - * Override of IUNOXWrapper. - * - * @param pXInterface the pointer of UNO interface. - */ -STDMETHODIMP CAccComponent::put_XInterface(hyper pXInterface) -{ - - return CAccComponentBase::put_XInterface(pXInterface); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccComponent.h b/winaccessibility/source/UAccCOM/AccComponent.h index d73d7dc3ec8e..202baed03c58 100644 --- a/winaccessibility/source/UAccCOM/AccComponent.h +++ b/winaccessibility/source/UAccCOM/AccComponent.h @@ -42,20 +42,27 @@ public: CAccComponent() { } - ~CAccComponent() + ~CAccComponent() override { } BEGIN_COM_MAP(CAccComponent) COM_INTERFACE_ENTRY(IAccessibleComponent) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccComponent*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -72,17 +79,13 @@ public: // Returns the location of the upper left corner of the object's bounding // box relative to the parent. - STDMETHOD(get_locationInParent)(long *x, long *y); + STDMETHOD(get_locationInParent)(long *x, long *y) override; // Returns the foreground color of this object. - STDMETHOD(get_foreground)(IA2Color * foreground); + STDMETHOD(get_foreground)(IA2Color * foreground) override; // Returns the background color of this object. - STDMETHOD(get_background)(IA2Color * background); - - // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); - + STDMETHOD(get_background)(IA2Color * background) override; }; #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENT_H diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.cxx b/winaccessibility/source/UAccCOM/AccComponentBase.cxx index b6f87ed2f787..68f800f2c20d 100644 --- a/winaccessibility/source/UAccCOM/AccComponentBase.cxx +++ b/winaccessibility/source/UAccCOM/AccComponentBase.cxx @@ -50,7 +50,7 @@ STDMETHODIMP CAccComponentBase::get_locationInParent(long *x, long *y) try { - if (x == NULL || y == NULL) + if (x == nullptr || y == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXComp.is()) @@ -80,7 +80,7 @@ STDMETHODIMP CAccComponentBase::get_locationOnScreen(long *x, long *y) try { - if (x == NULL || y == NULL) + if (x == nullptr || y == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXComp.is()) @@ -109,7 +109,7 @@ STDMETHODIMP CAccComponentBase::grabFocus(boolean * success) ENTER_PROTECTED_BLOCK - if (success == NULL) + if (success == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXComp.is()) @@ -135,7 +135,7 @@ STDMETHODIMP CAccComponentBase::get_foreground(IA2Color * foreground) ENTER_PROTECTED_BLOCK - if (foreground == NULL) + if (foreground == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXComp.is()) @@ -160,7 +160,7 @@ STDMETHODIMP CAccComponentBase::get_background(IA2Color * background) ENTER_PROTECTED_BLOCK - if (background == NULL) + if (background == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXComp.is()) @@ -187,7 +187,7 @@ STDMETHODIMP CAccComponentBase::put_XInterface(hyper pXInterface) CUNOXWrapper::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); if( !pRContext.is() ) @@ -196,7 +196,7 @@ STDMETHODIMP CAccComponentBase::put_XInterface(hyper pXInterface) } Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pRXComp = NULL; + pRXComp = nullptr; else pRXComp = pRXI.get(); diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h b/winaccessibility/source/UAccCOM/AccComponentBase.h index d49ebc0c3e7b..bfc368ab8998 100644 --- a/winaccessibility/source/UAccCOM/AccComponentBase.h +++ b/winaccessibility/source/UAccCOM/AccComponentBase.h @@ -53,7 +53,7 @@ public: STDMETHOD(get_background)(IA2Color * background); // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; protected: diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx index dc9078fe1d28..28923b01436f 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.cxx +++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx @@ -113,7 +113,7 @@ STDMETHODIMP CAccEditableText::insertText(long offset, BSTR * text) ENTER_PROTECTED_BLOCK - if (text == NULL) + if (text == nullptr) return E_INVALIDARG; if( !pRXEdtTxt.is() ) @@ -191,7 +191,7 @@ STDMETHODIMP CAccEditableText::replaceText(long startOffset, long endOffset, BST ENTER_PROTECTED_BLOCK // #CHECK# - if (text == NULL) + if (text == nullptr) return E_INVALIDARG; if( !pRXEdtTxt.is() ) return E_FAIL; @@ -220,7 +220,7 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B ENTER_PROTECTED_BLOCK // #CHECK# - if (attributes == NULL) + if (attributes == nullptr) return E_INVALIDARG; if( !pRXEdtTxt.is() ) return E_FAIL; @@ -238,7 +238,7 @@ STDMETHODIMP CAccEditableText::setAttributes(long startOffset, long endOffset, B while(nIndex >= 0); Sequence< PropertyValue > beanSeq(vecAttr.size()); - for(unsigned int i = 0; i < vecAttr.size(); i ++) + for(std::vector::size_type i = 0; i < vecAttr.size(); i ++) { ::rtl::OUString attr = vecAttr[i]; sal_Int32 nPos = attr.indexOf(':'); @@ -489,7 +489,7 @@ STDMETHODIMP CAccEditableText::put_XInterface(hyper pXInterface) CUNOXWrapper::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); if( !pRContext.is() ) @@ -498,7 +498,7 @@ STDMETHODIMP CAccEditableText::put_XInterface(hyper pXInterface) } Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pRXEdtTxt = NULL; + pRXEdtTxt = nullptr; else pRXEdtTxt = pRXI.get(); return S_OK; diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h index 0b9acad30c6e..cea68337a737 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.h +++ b/winaccessibility/source/UAccCOM/AccEditableText.h @@ -47,13 +47,20 @@ public: BEGIN_COM_MAP(CAccEditableText) COM_INTERFACE_ENTRY(IAccessibleEditableText) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccEditableText*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -69,35 +76,35 @@ public: // IAccessibleEditableText // Copies a range of text to the clipboard. - STDMETHOD(copyText)(long startOffset, long endOffset); + STDMETHOD(copyText)(long startOffset, long endOffset) override; // Deletes a range of text. - STDMETHOD(deleteText)(long startOffset, long endOffset); + STDMETHOD(deleteText)(long startOffset, long endOffset) override; // Inserts text at a specified offset. - STDMETHOD(insertText)(long offset, BSTR * text); + STDMETHOD(insertText)(long offset, BSTR * text) override; // Cuts a range of text to the clipboard. - STDMETHOD(cutText)(long startOffset, long endOffset); + STDMETHOD(cutText)(long startOffset, long endOffset) override; // Pastes text from clipboard at specified offset. - STDMETHOD(pasteText)(long offset); + STDMETHOD(pasteText)(long offset) override; // Replaces range of text with new text. - STDMETHOD(replaceText)(long startOffset, long endOffset, BSTR * text); + STDMETHOD(replaceText)(long startOffset, long endOffset, BSTR * text) override; // Sets attributes of range of text. - STDMETHOD(setAttributes)(long startOffset, long endOffset, BSTR * attributes); + STDMETHOD(setAttributes)(long startOffset, long endOffset, BSTR * attributes) override; // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; private: css::uno::Reference pRXEdtTxt; - void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, css::uno::Any &rAny); + static void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, css::uno::Any &rAny); inline css::accessibility::XAccessibleEditableText* GetXInterface() { diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cxx b/winaccessibility/source/UAccCOM/AccHyperLink.cxx index bb3058d0d9df..44ca545b3d58 100644 --- a/winaccessibility/source/UAccCOM/AccHyperLink.cxx +++ b/winaccessibility/source/UAccCOM/AccHyperLink.cxx @@ -118,7 +118,7 @@ STDMETHODIMP CAccHyperLink::get_anchor(/* [in] */ long index, ENTER_PROTECTED_BLOCK // #CHECK# - if(anchor == NULL) + if(anchor == nullptr) { return E_INVALIDARG; } @@ -150,7 +150,7 @@ STDMETHODIMP CAccHyperLink::get_anchorTarget(/* [in] */ long index, ENTER_PROTECTED_BLOCK // #CHECK# - if(anchorTarget == NULL) + if(anchorTarget == nullptr) { return E_INVALIDARG; } @@ -182,7 +182,7 @@ STDMETHODIMP CAccHyperLink::get_startIndex(/* [retval][out] */ long __RPC_FAR *i ENTER_PROTECTED_BLOCK // #CHECK# - if(index == NULL) + if(index == nullptr) { return E_INVALIDARG; } @@ -205,7 +205,7 @@ STDMETHODIMP CAccHyperLink::get_endIndex(/* [retval][out] */ long __RPC_FAR *ind ENTER_PROTECTED_BLOCK // #CHECK# - if(index == NULL) + if(index == nullptr) { return E_INVALIDARG; } @@ -233,7 +233,7 @@ STDMETHODIMP CAccHyperLink::get_valid(/* [retval][out] */ boolean __RPC_FAR *val ENTER_PROTECTED_BLOCK // #CHECK# - if(valid == NULL) + if(valid == nullptr) { return E_INVALIDARG; } @@ -262,7 +262,7 @@ STDMETHODIMP CAccHyperLink::put_XInterface(hyper pXInterface) CAccActionBase::put_XInterface(pXInterface); //special query. - if(pUNOInterface != NULL) + if(pUNOInterface != nullptr) { Reference pRContext = pUNOInterface->getAccessibleContext(); if( !pRContext.is() ) @@ -272,7 +272,7 @@ STDMETHODIMP CAccHyperLink::put_XInterface(hyper pXInterface) Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) { - pRXLink = NULL; + pRXLink = nullptr; } else pRXLink = pRXI.get(); diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.h b/winaccessibility/source/UAccCOM/AccHyperLink.h index f5e0a72dd2a9..4602240a3ff0 100644 --- a/winaccessibility/source/UAccCOM/AccHyperLink.h +++ b/winaccessibility/source/UAccCOM/AccHyperLink.h @@ -39,7 +39,7 @@ public: CAccHyperLink() { } - ~CAccHyperLink() + ~CAccHyperLink() override { } @@ -47,14 +47,21 @@ public: COM_INTERFACE_ENTRY(IAccessibleAction) COM_INTERFACE_ENTRY(IAccessibleHyperlink) COM_INTERFACE_ENTRY(IUNOXWrapper) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif DECLARE_NO_REGISTRY() - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccHyperLink*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -69,19 +76,19 @@ public: // IAccessibleAction // Returns the number of action. - STDMETHOD(nActions)(/*[out,retval]*/long* nActions); + STDMETHOD(nActions)(/*[out,retval]*/long* nActions) override; // Performs specified action on the object. - STDMETHOD(doAction)(/* [in] */ long actionIndex); + STDMETHOD(doAction)(/* [in] */ long actionIndex) override; // get the action name - STDMETHOD(get_name)( long actionIndex, BSTR __RPC_FAR *name); + STDMETHOD(get_name)( long actionIndex, BSTR __RPC_FAR *name) override; // get the localized action name - STDMETHOD(get_localizedName)( long actionIndex, BSTR __RPC_FAR *localizedName); + STDMETHOD(get_localizedName)( long actionIndex, BSTR __RPC_FAR *localizedName) override; // Gets description of specified action. - STDMETHOD(get_description)(long actionIndex,BSTR __RPC_FAR *description); + STDMETHOD(get_description)(long actionIndex,BSTR __RPC_FAR *description) override; // Returns key binding object (if any) associated with specified action // key binding is string. @@ -90,34 +97,34 @@ public: /* [in] */ long actionIndex, /* [in] */ long nMaxBinding, /* [length_is][length_is][size_is][size_is][out] */ BSTR __RPC_FAR *__RPC_FAR *keyBinding, - /* [retval][out] */ long __RPC_FAR *nBinding); + /* [retval][out] */ long __RPC_FAR *nBinding) override; // IAccessibleHyperlink // get an object, e.g. BSTR or image object, that is overloaded with link behavior STDMETHOD(get_anchor)(/* [in] */ long index, - /* [retval][out] */ VARIANT __RPC_FAR *anchor); + /* [retval][out] */ VARIANT __RPC_FAR *anchor) override; // get an object representing the target of the link, usually a BSTR of the URI STDMETHOD(get_anchorTarget)(/* [in] */ long index, - /* [retval][out] */ VARIANT __RPC_FAR *anchorTarget); + /* [retval][out] */ VARIANT __RPC_FAR *anchorTarget) override; // Returns the index at which the textual representation of the // hyperlink (group) starts. - STDMETHOD(get_startIndex)(/* [retval][out] */ long __RPC_FAR *index); + STDMETHOD(get_startIndex)(/* [retval][out] */ long __RPC_FAR *index) override; // Returns the index at which the textual representation of the // hyperlink (group) ends. - STDMETHOD(get_endIndex)(/* [retval][out] */ long __RPC_FAR *index); + STDMETHOD(get_endIndex)(/* [retval][out] */ long __RPC_FAR *index) override; // Returns whether the document referenced by this links is still valid. - STDMETHOD(get_valid)(/* [retval][out] */ boolean __RPC_FAR *valid); + STDMETHOD(get_valid)(/* [retval][out] */ boolean __RPC_FAR *valid) override; // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; // Override of IUNOXWrapper. - STDMETHOD(put_XSubInterface)(hyper pXSubInterface); + STDMETHOD(put_XSubInterface)(hyper pXSubInterface) override; private: diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx b/winaccessibility/source/UAccCOM/AccHypertext.cxx index c690184f3da1..d2b8ec632199 100644 --- a/winaccessibility/source/UAccCOM/AccHypertext.cxx +++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx @@ -77,17 +77,6 @@ STDMETHODIMP CAccHypertext::get_caretOffset(long * offset) return CAccTextBase::get_caretOffset(offset); } -/** - * Get character count. - * @param nCharacters Variant to accept character count. - * @return Result. -*/ -STDMETHODIMP CAccHypertext::get_characterCount(long * nCharacters) -{ - - return CAccTextBase::get_characterCount(nCharacters); -} - /** * Get character extents. * @param offset Offset. @@ -290,7 +279,7 @@ STDMETHODIMP CAccHypertext::get_nHyperlinks(long *hyperlinkCount) ENTER_PROTECTED_BLOCK // #CHECK# - if(hyperlinkCount == NULL) + if(hyperlinkCount == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pHyperText.is()) @@ -317,7 +306,7 @@ STDMETHODIMP CAccHypertext::get_hyperlink(long index,IAccessibleHyperlink **hype ENTER_PROTECTED_BLOCK // #CHECK# - if(hyperlink == NULL) + if(hyperlink == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pHyperText.is()) @@ -328,16 +317,16 @@ STDMETHODIMP CAccHypertext::get_hyperlink(long index,IAccessibleHyperlink **hype Reference pRLink = pHyperText->getHyperLink(index); if(!pRLink.is()) { - *hyperlink = NULL; + *hyperlink = nullptr; return E_FAIL; } - IAccessibleHyperlink* plink = NULL; + IAccessibleHyperlink* plink = nullptr; HRESULT hr = createInstance(IID_IAccessibleHyperlink, &plink); if( SUCCEEDED(hr) ) { - IUNOXWrapper* wrapper = NULL; - plink->QueryInterface(IID_IUNOXWrapper, (void**)&wrapper); + IUNOXWrapper* wrapper = nullptr; + plink->QueryInterface(IID_IUNOXWrapper, reinterpret_cast(&wrapper)); if(wrapper) { wrapper->put_XSubInterface(reinterpret_cast(pRLink.get())); @@ -365,7 +354,7 @@ STDMETHODIMP CAccHypertext::get_hyperlinkIndex(long charIndex, long *hyperlinkIn ENTER_PROTECTED_BLOCK // #CHECK# - if(hyperlinkIndex == NULL) + if(hyperlinkIndex == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pHyperText.is()) @@ -392,7 +381,7 @@ STDMETHODIMP CAccHypertext::put_XInterface(hyper pXInterface) CAccTextBase::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); if( !pRContext.is() ) @@ -401,7 +390,7 @@ STDMETHODIMP CAccHypertext::put_XInterface(hyper pXInterface) } Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pHyperText = NULL; + pHyperText = nullptr; else pHyperText = pRXI.get(); return S_OK; diff --git a/winaccessibility/source/UAccCOM/AccHypertext.h b/winaccessibility/source/UAccCOM/AccHypertext.h index c06cfac981a6..40c629657a7f 100644 --- a/winaccessibility/source/UAccCOM/AccHypertext.h +++ b/winaccessibility/source/UAccCOM/AccHypertext.h @@ -39,7 +39,7 @@ public: CAccHypertext() { } - ~CAccHypertext() + ~CAccHypertext() override { } @@ -47,13 +47,20 @@ public: COM_INTERFACE_ENTRY(IAccessibleText) COM_INTERFACE_ENTRY(IAccessibleHypertext) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccHypertext*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -69,80 +76,77 @@ public: // IAccessibleText // Adds a text selection. - STDMETHOD(addSelection)(long startOffset, long endOffset);//, unsigned char * success) + STDMETHOD(addSelection)(long startOffset, long endOffset) override;//, unsigned char * success) // Gets text attributes. - STDMETHOD(get_attributes)(long offset, long * startOffset, long * endOffset, BSTR * textAttributes); + STDMETHOD(get_attributes)(long offset, long * startOffset, long * endOffset, BSTR * textAttributes) override; // Gets caret offset. - STDMETHOD(get_caretOffset)(long * offset); - - // Gets total number of characters. - STDMETHOD(get_characterCount)(long * nCharacters); + STDMETHOD(get_caretOffset)(long * offset) override; // Gets bounding rect containing the glyph(s) representing the character // at the specified text offset - STDMETHOD(get_characterExtents)(long offset, IA2CoordinateType coordType, long * x, long * y, long * width, long * height); + STDMETHOD(get_characterExtents)(long offset, IA2CoordinateType coordType, long * x, long * y, long * width, long * height) override; // Gets number of active non-contiguous selections. - STDMETHOD(get_nSelections)(long * nSelections); + STDMETHOD(get_nSelections)(long * nSelections) override; // Gets bounding rect for the glyph at a certain point. - STDMETHOD(get_offsetAtPoint)(long x, long y, IA2CoordinateType coordType, long * offset); + STDMETHOD(get_offsetAtPoint)(long x, long y, IA2CoordinateType coordType, long * offset) override; // Gets character offsets of N-th active text selection. - STDMETHOD(get_selection)(long selection, long * startOffset, long * endOffset); + STDMETHOD(get_selection)(long selection, long * startOffset, long * endOffset) override; // Gets a range of text by offset NOTE: returned string may be longer // than endOffset-startOffset bytes if text contains multi-byte characters. - STDMETHOD(get_text)(long startOffset, long endOffset, BSTR * text); + STDMETHOD(get_text)(long startOffset, long endOffset, BSTR * text) override; // Gets a specified amount of text that ends before a specified offset. - STDMETHOD(get_textBeforeOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text); + STDMETHOD(get_textBeforeOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text) override; // Gets a specified amount of text that spans the specified offset. - STDMETHOD(get_textAfterOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text); + STDMETHOD(get_textAfterOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text) override; // Gets a specified amount of text that starts after a specified offset. - STDMETHOD(get_textAtOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text); + STDMETHOD(get_textAtOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text) override; // Unselects a range of text. - STDMETHOD(removeSelection)(long selectionIndex); + STDMETHOD(removeSelection)(long selectionIndex) override; // Moves text caret. - STDMETHOD(setCaretOffset)(long offset); + STDMETHOD(setCaretOffset)(long offset) override; // Changes the bounds of an existing selection. - STDMETHOD(setSelection)(long selectionIndex, long startOffset, long endOffset); + STDMETHOD(setSelection)(long selectionIndex, long startOffset, long endOffset) override; // Gets total number of characters. // NOTE: this may be different than the total number of bytes required // to store the text, if the text contains multi-byte characters. - STDMETHOD(get_nCharacters)(long * nCharacters); + STDMETHOD(get_nCharacters)(long * nCharacters) override; // Makes specific part of string visible on screen. - STDMETHOD(scrollSubstringTo)(long startIndex, long endIndex,enum IA2ScrollType scrollType); + STDMETHOD(scrollSubstringTo)(long startIndex, long endIndex,enum IA2ScrollType scrollType) override; - STDMETHOD(scrollSubstringToPoint)(long startIndex, long endIndex,enum IA2CoordinateType coordinateType, long x, long y ); + STDMETHOD(scrollSubstringToPoint)(long startIndex, long endIndex,enum IA2CoordinateType coordinateType, long x, long y ) override; - STDMETHOD(get_newText)( IA2TextSegment *newText); + STDMETHOD(get_newText)( IA2TextSegment *newText) override; - STDMETHOD(get_oldText)( IA2TextSegment *oldText); + STDMETHOD(get_oldText)( IA2TextSegment *oldText) override; //IAccessibleHypertext // Gets the number of hyperlink. - STDMETHOD(get_nHyperlinks)(long *hyperlinkCount); + STDMETHOD(get_nHyperlinks)(long *hyperlinkCount) override; // Gets the hyperlink object via specified index. - STDMETHOD(get_hyperlink)(long index,IAccessibleHyperlink **hyperlink); + STDMETHOD(get_hyperlink)(long index,IAccessibleHyperlink **hyperlink) override; // Returns the index of the hyperlink that is associated with this // character index. - STDMETHOD(get_hyperlinkIndex)(long charIndex, long *hyperlinkIndex); + STDMETHOD(get_hyperlinkIndex)(long charIndex, long *hyperlinkIndex) override; // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; private: diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx b/winaccessibility/source/UAccCOM/AccImage.cxx index b4854f0d5c78..b089dece8b14 100644 --- a/winaccessibility/source/UAccCOM/AccImage.cxx +++ b/winaccessibility/source/UAccCOM/AccImage.cxx @@ -49,14 +49,14 @@ STDMETHODIMP CAccImage::get_description(BSTR * description) ENTER_PROTECTED_BLOCK // #CHECK# - if (description == NULL) + if (description == nullptr) return E_INVALIDARG; if( !pRXImg.is() ) return E_FAIL; ::rtl::OUString ouStr = GetXInterface()->getAccessibleImageDescription(); SAFE_SYSFREESTRING(*description); - *description = SysAllocString((OLECHAR*)ouStr.getStr()); + *description = SysAllocString(ouStr.getStr()); return S_OK; @@ -91,7 +91,7 @@ STDMETHODIMP CAccImage::put_XInterface(hyper pXInterface) CUNOXWrapper::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); @@ -101,7 +101,7 @@ STDMETHODIMP CAccImage::put_XInterface(hyper pXInterface) } Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pRXImg = NULL; + pRXImg = nullptr; else pRXImg = pRXI.get(); return S_OK; diff --git a/winaccessibility/source/UAccCOM/AccImage.h b/winaccessibility/source/UAccCOM/AccImage.h index 3d8a5ec0c78d..03a8e3f96db9 100644 --- a/winaccessibility/source/UAccCOM/AccImage.h +++ b/winaccessibility/source/UAccCOM/AccImage.h @@ -45,13 +45,20 @@ public: BEGIN_COM_MAP(CAccImage) COM_INTERFACE_ENTRY(IAccessibleImage) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccImage*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -67,18 +74,18 @@ public: // IAccessibleImage // Gets the description of the image. - STDMETHOD(get_description)(BSTR * description); + STDMETHOD(get_description)(BSTR * description) override; STDMETHOD(get_imagePosition)( enum IA2CoordinateType coordinateType, long __RPC_FAR *x, - long __RPC_FAR *y); + long __RPC_FAR *y) override; STDMETHOD(get_imageSize)( long __RPC_FAR *height, - long __RPC_FAR *width); + long __RPC_FAR *width) override; // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; private: diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx index 6ca355b17007..3364a088e7ff 100644 --- a/winaccessibility/source/UAccCOM/AccRelation.cxx +++ b/winaccessibility/source/UAccCOM/AccRelation.cxx @@ -50,7 +50,7 @@ STDMETHODIMP CAccRelation::get_relationType(BSTR * relationType) ENTER_PROTECTED_BLOCK - if (relationType == NULL) + if (relationType == nullptr) return E_INVALIDARG; int type = relation.RelationType; @@ -85,7 +85,7 @@ STDMETHODIMP CAccRelation::get_nTargets(long * nTargets) ENTER_PROTECTED_BLOCK - if (nTargets == NULL) + if (nTargets == nullptr) return E_INVALIDARG; Sequence< Reference< XInterface > > xTargets = relation.TargetSet; @@ -107,7 +107,7 @@ STDMETHODIMP CAccRelation::get_target(long targetIndex, IUnknown * * target) ENTER_PROTECTED_BLOCK - if (target == NULL) + if (target == nullptr) return E_FAIL; Sequence< Reference< XInterface > > xTargets = relation.TargetSet; @@ -116,12 +116,12 @@ STDMETHODIMP CAccRelation::get_target(long targetIndex, IUnknown * * target) return E_FAIL; Reference xRAcc(xTargets[targetIndex], UNO_QUERY); - IAccessible* pRet = NULL; + IAccessible* pRet = nullptr; BOOL isGet = CMAccessible::get_IAccessibleFromXAccessible(xRAcc.get(), &pRet); if(isGet) { - *target = /*(IAccessible2 *)*/(IUnknown*)pRet; + *target = /*(IAccessible2 *)*/static_cast(pRet); pRet->AddRef(); return S_OK; } @@ -145,25 +145,25 @@ STDMETHODIMP CAccRelation::get_targets(long, IUnknown * * target, long * nTarget ENTER_PROTECTED_BLOCK // #CHECK# - if(target == NULL) + if(target == nullptr) return E_INVALIDARG; - if (nTargets == NULL) + if (nTargets == nullptr) return E_INVALIDARG; Sequence< Reference< XInterface > > xTargets = relation.TargetSet; int nCount = xTargets.getLength(); - *target = (IUnknown*)::CoTaskMemAlloc(nCount*sizeof(IUnknown)); + *target = static_cast(::CoTaskMemAlloc(nCount*sizeof(IUnknown))); // #CHECK Memory Allocation# - if(*target == NULL) + if(*target == nullptr) { return E_FAIL; } for(int i=0; i(pRet); pRet->AddRef(); return S_OK; } @@ -88,7 +88,7 @@ STDMETHODIMP CAccTable::get_accessibleAt(long row, long column, IUnknown * * acc if(isTRUE) { - *accessible = (IAccessible2 *)pRet; + *accessible = static_cast(pRet); pRet->AddRef(); return S_OK; } @@ -121,7 +121,7 @@ STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description) ENTER_PROTECTED_BLOCK // #CHECK# - if(description == NULL) + if(description == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -132,8 +132,8 @@ STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description) // #CHECK# SAFE_SYSFREESTRING(*description);//?? - *description = SysAllocString((OLECHAR*)ouStr.getStr()); - if(description==NULL) + *description = SysAllocString(ouStr.getStr()); + if(description==nullptr) return E_FAIL; return S_OK; @@ -156,7 +156,7 @@ STDMETHODIMP CAccTable::get_columnExtentAt(long row, long column, long * nColumn XAccessibleTable *pXAccTable = GetXInterface(); // Check pointer. - if(nColumnsSpanned == NULL) + if(nColumnsSpanned == nullptr) return E_INVALIDARG; // Get Extent. @@ -187,7 +187,7 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR * ENTER_PROTECTED_BLOCK // #CHECK# - if(accessibleTable == NULL || startingRowIndex == NULL) + if(accessibleTable == nullptr || startingRowIndex == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -197,7 +197,7 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR * Reference pRColumnHeaderTable = GetXInterface()->getAccessibleColumnHeaders(); if(!pRColumnHeaderTable.is()) { - *accessibleTable = NULL; + *accessibleTable = nullptr; return E_FAIL; } @@ -205,12 +205,12 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR * if(!pRXColumnHeader.is()) { - *accessibleTable = NULL; + *accessibleTable = nullptr; return E_FAIL; } *startingRowIndex = 0 ; - IMAccessible* pIMacc = NULL; + IMAccessible* pIMacc = nullptr; HRESULT hr = createInstance(IID_IMAccessible, &pIMacc); if (!SUCCEEDED(hr)) { @@ -218,7 +218,7 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR * } pIMacc->SetXAccessible( reinterpret_cast(pRXColumnHeader.get())); - pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); + pIMacc->QueryInterface(IID_IAccessibleTable,reinterpret_cast(accessibleTable)); return S_OK; @@ -237,7 +237,7 @@ STDMETHODIMP CAccTable::get_nColumns(long * columnCount) ENTER_PROTECTED_BLOCK // #CHECK# - if(columnCount == NULL) + if(columnCount == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -262,7 +262,7 @@ STDMETHODIMP CAccTable::get_nRows(long * rowCount) ENTER_PROTECTED_BLOCK // #CHECK# - if(rowCount == NULL) + if(rowCount == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -287,7 +287,7 @@ STDMETHODIMP CAccTable::get_nSelectedColumns(long * columnCount) ENTER_PROTECTED_BLOCK // #CHECK# - if(columnCount == NULL) + if(columnCount == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -313,7 +313,7 @@ STDMETHODIMP CAccTable::get_nSelectedRows(long * rowCount) ENTER_PROTECTED_BLOCK // #CHECK# - if(rowCount == NULL) + if(rowCount == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -340,7 +340,7 @@ STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description) ENTER_PROTECTED_BLOCK // #CHECK# - if(description == NULL) + if(description == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -351,8 +351,8 @@ STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description) // #CHECK# SAFE_SYSFREESTRING(*description); - *description = SysAllocString((OLECHAR*)ouStr.getStr()); - if(description==NULL) + *description = SysAllocString(ouStr.getStr()); + if(description==nullptr) return E_FAIL; return S_OK; @@ -376,7 +376,7 @@ STDMETHODIMP CAccTable::get_rowExtentAt(long row, long column, long * nRowsSpann XAccessibleTable *pXAccTable = GetXInterface(); // Check pointer. - if(nRowsSpanned == NULL) + if(nRowsSpanned == nullptr) return E_INVALIDARG; // Get Extent. @@ -408,7 +408,7 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc ENTER_PROTECTED_BLOCK // #CHECK# - if(accessibleTable == NULL || startingColumnIndex == NULL) + if(accessibleTable == nullptr || startingColumnIndex == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -418,7 +418,7 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc Reference pRRowHeaderTable = GetXInterface()->getAccessibleRowHeaders(); if(!pRRowHeaderTable.is()) { - *accessibleTable = NULL; + *accessibleTable = nullptr; return E_FAIL; } @@ -426,12 +426,12 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc if(!pRXRowHeader.is()) { - *accessibleTable = NULL; + *accessibleTable = nullptr; return E_FAIL; } *startingColumnIndex = 0 ; - IMAccessible* pIMacc = NULL; + IMAccessible* pIMacc = nullptr; HRESULT hr = createInstance(IID_IMAccessible, &pIMacc); if (!SUCCEEDED(hr)) { @@ -439,7 +439,7 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc } pIMacc->SetXAccessible( reinterpret_cast(pRXRowHeader.get())); - pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); + pIMacc->QueryInterface(IID_IAccessibleTable,reinterpret_cast(accessibleTable)); return S_OK; @@ -460,7 +460,7 @@ STDMETHODIMP CAccTable::get_selectedRows(long, long ** rows, long * nRows) ENTER_PROTECTED_BLOCK // #CHECK# - if(rows == NULL || nRows == NULL) + if(rows == nullptr || nRows == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -471,9 +471,9 @@ STDMETHODIMP CAccTable::get_selectedRows(long, long ** rows, long * nRows) long count = pSelected.getLength() ; *nRows = count; - *rows = reinterpret_cast(CoTaskMemAlloc((count) * sizeof(long))); + *rows = static_cast(CoTaskMemAlloc((count) * sizeof(long))); // #CHECK Memory Allocation# - if(*rows == NULL) + if(*rows == nullptr) { return E_FAIL; } @@ -499,7 +499,7 @@ STDMETHODIMP CAccTable::get_selectedColumns(long, long ** columns, long * numCol ENTER_PROTECTED_BLOCK // #CHECK# - if(columns == NULL || numColumns == NULL) + if(columns == nullptr || numColumns == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -510,9 +510,9 @@ STDMETHODIMP CAccTable::get_selectedColumns(long, long ** columns, long * numCol long count = pSelected.getLength() ; *numColumns = count; - *columns = reinterpret_cast(CoTaskMemAlloc((count) * sizeof(long))); + *columns = static_cast(CoTaskMemAlloc((count) * sizeof(long))); // #CHECK Memory Allocation# - if(*columns == NULL) + if(*columns == nullptr) { return E_FAIL; } @@ -536,7 +536,7 @@ STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible) ENTER_PROTECTED_BLOCK // #CHECK# - if(accessible == NULL) + if(accessible == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -546,12 +546,12 @@ STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible) } Reference pRAcc = GetXInterface()->getAccessibleSummary(); - IAccessible* pRet = NULL; + IAccessible* pRet = nullptr; CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); if(pRet) { - *accessible = (IAccessible2 *)pRet; + *accessible = static_cast(pRet); pRet->AddRef(); return S_OK; } @@ -574,7 +574,7 @@ STDMETHODIMP CAccTable::get_isColumnSelected(long column, unsigned char * isSele ENTER_PROTECTED_BLOCK // #CHECK# - if(isSelected == NULL) + if(isSelected == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -600,7 +600,7 @@ STDMETHODIMP CAccTable::get_isRowSelected(long row, unsigned char * isSelected) ENTER_PROTECTED_BLOCK // #CHECK# - if(isSelected == NULL) + if(isSelected == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -628,7 +628,7 @@ STDMETHODIMP CAccTable::get_isSelected(long row, long column, unsigned char * is ENTER_PROTECTED_BLOCK // #CHECK# - if(isSelected == NULL) + if(isSelected == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -836,7 +836,7 @@ STDMETHODIMP CAccTable::put_XInterface(hyper pXInterface) CUNOXWrapper::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_INVALIDARG; Reference pRContext = pUNOInterface->getAccessibleContext(); @@ -845,7 +845,7 @@ STDMETHODIMP CAccTable::put_XInterface(hyper pXInterface) Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pRXTable = NULL; + pRXTable = nullptr; else pRXTable = pRXI.get(); return S_OK; @@ -865,7 +865,7 @@ STDMETHODIMP CAccTable::get_columnIndex(long childIndex, long * columnIndex) ENTER_PROTECTED_BLOCK // #CHECK# - if(columnIndex == NULL) + if(columnIndex == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -889,7 +889,7 @@ STDMETHODIMP CAccTable::get_rowIndex(long childIndex, long * rowIndex) ENTER_PROTECTED_BLOCK // #CHECK# - if(rowIndex == NULL) + if(rowIndex == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -913,7 +913,7 @@ STDMETHODIMP CAccTable::get_childIndex(long RowIndex , long columnIndex, long * ENTER_PROTECTED_BLOCK // #CHECK# - if(childIndex == NULL) + if(childIndex == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -951,7 +951,7 @@ STDMETHODIMP CAccTable::get_nSelectedChildren(long *childCount) ENTER_PROTECTED_BLOCK // #CHECK# - if(childCount == NULL) + if(childCount == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -982,7 +982,7 @@ STDMETHODIMP CAccTable::get_selectedChildren(long, long **children, long *nChild ENTER_PROTECTED_BLOCK // #CHECK# - if(children == NULL || nChildren == NULL) + if(children == nullptr || nChildren == nullptr) return E_INVALIDARG; // #CHECK XInterface# @@ -997,7 +997,7 @@ STDMETHODIMP CAccTable::get_selectedChildren(long, long **children, long *nChild *nChildren = childCount; - *children = reinterpret_cast(CoTaskMemAlloc((childCount) * sizeof(long))); + *children = static_cast(CoTaskMemAlloc((childCount) * sizeof(long))); for( long i = 0; i< childCount; i++) { diff --git a/winaccessibility/source/UAccCOM/AccTable.h b/winaccessibility/source/UAccCOM/AccTable.h index 2c1a093fadb7..83cd1b6d1fd6 100644 --- a/winaccessibility/source/UAccCOM/AccTable.h +++ b/winaccessibility/source/UAccCOM/AccTable.h @@ -47,13 +47,20 @@ public: BEGIN_COM_MAP(CAccTable) COM_INTERFACE_ENTRY(IAccessibleTable) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccTable*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -69,95 +76,95 @@ public: // IAccessibleTable // Gets accessible table cell. - STDMETHOD(get_accessibleAt)(long row, long column, IUnknown * * accessible); + STDMETHOD(get_accessibleAt)(long row, long column, IUnknown * * accessible) override; // Gets accessible table caption. - STDMETHOD(get_caption)(IUnknown * * accessible); + STDMETHOD(get_caption)(IUnknown * * accessible) override; // Gets accessible column description (as string). - STDMETHOD(get_columnDescription)(long column, BSTR * description); + STDMETHOD(get_columnDescription)(long column, BSTR * description) override; // Gets number of columns spanned by table cell. - STDMETHOD(get_columnExtentAt)(long row, long column, long * nColumnsSpanned); + STDMETHOD(get_columnExtentAt)(long row, long column, long * nColumnsSpanned) override; // Gets accessible column header. - STDMETHOD(get_columnHeader)(IAccessibleTable __RPC_FAR *__RPC_FAR *accessibleTable, long *startingRowIndex); + STDMETHOD(get_columnHeader)(IAccessibleTable __RPC_FAR *__RPC_FAR *accessibleTable, long *startingRowIndex) override; // Gets total number of columns in table. - STDMETHOD(get_nColumns)(long * columnCount); + STDMETHOD(get_nColumns)(long * columnCount) override; // Gets total number of rows in table. - STDMETHOD(get_nRows)(long * rowCount); + STDMETHOD(get_nRows)(long * rowCount) override; // Gets total number of selected columns. - STDMETHOD(get_nSelectedColumns)(long * columnCount); + STDMETHOD(get_nSelectedColumns)(long * columnCount) override; // Gets total number of selected rows. - STDMETHOD(get_nSelectedRows)(long * rowCount); + STDMETHOD(get_nSelectedRows)(long * rowCount) override; // Gets accessible row description (as string). - STDMETHOD(get_rowDescription)(long row, BSTR * description); + STDMETHOD(get_rowDescription)(long row, BSTR * description) override; // Gets number of rows spanned by a table cell. - STDMETHOD(get_rowExtentAt)(long row, long column, long * nRowsSpanned); + STDMETHOD(get_rowExtentAt)(long row, long column, long * nRowsSpanned) override; // Gets accessible row header. - STDMETHOD(get_rowHeader)(IAccessibleTable __RPC_FAR *__RPC_FAR *accessibleTable, long *startingColumnIndex); + STDMETHOD(get_rowHeader)(IAccessibleTable __RPC_FAR *__RPC_FAR *accessibleTable, long *startingColumnIndex) override; // Gets list of row indexes currently selected (0-based). - STDMETHOD(get_selectedRows)(long maxRows, long **rows, long * nRows); + STDMETHOD(get_selectedRows)(long maxRows, long **rows, long * nRows) override; // Gets list of column indexes currently selected (0-based). - STDMETHOD(get_selectedColumns)(long maxColumns, long **columns, long * numColumns); + STDMETHOD(get_selectedColumns)(long maxColumns, long **columns, long * numColumns) override; // Gets accessible table summary. - STDMETHOD(get_summary)(IUnknown * * accessible); + STDMETHOD(get_summary)(IUnknown * * accessible) override; // Determines if table column is selected. - STDMETHOD(get_isColumnSelected)(long column, unsigned char * isSelected); + STDMETHOD(get_isColumnSelected)(long column, unsigned char * isSelected) override; // Determines if table row is selected. - STDMETHOD(get_isRowSelected)(long row, unsigned char * isSelected); + STDMETHOD(get_isRowSelected)(long row, unsigned char * isSelected) override; // Determines if table cell is selected. - STDMETHOD(get_isSelected)(long row, long column, unsigned char * isSelected); + STDMETHOD(get_isSelected)(long row, long column, unsigned char * isSelected) override; // Selects a row and unselect all previously selected rows. - STDMETHOD(selectRow)(long row ); + STDMETHOD(selectRow)(long row ) override; // Selects a column and unselect all previously selected columns. - STDMETHOD(selectColumn)(long column); + STDMETHOD(selectColumn)(long column) override; // Unselects one row, leaving other selected rows selected (if any). - STDMETHOD(unselectRow)(long row); + STDMETHOD(unselectRow)(long row) override; // Unselects one column, leaving other selected columns selected (if any). - STDMETHOD(unselectColumn)(long column); + STDMETHOD(unselectColumn)(long column) override; //get Column index - STDMETHOD(get_columnIndex)(long childIndex, long * columnIndex); + STDMETHOD(get_columnIndex)(long childIndex, long * columnIndex) override; - STDMETHOD(get_rowIndex)(long childIndex, long * rowIndex); + STDMETHOD(get_rowIndex)(long childIndex, long * rowIndex) override; - STDMETHOD(get_childIndex)(long rowIndex,long columnIndex, long * childIndex); + STDMETHOD(get_childIndex)(long rowIndex,long columnIndex, long * childIndex) override; - STDMETHOD(get_nSelectedChildren)(long *childCount); + STDMETHOD(get_nSelectedChildren)(long *childCount) override; - STDMETHOD(get_selectedChildren)(long maxChildren, long **children, long *nChildren); + STDMETHOD(get_selectedChildren)(long maxChildren, long **children, long *nChildren) override; STDMETHOD(get_rowColumnExtentsAtIndex)( long index, long *row, long *column, long *rowExtents, long *columnExtents, - boolean *isSelected) ; + boolean *isSelected) override; - STDMETHOD(get_modelChange)(IA2TableModelChange *modelChange); + STDMETHOD(get_modelChange)(IA2TableModelChange *modelChange) override; // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; private: diff --git a/winaccessibility/source/UAccCOM/AccText.cxx b/winaccessibility/source/UAccCOM/AccText.cxx index 39bce542e36d..491e515e36ae 100644 --- a/winaccessibility/source/UAccCOM/AccText.cxx +++ b/winaccessibility/source/UAccCOM/AccText.cxx @@ -70,17 +70,6 @@ STDMETHODIMP CAccText::get_caretOffset(long * offset) return CAccTextBase::get_caretOffset(offset); } -/** - * Get character count. - * @param nCharacters Variant to accept character count. - * @return Result. -*/ -STDMETHODIMP CAccText::get_characterCount(long * nCharacters) -{ - - return CAccTextBase::get_characterCount(nCharacters); -} - /** * Get character extents. * @param offset Offset. @@ -275,15 +264,4 @@ STDMETHODIMP CAccText::scrollSubstringTo(long startIndex, long endIndex,enum IA2 return CAccTextBase::scrollSubstringTo(startIndex, endIndex,scrollType); } -/** - * Put UNO interface. - * @param pXInterface UNO interface. - * @return Result. -*/ -STDMETHODIMP CAccText::put_XInterface(hyper pXInterface) -{ - - return CAccTextBase::put_XInterface(pXInterface); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccText.h b/winaccessibility/source/UAccCOM/AccText.h index 2b0447f172a1..eb7e9c09dfad 100644 --- a/winaccessibility/source/UAccCOM/AccText.h +++ b/winaccessibility/source/UAccCOM/AccText.h @@ -37,20 +37,27 @@ public: CAccText() { } - ~CAccText() + ~CAccText() override { } BEGIN_COM_MAP(CAccText) COM_INTERFACE_ENTRY(IAccessibleText) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccText*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -66,68 +73,61 @@ public: // IAccessibleText // Adds a text selection. - STDMETHOD(addSelection)(long startOffset, long endOffset);//, unsigned char * success); + STDMETHOD(addSelection)(long startOffset, long endOffset) override;//, unsigned char * success); // Gets text attributes. - STDMETHOD(get_attributes)(long offset, long * startOffset, long * endOffset, BSTR * textAttributes); + STDMETHOD(get_attributes)(long offset, long * startOffset, long * endOffset, BSTR * textAttributes) override; // Gets caret offset. - STDMETHOD(get_caretOffset)(long * offset); - - // Gets total number of characters. - STDMETHOD(get_characterCount)(long * nCharacters); + STDMETHOD(get_caretOffset)(long * offset) override; // Gets bounding rect containing the glyph(s) representing the character // at the specified text offset - STDMETHOD(get_characterExtents)(long offset, IA2CoordinateType coordType, long * x, long * y, long * width, long * height); + STDMETHOD(get_characterExtents)(long offset, IA2CoordinateType coordType, long * x, long * y, long * width, long * height) override; // Gets number of active non-contiguous selections. - STDMETHOD(get_nSelections)(long * nSelections); + STDMETHOD(get_nSelections)(long * nSelections) override; // Gets bounding rect for the glyph at a certain point. - STDMETHOD(get_offsetAtPoint)(long x, long y, IA2CoordinateType coordType, long * offset); + STDMETHOD(get_offsetAtPoint)(long x, long y, IA2CoordinateType coordType, long * offset) override; // Gets character offsets of N-th active text selection. - STDMETHOD(get_selection)(long selection, long * startOffset, long * endOffset); + STDMETHOD(get_selection)(long selection, long * startOffset, long * endOffset) override; // Gets a range of text by offset NOTE: returned string may be longer // than endOffset-startOffset bytes if text contains multi-byte characters. - STDMETHOD(get_text)(long startOffset, long endOffset, BSTR * text); + STDMETHOD(get_text)(long startOffset, long endOffset, BSTR * text) override; // Gets a specified amount of text that ends before a specified offset. - STDMETHOD(get_textBeforeOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text); + STDMETHOD(get_textBeforeOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text) override; // Gets a specified amount of text that spans the specified offset. - STDMETHOD(get_textAfterOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text); + STDMETHOD(get_textAfterOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text) override; // Gets a specified amount of text that starts after a specified offset. - STDMETHOD(get_textAtOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text); + STDMETHOD(get_textAtOffset)(long offset, IA2TextBoundaryType boundaryType, long * startOffset, long * endOffset, BSTR * text) override; // Unselects a range of text. - STDMETHOD(removeSelection)(long selectionIndex);//, unsigned char * success); + STDMETHOD(removeSelection)(long selectionIndex) override;//, unsigned char * success); // Moves text caret. - STDMETHOD(setCaretOffset)(long offset);//, unsigned char * success); + STDMETHOD(setCaretOffset)(long offset) override;//, unsigned char * success); // Changes the bounds of an existing selection. - STDMETHOD(setSelection)(long selectionIndex, long startOffset, long endOffset);//, unsigned char * success); + STDMETHOD(setSelection)(long selectionIndex, long startOffset, long endOffset) override;//, unsigned char * success); // Gets total number of characters. // NOTE: this may be different than the total number of bytes required // to store the text, if the text contains multi-byte characters. - STDMETHOD(get_nCharacters)(long * nCharacters); + STDMETHOD(get_nCharacters)(long * nCharacters) override; // Makes specific part of string visible on screen. - STDMETHOD(scrollSubstringTo)(long startIndex, long endIndex,enum IA2ScrollType scrollType); - STDMETHOD(scrollSubstringToPoint)(long startIndex, long endIndex,enum IA2CoordinateType coordinateType, long x, long y ); - - STDMETHOD(get_newText)( IA2TextSegment *newText); - - STDMETHOD(get_oldText)( IA2TextSegment *oldText); + STDMETHOD(scrollSubstringTo)(long startIndex, long endIndex,enum IA2ScrollType scrollType) override; + STDMETHOD(scrollSubstringToPoint)(long startIndex, long endIndex,enum IA2CoordinateType coordinateType, long x, long y ) override; - // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(get_newText)( IA2TextSegment *newText) override; + STDMETHOD(get_oldText)( IA2TextSegment *oldText) override; }; #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXT_H diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx index fed8aee406c9..f67bb4aefbd6 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.cxx +++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx @@ -41,7 +41,7 @@ using namespace css::uno; // Construction/Destruction -static OUString ReplaceFourChar(OUString oldOUString); +static OUString ReplaceFourChar(OUString const & oldOUString); CAccTextBase::CAccTextBase() {} @@ -64,7 +64,7 @@ STDMETHODIMP CAccTextBase::get_addSelection(long startOffset, long endOffset) ENTER_PROTECTED_BLOCK // #CHECK XInterface# - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); @@ -99,7 +99,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long ENTER_PROTECTED_BLOCK - if (startOffset == NULL || endOffset == NULL || textAttributes == NULL) + if (startOffset == nullptr || endOffset == nullptr || textAttributes == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -155,8 +155,8 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long numberingPrefix = ReplaceFourChar(numberingPrefix); CMAccessible::get_OLECHAR4Numbering(anyNumRule,numberingLevel,numberingPrefix,numProps); strAttrs += numProps; - bHaveNumberingLevel = 0; - bHaveNumberingRules = 0; + bHaveNumberingLevel = false; + bHaveNumberingRules = false; } if( (bHaveNumberingPrefixAttr && i > 1 ) || (!bHaveNumberingPrefixAttr && i > 0 ) ) //element 0 is NumberingPrefix, not write alone @@ -221,7 +221,7 @@ STDMETHODIMP CAccTextBase::get_caretOffset(long * offset) ENTER_PROTECTED_BLOCK - if (offset == NULL) + if (offset == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -247,7 +247,7 @@ STDMETHODIMP CAccTextBase::get_characterCount(long * nCharacters) ENTER_PROTECTED_BLOCK - if (nCharacters == NULL) + if (nCharacters == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -277,7 +277,7 @@ STDMETHODIMP CAccTextBase::get_characterExtents(long offset, IA2CoordinateType c ENTER_PROTECTED_BLOCK - if (x == NULL || height == NULL || y == NULL || width == NULL) + if (x == nullptr || height == nullptr || y == nullptr || width == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -349,10 +349,10 @@ STDMETHODIMP CAccTextBase::get_nSelections(long * nSelections) ENTER_PROTECTED_BLOCK - if (nSelections == NULL) + if (nSelections == nullptr) return E_INVALIDARG; // #CHECK XInterface# - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) { *nSelections = 0; return S_OK; @@ -395,7 +395,7 @@ STDMETHODIMP CAccTextBase::get_offsetAtPoint(long x, long y, IA2CoordinateType, ENTER_PROTECTED_BLOCK - if (offset == NULL) + if (offset == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -424,10 +424,10 @@ STDMETHODIMP CAccTextBase::get_selection(long selectionIndex, long * startOffset ENTER_PROTECTED_BLOCK - if (startOffset == NULL || endOffset == NULL ) + if (startOffset == nullptr || endOffset == nullptr ) return E_INVALIDARG; // #CHECK XInterface# - if(pUNOInterface == NULL ) + if(pUNOInterface == nullptr ) return E_FAIL; long nSelection = 0; @@ -473,7 +473,7 @@ STDMETHODIMP CAccTextBase::get_text(long startOffset, long endOffset, BSTR * tex ENTER_PROTECTED_BLOCK - if (text == NULL) + if (text == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -499,7 +499,7 @@ STDMETHODIMP CAccTextBase::get_text(long startOffset, long endOffset, BSTR * tex } SysFreeString(*text); - *text = SysAllocString((OLECHAR*)ouStr.getStr()); + *text = SysAllocString(ouStr.getStr()); return S_OK; LEAVE_PROTECTED_BLOCK @@ -521,7 +521,7 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType ENTER_PROTECTED_BLOCK // #CHECK# - if (startOffset == NULL || endOffset == NULL || text == NULL) + if (startOffset == nullptr || endOffset == nullptr || text == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -584,7 +584,7 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType TextSegment segment = GetXInterface()->getTextBeforeIndex( offset, sal_Int16(lUnoBoundaryType)); ::rtl::OUString ouStr = segment.SegmentText; SysFreeString(*text); - *text = SysAllocString((OLECHAR*)ouStr.getStr()); + *text = SysAllocString(ouStr.getStr()); *startOffset = segment.SegmentStart; *endOffset = segment.SegmentEnd; @@ -608,7 +608,7 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType ENTER_PROTECTED_BLOCK - if (startOffset == NULL || endOffset == NULL || text == NULL) + if (startOffset == nullptr || endOffset == nullptr || text == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -670,7 +670,7 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType TextSegment segment = GetXInterface()->getTextBehindIndex( offset, sal_Int16(lUnoBoundaryType)); ::rtl::OUString ouStr = segment.SegmentText; SysFreeString(*text); - *text = SysAllocString((OLECHAR*)ouStr.getStr()); + *text = SysAllocString(ouStr.getStr()); *startOffset = segment.SegmentStart; *endOffset = segment.SegmentEnd; @@ -694,7 +694,7 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou ENTER_PROTECTED_BLOCK - if (startOffset == NULL || text == NULL ||endOffset == NULL) + if (startOffset == nullptr || text == nullptr ||endOffset == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -757,7 +757,7 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou TextSegment segment = GetXInterface()->getTextAtIndex( offset, sal_Int16(lUnoBoundaryType)); ::rtl::OUString ouStr = segment.SegmentText; SysFreeString(*text); - *text = SysAllocString((OLECHAR*)ouStr.getStr()); + *text = SysAllocString(ouStr.getStr()); *startOffset = segment.SegmentStart; *endOffset = segment.SegmentEnd; @@ -779,7 +779,7 @@ STDMETHODIMP CAccTextBase::removeSelection(long selectionIndex) ENTER_PROTECTED_BLOCK // #CHECK XInterface# - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) { return E_FAIL; } @@ -863,7 +863,7 @@ STDMETHODIMP CAccTextBase::get_nCharacters(long * nCharacters) ENTER_PROTECTED_BLOCK - if (nCharacters == NULL) + if (nCharacters == nullptr) return E_INVALIDARG; // #CHECK XInterface# if(!pRXText.is()) @@ -919,7 +919,7 @@ STDMETHODIMP CAccTextBase::put_XInterface(hyper pXInterface) CUNOXWrapper::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); if( !pRContext.is() ) @@ -928,7 +928,7 @@ STDMETHODIMP CAccTextBase::put_XInterface(hyper pXInterface) } Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pRXText = NULL; + pRXText = nullptr; else pRXText = pRXI; return S_OK; @@ -936,28 +936,30 @@ STDMETHODIMP CAccTextBase::put_XInterface(hyper pXInterface) LEAVE_PROTECTED_BLOCK } -static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr) +static OUString ReplaceOneChar(OUString const & oldOUString, OUString const & replacedChar, OUString const & replaceStr) { - int iReplace = oldOUString.lastIndexOf(replacedChar); + auto s = oldOUString; + int iReplace = s.lastIndexOf(replacedChar); if (iReplace > -1) { for(;iReplace>-1;) { - oldOUString = oldOUString.replaceAt(iReplace,1, replaceStr); - iReplace=oldOUString.lastIndexOf(replacedChar,iReplace); + s = s.replaceAt(iReplace,1, replaceStr); + iReplace=s.lastIndexOf(replacedChar,iReplace); } } - return oldOUString; + return s; } -static OUString ReplaceFourChar(OUString oldOUString) +static OUString ReplaceFourChar(OUString const & oldOUString) { - oldOUString = ReplaceOneChar(oldOUString, OUString("\\"), OUString("\\\\")); - oldOUString = ReplaceOneChar(oldOUString, OUString(";"), OUString("\\;")); - oldOUString = ReplaceOneChar(oldOUString, OUString("="), OUString("\\=")); - oldOUString = ReplaceOneChar(oldOUString, OUString(","), OUString("\\,")); - oldOUString = ReplaceOneChar(oldOUString, OUString(":"), OUString("\\:")); - return oldOUString; + auto s = oldOUString; + s = ReplaceOneChar(s, "\\", "\\\\"); + s = ReplaceOneChar(s, ";", "\\;"); + s = ReplaceOneChar(s, "=", "\\="); + s = ReplaceOneChar(s, ",", "\\,"); + s = ReplaceOneChar(s, ":", "\\:"); + return s; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccTextBase.h b/winaccessibility/source/UAccCOM/AccTextBase.h index e4ed4f9ec7ad..915a0c71596b 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.h +++ b/winaccessibility/source/UAccCOM/AccTextBase.h @@ -97,7 +97,7 @@ public: STDMETHOD(scrollSubstringToPoint)(long startIndex, long endIndex,enum IA2CoordinateType coordinateType, long x, long y ); // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; private: diff --git a/winaccessibility/source/UAccCOM/AccValue.cxx b/winaccessibility/source/UAccCOM/AccValue.cxx index a6bb24e7fbed..031500c7e4da 100644 --- a/winaccessibility/source/UAccCOM/AccValue.cxx +++ b/winaccessibility/source/UAccCOM/AccValue.cxx @@ -50,7 +50,7 @@ STDMETHODIMP CAccValue::get_currentValue(VARIANT * currentValue) ENTER_PROTECTED_BLOCK - if (currentValue == NULL) + if (currentValue == nullptr) return E_INVALIDARG; if ( !pRXVal.is() ) return E_FAIL; @@ -94,35 +94,35 @@ STDMETHODIMP CAccValue::setCurrentValue(VARIANT value) case VT_BOOL: { - css::uno::Type typeInfo(TypeClass_BOOLEAN, (sal_Char *)"bool"); + css::uno::Type typeInfo(TypeClass_BOOLEAN, "bool"); anyVal.setValue(&value.boolVal, typeInfo); } break; case VT_I2: { - css::uno::Type typeInfo(TypeClass_SHORT, (sal_Char *)"short"); + css::uno::Type typeInfo(TypeClass_SHORT, "short"); anyVal.setValue(&value.iVal, typeInfo); } break; case VT_I4: { - css::uno::Type typeInfo(TypeClass_LONG, (sal_Char *)"long"); + css::uno::Type typeInfo(TypeClass_LONG, "long"); anyVal.setValue(&value.lVal, typeInfo); } break; case VT_R4: { - css::uno::Type typeInfo(TypeClass_FLOAT, (sal_Char *)"float"); + css::uno::Type typeInfo(TypeClass_FLOAT, "float"); anyVal.setValue(&value.fltVal, typeInfo); } break; case VT_R8: { - css::uno::Type typeInfo(TypeClass_DOUBLE, (sal_Char *)"double"); + css::uno::Type typeInfo(TypeClass_DOUBLE, "double"); anyVal.setValue(&value.dblVal, typeInfo); } break; @@ -156,7 +156,7 @@ STDMETHODIMP CAccValue::get_maximumValue(VARIANT *maximumValue) ENTER_PROTECTED_BLOCK - if (maximumValue == NULL) + if (maximumValue == nullptr) return E_INVALIDARG; if ( !pRXVal.is() ) return E_FAIL; @@ -182,7 +182,7 @@ STDMETHODIMP CAccValue::get_minimumValue(VARIANT *mininumValue) ENTER_PROTECTED_BLOCK - if (mininumValue == NULL) + if (mininumValue == nullptr) return E_FAIL; if ( !pRXVal.is() ) return E_FAIL; @@ -210,7 +210,7 @@ STDMETHODIMP CAccValue::put_XInterface(hyper pXInterface) CUNOXWrapper::put_XInterface(pXInterface); //special query. - if(pUNOInterface == NULL) + if(pUNOInterface == nullptr) return E_FAIL; Reference pRContext = pUNOInterface->getAccessibleContext(); if( !pRContext.is() ) @@ -219,7 +219,7 @@ STDMETHODIMP CAccValue::put_XInterface(hyper pXInterface) } Reference pRXI(pRContext,UNO_QUERY); if( !pRXI.is() ) - pRXVal = NULL; + pRXVal = nullptr; else pRXVal = pRXI.get(); return S_OK; diff --git a/winaccessibility/source/UAccCOM/AccValue.h b/winaccessibility/source/UAccCOM/AccValue.h index dd9583834f7c..930e70f18a72 100644 --- a/winaccessibility/source/UAccCOM/AccValue.h +++ b/winaccessibility/source/UAccCOM/AccValue.h @@ -46,13 +46,20 @@ public: BEGIN_COM_MAP(CAccValue) COM_INTERFACE_ENTRY(IAccessibleValue) COM_INTERFACE_ENTRY(IUNOXWrapper) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CAccValue*)pv)->SmartQI(iid,ppvObject); + return static_cast(pv)->SmartQI(iid,ppvObject); } HRESULT SmartQI(REFIID iid, void** ppvObject) @@ -68,19 +75,19 @@ public: // IAccessibleValue // Returns the value of this object as a number. - STDMETHOD(get_currentValue)(VARIANT *currentValue); + STDMETHOD(get_currentValue)(VARIANT *currentValue) override; // Sets the value of this object to the given number. - STDMETHOD(setCurrentValue)(VARIANT value); + STDMETHOD(setCurrentValue)(VARIANT value) override; // Returns the maximal value that can be represented by this object. - STDMETHOD(get_maximumValue)(VARIANT *maximumValue); + STDMETHOD(get_maximumValue)(VARIANT *maximumValue) override; // Returns the minimal value that can be represented by this object. - STDMETHOD(get_minimumValue)(VARIANT *mininumValue); + STDMETHOD(get_minimumValue)(VARIANT *mininumValue) override; // Override of IUNOXWrapper. - STDMETHOD(put_XInterface)(hyper pXInterface); + STDMETHOD(put_XInterface)(hyper pXInterface) override; private: diff --git a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h index 3742251a9a42..fa03a79934aa 100644 --- a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h +++ b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h @@ -20,12 +20,12 @@ #ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H #define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H -typedef struct _ACCESSIBLE_KEYSTROKE { +struct ACCESSIBLE_KEYSTROKE { short modifiers; short keyCode; char keyChar; short keyFunc; -} ACCESSIBLE_KEYSTROKE; +}; const short MODIFIER_SHIFT = 1; const short MODIFIER_CTRL = 2; diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index e7528343016b..b21a56c5146f 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -53,10 +53,10 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * long l1; ULONG l2; - if (pvar == NULL) + if (pvar == nullptr) return E_INVALIDARG; - if (pcElementFetched != NULL) + if (pcElementFetched != nullptr) *pcElementFetched = 0; // Retrieve the next cElements. @@ -64,13 +64,13 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * l2 pRXAcc = m_pXAccessibleSelection->getSelectedAccessibleChild(l1); - IAccessible* pChild = NULL; + IAccessible* pChild = nullptr; BOOL isGet = CMAccessible::get_IAccessibleFromXAccessible(pRXAcc.get(), &pChild); if(isGet) { pvar[l2].vt = VT_I4; - ((IMAccessible*)pChild)->Get_XAccChildID(&pvar[l2].lVal); + static_cast(pChild)->Get_XAccChildID(&pvar[l2].lVal); } else if(pRXAcc.is()) { @@ -81,12 +81,12 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * if(isGet) { pvar[l2].vt = VT_I4; - ((IMAccessible*)pChild)->Get_XAccChildID(&pvar[l2].lVal); + static_cast(pChild)->Get_XAccChildID(&pvar[l2].lVal); } } } // Set count of elements retrieved. - if (pcElementFetched != NULL) + if (pcElementFetched != nullptr) *pcElementFetched = l2; m_lCurrent = l1; @@ -139,12 +139,12 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Clone(IEnumVARIANT __RPC_FAR *__RPC_FAR { SolarMutexGuard g; - CEnumVariant * penum = NULL; + CEnumVariant * penum = nullptr; HRESULT hr; - if (ppenum == NULL) + if (ppenum == nullptr) return E_INVALIDARG; - *ppenum = NULL; + *ppenum = nullptr; hr = Create(&penum); if( hr == S_OK ) @@ -199,8 +199,8 @@ STDMETHODIMP CEnumVariant::ClearEnumeration() { // internal IEnumVariant - no mutex meeded - pUNOInterface = NULL; - m_pXAccessibleSelection = NULL; + pUNOInterface = nullptr; + m_pXAccessibleSelection = nullptr; m_lCurrent = m_lLBound; return S_OK; } @@ -212,16 +212,16 @@ STDMETHODIMP CEnumVariant::ClearEnumeration() */ static Reference GetXAccessibleSelection(XAccessible* pXAcc) { - if( pXAcc == NULL) - return NULL; + if( pXAcc == nullptr) + return nullptr; Reference< XAccessibleContext > pRContext = pXAcc->getAccessibleContext(); if( !pRContext.is() ) - return NULL; + return nullptr; Reference< XAccessibleSelection > pRSelection(pRContext,UNO_QUERY); if( !pRSelection.is() ) - return NULL; + return nullptr; return pRSelection; } diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h index 5bdf7ea62f35..0615d6105d39 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.h +++ b/winaccessibility/source/UAccCOM/EnumVariant.h @@ -45,8 +45,8 @@ class ATL_NO_VTABLE CEnumVariant : public: CEnumVariant() :m_lLBound(0), - pUNOInterface(NULL), - m_pXAccessibleSelection(NULL) + pUNOInterface(nullptr), + m_pXAccessibleSelection(nullptr) { m_lCurrent = m_lLBound; } @@ -60,31 +60,38 @@ public: BEGIN_COM_MAP(CEnumVariant) COM_INTERFACE_ENTRY(IEnumVariant) COM_INTERFACE_ENTRY(IEnumVARIANT) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif // IEnumVariant public: - STDMETHOD(ClearEnumeration)(); + STDMETHOD(ClearEnumeration)() override; // IEnumVARIANT - HRESULT STDMETHODCALLTYPE Next(ULONG cElements,VARIANT __RPC_FAR *pvar,ULONG __RPC_FAR *pcElementFetched); + HRESULT STDMETHODCALLTYPE Next(ULONG cElements,VARIANT __RPC_FAR *pvar,ULONG __RPC_FAR *pcElementFetched) override; - HRESULT STDMETHODCALLTYPE Skip(ULONG cElements); + HRESULT STDMETHODCALLTYPE Skip(ULONG cElements) override; - HRESULT STDMETHODCALLTYPE Reset( void); + HRESULT STDMETHODCALLTYPE Reset( void) override; - HRESULT STDMETHODCALLTYPE Clone(IEnumVARIANT __RPC_FAR *__RPC_FAR *ppenum); + HRESULT STDMETHODCALLTYPE Clone(IEnumVARIANT __RPC_FAR *__RPC_FAR *ppenum) override; // IEnumVariant - HRESULT STDMETHODCALLTYPE PutSelection(hyper pXSelection); + HRESULT STDMETHODCALLTYPE PutSelection(hyper pXSelection) override; static HRESULT STDMETHODCALLTYPE Create(CEnumVariant __RPC_FAR *__RPC_FAR *ppenum); diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index a8c035fc97cd..fd495a1a520f 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -141,7 +141,7 @@ using namespace com::sun::star::accessibility::AccessibleRole; #define QUERYXINTERFACE(ainterface) \ { \ - if(pXAcc == NULL) \ + if(pXAcc == nullptr) \ return FALSE; \ pRContext = pXAcc->getAccessibleContext(); \ if( !pRContext.is() ) \ @@ -153,7 +153,7 @@ using namespace com::sun::star::accessibility::AccessibleRole; { \ return FALSE; \ } \ - *ppXI = (XInterface*)pRXI.get(); \ + *ppXI = static_cast(pRXI.get()); \ return TRUE; \ } @@ -162,19 +162,19 @@ using namespace com::sun::star::accessibility::AccessibleRole; return S_FALSE; -AccObjectManagerAgent* CMAccessible::g_pAgent = NULL; +AccObjectManagerAgent* CMAccessible::g_pAgent = nullptr; CMAccessible::CMAccessible(): -m_pszName(NULL), -m_pszValue(NULL), -m_pszActionDescription(NULL), +m_pszName(nullptr), +m_pszValue(nullptr), +m_pszActionDescription(nullptr), m_iRole(0x00), m_dState(0x00), -m_pszDescription(NULL), -m_pIParent(NULL), +m_pszDescription(nullptr), +m_pIParent(nullptr), m_dChildID(0x00), m_dFocusChildID(UACC_NO_FOCUS), -m_hwnd(NULL), +m_hwnd(nullptr), m_isDestroy(FALSE), m_bRequiresSave(FALSE) { @@ -190,32 +190,32 @@ CMAccessible::~CMAccessible() { SolarMutexGuard g; - if(m_pszName!=NULL) + if(m_pszName!=nullptr) { SAFE_SYSFREESTRING(m_pszName); - m_pszName=NULL; + m_pszName=nullptr; } - if(m_pszValue!=NULL) + if(m_pszValue!=nullptr) { SAFE_SYSFREESTRING(m_pszValue); - m_pszValue=NULL; + m_pszValue=nullptr; } - if(m_pszDescription!=NULL) + if(m_pszDescription!=nullptr) { SAFE_SYSFREESTRING(m_pszDescription); - m_pszDescription=NULL; + m_pszDescription=nullptr; } - if(m_pszActionDescription!=NULL) + if(m_pszActionDescription!=nullptr) { SAFE_SYSFREESTRING(m_pszActionDescription); - m_pszActionDescription=NULL; + m_pszActionDescription=nullptr; } if(m_pIParent) { m_pIParent->Release(); - m_pIParent=NULL; + m_pIParent=nullptr; } m_pEnumVar->Release(); m_containedObjects.clear(); @@ -236,7 +236,7 @@ STDMETHODIMP CMAccessible::get_accParent(IDispatch **ppdispParent) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(ppdispParent == NULL) + if(ppdispParent == nullptr) { return E_INVALIDARG; } @@ -249,7 +249,7 @@ STDMETHODIMP CMAccessible::get_accParent(IDispatch **ppdispParent) } else if(m_hwnd) { - HRESULT hr = AccessibleObjectFromWindow(m_hwnd, OBJID_WINDOW, IID_IAccessible, (void**)ppdispParent); + HRESULT hr = AccessibleObjectFromWindow(m_hwnd, OBJID_WINDOW, IID_IAccessible, reinterpret_cast(ppdispParent)); if( ! SUCCEEDED( hr ) || ! ppdispParent ) { return S_FALSE; @@ -273,7 +273,7 @@ STDMETHODIMP CMAccessible::get_accChildCount(long *pcountChildren) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pcountChildren == NULL) + if(pcountChildren == nullptr) { return E_INVALIDARG; } @@ -307,7 +307,7 @@ STDMETHODIMP CMAccessible::get_accChild(VARIANT varChild, IDispatch **ppdispChil ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(ppdispChild == NULL) + if(ppdispChild == nullptr) { return E_INVALIDARG; } @@ -321,7 +321,7 @@ STDMETHODIMP CMAccessible::get_accChild(VARIANT varChild, IDispatch **ppdispChil return S_OK; } *ppdispChild = GetChildInterface(varChild.lVal); - if((*ppdispChild) == NULL) + if((*ppdispChild) == nullptr) return E_FAIL; (*ppdispChild)->AddRef(); return S_OK; @@ -345,7 +345,7 @@ STDMETHODIMP CMAccessible::get_accName(VARIANT varChild, BSTR *pszName) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pszName == NULL) + if(pszName == nullptr) { return E_INVALIDARG; } @@ -384,7 +384,7 @@ STDMETHODIMP CMAccessible::get_accValue(VARIANT varChild, BSTR *pszValue) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if( pszValue == NULL ) + if( pszValue == nullptr ) { return E_INVALIDARG; } @@ -395,7 +395,7 @@ STDMETHODIMP CMAccessible::get_accValue(VARIANT varChild, BSTR *pszValue) if(m_dState & STATE_SYSTEM_PROTECTED) return E_ACCESSDENIED; - if ( m_pszValue !=NULL && wcslen(m_pszValue) == 0 ) + if ( m_pszValue !=nullptr && wcslen(m_pszValue) == 0 ) return S_OK; SAFE_SYSFREESTRING(*pszValue); @@ -429,7 +429,7 @@ STDMETHODIMP CMAccessible::get_accDescription(VARIANT varChild, BSTR *pszDescrip ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pszDescription == NULL) + if(pszDescription == nullptr) { return E_INVALIDARG; } @@ -468,7 +468,7 @@ STDMETHODIMP CMAccessible::get_accRole(VARIANT varChild, VARIANT *pvarRole) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarRole == NULL) + if(pvarRole == nullptr) { return E_INVALIDARG; } @@ -519,7 +519,7 @@ STDMETHODIMP CMAccessible::get_accState(VARIANT varChild, VARIANT *pvarState) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarState == NULL) + if(pvarState == nullptr) { return E_INVALIDARG; } @@ -621,7 +621,7 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe ISDESTROY() // #CHECK# - if(pszKeyboardShortcut == NULL) + if(pszKeyboardShortcut == nullptr) { return E_INVALIDARG; } @@ -678,7 +678,7 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe } } - AccessibleRelation *paccRelation = NULL; + AccessibleRelation *paccRelation = nullptr; AccessibleRelation accRelation; for(int i=0; i > xTargets = paccRelation->TargetSet; Reference pRAcc = xTargets[0]; - XAccessible* pXAcc = (XAccessible*)pRAcc.get(); + XAccessible* pXAcc = static_cast(pRAcc.get()); Reference pRLebelContext = pXAcc->getAccessibleContext(); if(!pRLebelContext.is()) @@ -704,7 +704,7 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe pRrelationSet = pRLebelContext->getAccessibleRelationSet(); nRelCount = pRrelationSet->getRelationCount(); - paccRelation = NULL; + paccRelation = nullptr; for(int j=0; jgetRelation(j).RelationType == 5 ) @@ -718,7 +718,7 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe { xTargets = paccRelation->TargetSet; pRAcc = xTargets[0]; - if (m_xAccessible.get() != (XAccessible*)pRAcc.get()) + if (m_xAccessible.get() != static_cast(pRAcc.get())) return S_FALSE; } @@ -775,7 +775,7 @@ STDMETHODIMP CMAccessible::get_accFocus(VARIANT *pvarChild) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarChild == NULL) + if(pvarChild == nullptr) { return E_INVALIDARG; } @@ -787,7 +787,7 @@ STDMETHODIMP CMAccessible::get_accFocus(VARIANT *pvarChild) //if the descendant of current object has focus indicated by m_dFocusChildID, return the IDispatch of this focused object else { - IMAccessible* pIMAcc = NULL; + IMAccessible* pIMAcc = nullptr; g_pAgent->GetIAccessibleFromResID(m_dFocusChildID,&pIMAcc); pIMAcc->AddRef(); pvarChild->vt = VT_DISPATCH; @@ -814,7 +814,7 @@ STDMETHODIMP CMAccessible::get_accSelection(VARIANT *pvarChildren) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarChildren == NULL) + if(pvarChildren == nullptr) { return E_INVALIDARG; } @@ -863,7 +863,7 @@ STDMETHODIMP CMAccessible::accLocation(long *pxLeft, long *pyTop, long *pcxWidth ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pxLeft == NULL || pyTop == NULL || pcxWidth == NULL || pcyHeight == NULL) + if(pxLeft == nullptr || pyTop == nullptr || pcxWidth == nullptr || pcyHeight == nullptr) { return E_INVALIDARG; } @@ -921,7 +921,7 @@ STDMETHODIMP CMAccessible::accNavigate(long navDir, VARIANT varStart, VARIANT *p ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarEndUpAt == NULL) + if(pvarEndUpAt == nullptr) { return E_INVALIDARG; } @@ -963,7 +963,7 @@ STDMETHODIMP CMAccessible::accHitTest(long xLeft, long yTop, VARIANT *pvarChild) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarChild == NULL) + if(pvarChild == nullptr) { return E_INVALIDARG; } @@ -981,7 +981,7 @@ STDMETHODIMP CMAccessible::accHitTest(long xLeft, long yTop, VARIANT *pvarChild) nCount = pRContext->getAccessibleChildCount(); if(nCount > 256) return E_FAIL; - IMAccessible* child = NULL; + IMAccessible* child = nullptr; for( i = 0; iGetIAccessibleFromResID(dChildID,&pIMAcc); return pIMAcc; } - return NULL; + return nullptr; } else { if (!m_xAccessible.is()) - return NULL; + return nullptr; Reference const pRContext = m_xAccessible->getAccessibleContext(); if( !pRContext.is() ) - return NULL; + return nullptr; if(dChildID<1 || dChildID>pRContext->getAccessibleChildCount()) - return NULL; + return nullptr; - IAccessible* pChild = NULL; + IAccessible* pChild = nullptr; Reference< XAccessible > pXChild = pRContext->getAccessibleChild(dChildID-1); BOOL isGet = get_IAccessibleFromXAccessible(pXChild.get(), &pChild); @@ -1395,12 +1395,12 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test if(isGet) { - IMAccessible* pIMAcc = (IMAccessible*)pChild; + IMAccessible* pIMAcc = static_cast(pChild); return pIMAcc; } } - return NULL; + return nullptr; } /** @@ -1424,21 +1424,21 @@ IMAccessible* CMAccessible::GetNavigateChildForDM(VARIANT varCur, short flags) { XAccessibleContext* pXContext = GetContextByXAcc(m_xAccessible.get()); - if(pXContext==NULL) + if(pXContext==nullptr) { - return NULL; + return nullptr; } int count = pXContext->getAccessibleChildCount(); if(count<1) { - return NULL; + return nullptr; } - IMAccessible* pCurChild = NULL; - XAccessible* pChildXAcc = NULL; + IMAccessible* pCurChild = nullptr; + XAccessible* pChildXAcc = nullptr; Reference pRChildXAcc; - XAccessibleContext* pChildContext = NULL; + XAccessibleContext* pChildContext = nullptr; int index = 0,delta=0; switch(flags) { @@ -1451,19 +1451,19 @@ IMAccessible* CMAccessible::GetNavigateChildForDM(VARIANT varCur, short flags) case DM_NEXTCHILD: case DM_PREVCHILD: pCurChild = GetChildInterface(varCur.lVal); - if(pCurChild==NULL) + if(pCurChild==nullptr) { - return NULL; + return nullptr; } pCurChild->GetUNOInterface(reinterpret_cast(&pChildXAcc)); - if(pChildXAcc==NULL) + if(pChildXAcc==nullptr) { - return NULL; + return nullptr; } pChildContext = GetContextByXAcc(pChildXAcc); - if(pChildContext == NULL) + if(pChildContext == nullptr) { - return NULL; + return nullptr; } delta = (flags==DM_NEXTCHILD)?1:-1; //currently, getAccessibleIndexInParent is error in UNO for @@ -1481,7 +1481,7 @@ IMAccessible* CMAccessible::GetNavigateChildForDM(VARIANT varCur, short flags) if(!pRChildXAcc.is()) { - return NULL; + return nullptr; } pChildXAcc = pRChildXAcc.get(); g_pAgent->InsertAccObj(pChildXAcc, m_xAccessible.get()); @@ -1505,7 +1505,7 @@ HRESULT CMAccessible::GetFirstChild(VARIANT varStart,VARIANT* pvarEndUpAt) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarEndUpAt == NULL) + if(pvarEndUpAt == nullptr) { return E_INVALIDARG; } @@ -1542,7 +1542,7 @@ HRESULT CMAccessible::GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarEndUpAt == NULL) + if(pvarEndUpAt == nullptr) { return E_INVALIDARG; } @@ -1613,7 +1613,7 @@ HRESULT CMAccessible::GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pvarEndUpAt == NULL) + if(pvarEndUpAt == nullptr) { return E_INVALIDARG; } @@ -1652,7 +1652,7 @@ STDMETHODIMP CMAccessible::get_nRelations( long __RPC_FAR *nRelations) ISDESTROY() // #CHECK# - if(nRelations == NULL) + if(nRelations == nullptr) { return E_INVALIDARG; } @@ -1682,7 +1682,7 @@ STDMETHODIMP CMAccessible::get_relation( long relationIndex, IAccessibleRelation ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(relation == NULL) + if(relation == nullptr) { return E_INVALIDARG; } @@ -1694,10 +1694,10 @@ STDMETHODIMP CMAccessible::get_relation( long relationIndex, IAccessibleRelation long nMax = 0; get_nRelations(&nMax); - *relation = (IAccessibleRelation*)::CoTaskMemAlloc(sizeof(IAccessibleRelation)); + *relation = static_cast(::CoTaskMemAlloc(sizeof(IAccessibleRelation))); // #CHECK Memory Allocation# - if(*relation == NULL) + if(*relation == nullptr) { return E_FAIL; } @@ -1712,13 +1712,13 @@ STDMETHODIMP CMAccessible::get_relation( long relationIndex, IAccessibleRelation return E_FAIL; } - IAccessibleRelation* pRelation = NULL; + IAccessibleRelation* pRelation = nullptr; HRESULT hr = createInstance(IID_IAccessibleRelation, &pRelation); if(SUCCEEDED(hr)) { - IUNOXWrapper* wrapper = NULL; - hr = pRelation->QueryInterface(IID_IUNOXWrapper, (void**)&wrapper); + IUNOXWrapper* wrapper = nullptr; + hr = pRelation->QueryInterface(IID_IUNOXWrapper, reinterpret_cast(&wrapper)); if(SUCCEEDED(hr)) { AccessibleRelation accRelation = pRrelationSet->getRelation(relationIndex); @@ -1745,7 +1745,7 @@ STDMETHODIMP CMAccessible::get_relations( long, IAccessibleRelation __RPC_FAR *_ ISDESTROY() // #CHECK# - if(relation == NULL || nRelations == NULL) + if(relation == nullptr || nRelations == nullptr) { return E_INVALIDARG; } @@ -1764,23 +1764,23 @@ STDMETHODIMP CMAccessible::get_relations( long, IAccessibleRelation __RPC_FAR *_ long nCount = pRrelationSet->getRelationCount(); - *relation = (IAccessibleRelation*)::CoTaskMemAlloc(nCount*sizeof(IAccessibleRelation)); + *relation = static_cast(::CoTaskMemAlloc(nCount*sizeof(IAccessibleRelation))); // #CHECK Memory Allocation# - if(*relation == NULL) + if(*relation == nullptr) { return E_FAIL; } for(int i=0; i(IID_IAccessibleRelation, &pRelation); if(SUCCEEDED(hr)) { - IUNOXWrapper* wrapper = NULL; - hr = pRelation->QueryInterface(IID_IUNOXWrapper, (void**)&wrapper); + IUNOXWrapper* wrapper = nullptr; + hr = pRelation->QueryInterface(IID_IUNOXWrapper, reinterpret_cast(&wrapper)); if(SUCCEEDED(hr)) { AccessibleRelation accRelation = pRrelationSet->getRelation(i); @@ -1820,13 +1820,13 @@ STDMETHODIMP CMAccessible:: get_nActions(long __RPC_FAR *nActions) { ISDESTROY() // #CHECK# - if(nActions == NULL) + if(nActions == nullptr) { return E_INVALIDARG; } *nActions = 0L; - IAccessibleAction* pAcc = NULL; - HRESULT hr = QueryInterface(IID_IAccessibleAction, (void**)&pAcc); + IAccessibleAction* pAcc = nullptr; + HRESULT hr = QueryInterface(IID_IAccessibleAction, reinterpret_cast(&pAcc)); if( hr == S_OK ) { pAcc->nActions(nActions); @@ -1856,9 +1856,9 @@ STDMETHODIMP CMAccessible:: scrollTo(enum IA2ScrollType) static XAccessible* getTheParentOfMember(XAccessible* pXAcc) { // #CHECK# - if(pXAcc == NULL) + if(pXAcc == nullptr) { - return NULL; + return nullptr; } Reference pRContext = pXAcc->getAccessibleContext(); Reference pRrelationSet = pRContext->getAccessibleRelationSet(); @@ -1869,10 +1869,10 @@ static XAccessible* getTheParentOfMember(XAccessible* pXAcc) if(accRelation.RelationType == 7) { Sequence< Reference< XInterface > > xTargets = accRelation.TargetSet; - return (XAccessible*)xTargets[0].get(); + return static_cast(xTargets[0].get()); } } - return NULL; + return nullptr; } STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FAR *groupLevel,long __RPC_FAR *similarItemsInGroup,long __RPC_FAR *positionInGroup) @@ -1882,7 +1882,7 @@ STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FAR *groupLevel,long __ ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(groupLevel == NULL || similarItemsInGroup == NULL || positionInGroup == NULL) + if(groupLevel == nullptr || similarItemsInGroup == nullptr || positionInGroup == nullptr) { return E_INVALIDARG; } @@ -1944,7 +1944,7 @@ STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FAR *groupLevel,long __ for(int j=0; jgetAccessibleChildCount(); j++) { if( getTheParentOfMember(pRParentContext->getAccessibleChild(j).get()) - == (XAccessible*)pRAcc.get() && + == static_cast(pRAcc.get()) && pRParentContext->getAccessibleChild(j)->getAccessibleContext()->getAccessibleRole() == RADIO_BUTTON) number++; if (pRParentContext->getAccessibleChild(j).get() == m_xAccessible.get()) @@ -2065,7 +2065,7 @@ STDMETHODIMP CMAccessible:: get_uniqueID(long __RPC_FAR *uniqueID) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(uniqueID == NULL) + if(uniqueID == nullptr) { return E_INVALIDARG; } @@ -2082,7 +2082,7 @@ STDMETHODIMP CMAccessible:: get_windowHandle(HWND __RPC_FAR *windowHandle) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(windowHandle == NULL) + if(windowHandle == nullptr) { return E_INVALIDARG; } @@ -2090,16 +2090,16 @@ STDMETHODIMP CMAccessible:: get_windowHandle(HWND __RPC_FAR *windowHandle) HWND nHwnd = m_hwnd; IAccessible* pParent = m_pIParent; CMAccessible* pChild = this; - while((nHwnd==0) && pParent) + while((nHwnd==nullptr) && pParent) { - pChild = (CMAccessible*)pParent; + pChild = static_cast(pParent); if(pChild) { - pParent = (IAccessible*)pChild->m_pIParent; - nHwnd = (HWND)pChild->m_hwnd; + pParent = static_cast(pChild->m_pIParent); + nHwnd = pChild->m_hwnd; } else - pParent = NULL; + pParent = nullptr; } *windowHandle = nHwnd; @@ -2116,12 +2116,12 @@ STDMETHODIMP CMAccessible:: get_windowHandle(HWND __RPC_FAR *windowHandle) XAccessibleContext* CMAccessible::GetContextByXAcc( XAccessible* pXAcc ) { Reference< XAccessibleContext > pRContext; - if( pXAcc == NULL) - return NULL; + if( pXAcc == nullptr) + return nullptr; pRContext = pXAcc->getAccessibleContext(); if( !pRContext.is() ) - return NULL; + return nullptr; return pRContext.get(); } @@ -2135,7 +2135,7 @@ XAccessibleContext* CMAccessible::GetContextByXAcc( XAccessible* pXAcc ) Reference< XAccessibleSelection > CMAccessible::GetSelection() { if (!m_xAccessible.is()) - return NULL; + return nullptr; Reference const pRContext = m_xAccessible->getAccessibleContext(); if(pRContext.is()) @@ -2143,7 +2143,7 @@ Reference< XAccessibleSelection > CMAccessible::GetSelection() Reference< XAccessibleSelection > pRSelection(pRContext,UNO_QUERY); return pRSelection; } - return NULL; + return nullptr; } /** @@ -2158,7 +2158,7 @@ HRESULT CMAccessible::SelectChild(XAccessible* pItem) ISDESTROY() XAccessibleContext* pParentContext = GetContextByXAcc(m_xAccessible.get()); XAccessibleContext* pContext = GetContextByXAcc( pItem ); - if( pParentContext == NULL || pContext == NULL ) + if( pParentContext == nullptr || pContext == nullptr ) return E_FAIL; Reference< XAccessibleSelection > pRSelection = GetSelection(); @@ -2184,7 +2184,7 @@ HRESULT CMAccessible::DeSelectChild(XAccessible* pItem) XAccessibleContext* pParentContext = GetContextByXAcc(m_xAccessible.get()); ; XAccessibleContext* pContext = GetContextByXAcc( pItem ); - if( pParentContext == NULL || pContext == NULL ) + if( pParentContext == nullptr || pContext == nullptr ) return E_INVALIDARG; Reference< XAccessibleSelection > pRSelection = GetSelection(); @@ -2210,7 +2210,7 @@ HRESULT CMAccessible::SelectMutipleChidren( XAccessible** pItem,int size ) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pItem == NULL) + if(pItem == nullptr) { return E_INVALIDARG; } @@ -2235,7 +2235,7 @@ HRESULT CMAccessible::DeSelectMutipleChildren( XAccessible** pItem,int size ) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pItem == NULL) + if(pItem == nullptr) { return E_INVALIDARG; } @@ -2309,15 +2309,15 @@ STDMETHODIMP CMAccessible::accSelect(long flagsSelect, VARIANT varChild) pSelectAcc = GetChildInterface(varChild.lVal); } - if( pSelectAcc == NULL ) + if( pSelectAcc == nullptr ) return E_INVALIDARG; if( flagsSelect&SELFLAG_TAKEFOCUS ) { - XAccessible * pTempUNO = 0; + XAccessible * pTempUNO = nullptr; pSelectAcc->GetUNOInterface(reinterpret_cast(&pTempUNO)); - if( pTempUNO == NULL ) + if( pTempUNO == nullptr ) return NULL; Reference pRContext = pTempUNO->getAccessibleContext(); @@ -2374,7 +2374,7 @@ STDMETHODIMP CMAccessible::GetUNOInterface(hyper * pXAcc) { // internal IMAccessible - no mutex meeded - if(pXAcc == NULL) + if(pXAcc == nullptr) return E_INVALIDARG; *pXAcc = reinterpret_cast(m_xAccessible.get()); @@ -2408,7 +2408,7 @@ HRESULT STDMETHODCALLTYPE CMAccessible::get_accDefaultAction(VARIANT varChild, B ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(pszDefaultAction == NULL) + if(pszDefaultAction == nullptr) { return E_INVALIDARG; } @@ -2482,7 +2482,7 @@ STDMETHODIMP CMAccessible::Put_ActionDescription( const OLECHAR* szAction) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(szAction == NULL) + if(szAction == nullptr) { return E_INVALIDARG; } @@ -2573,7 +2573,7 @@ static AggMapEntry g_CMAccessible_AggMap[] = { { &IID_IAccessibleValue, &createAggInstance, XI_VALUE }, { &IID_IAccessibleHypertext, &createAggInstance, XI_HYPERTEXT }, { &IID_IAccessibleHyperlink, &createAggInstance, XI_HYPERLINK }, - { 0, 0, 0 }, + { nullptr, nullptr, 0 }, }; @@ -2598,7 +2598,7 @@ HRESULT WINAPI CMAccessible::SmartQI(void* /*pv*/, REFIID iid, void** ppvObject) { SolarMutexGuard g; - XInterface* pXI = NULL; + XInterface* pXI = nullptr; BOOL bFound = GetXInterfaceFromXAccessible(m_xAccessible.get(), &pXI, pMap->XIFIndex); if(!bFound) @@ -2617,9 +2617,9 @@ HRESULT WINAPI CMAccessible::SmartQI(void* /*pv*/, REFIID iid, void** ppvObject) assert(hr == S_OK); if(hr == S_OK) { - m_containedObjects.insert(XGUIDToComObjHash::value_type(*pMap->piid,(IUnknown*)*ppvObject)); - IUNOXWrapper* wrapper = NULL; - ((IUnknown*)*ppvObject)->QueryInterface(IID_IUNOXWrapper, (void**)&wrapper); + m_containedObjects.insert(XGUIDToComObjHash::value_type(*pMap->piid,static_cast(*ppvObject))); + IUNOXWrapper* wrapper = nullptr; + static_cast(*ppvObject)->QueryInterface(IID_IUNOXWrapper, reinterpret_cast(&wrapper)); if(wrapper) { wrapper->put_XInterface( @@ -2645,7 +2645,7 @@ CMAccessible::get_IAccessibleFromXAccessible(XAccessible * pXAcc, IAccessible ** ENTER_PROTECTED_BLOCK // #CHECK# - if(ppIA == NULL) + if(ppIA == nullptr) { return E_INVALIDARG; } @@ -2664,7 +2664,7 @@ CMAccessible::get_IAccessibleFromXAccessible(XAccessible * pXAcc, IAccessible ** void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar) { // #CHECK# - if(pChar == NULL) + if(pChar == nullptr) return; switch(pAny.getValueTypeClass()) @@ -2847,7 +2847,7 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar) void CMAccessible::get_OLECHAR4Numbering(const Any& pAny, short numberingLevel,const OUString& numberingPrefix,OLECHAR* pChar) { - if(pChar == NULL) + if(pChar == nullptr) return; Reference< css::container::XIndexReplace > pXIndex; if((pAny>>=pXIndex) && (numberingLevel !=-1))//numbering level is -1,means invalid value @@ -2967,7 +2967,7 @@ void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pv pvData->vt = VT_BSTR; ::rtl::OUString val; rAnyVal >>= val; - pvData->bstrVal = SysAllocString((OLECHAR *)val.getStr()); + pvData->bstrVal = SysAllocString(val.getStr()); break; } @@ -2988,9 +2988,9 @@ void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pv { if(pXAcc.is()) { - IAccessible* pIAcc = NULL; + IAccessible* pIAcc = nullptr; get_IAccessibleFromXAccessible(pXAcc.get(), &pIAcc); - if(pIAcc == NULL) + if(pIAcc == nullptr) { Reference< XAccessibleContext > pXAccContext = pXAcc->getAccessibleContext(); g_pAgent->InsertAccObj(pXAcc.get(),pXAccContext->getAccessibleParent().get()); @@ -3001,7 +3001,7 @@ void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pv pIAcc->AddRef(); pvData->vt = VT_UNKNOWN; - pvData->pdispVal = (IAccessible2*)pIAcc; + pvData->pdispVal = static_cast(pIAcc); break; } } @@ -3037,7 +3037,7 @@ STDMETHODIMP CMAccessible::Get_XAccChildID(long* childID) { // internal IMAccessible - no mutex meeded - if(childID == NULL) + if(childID == nullptr) { return E_FAIL; } @@ -3111,7 +3111,7 @@ STDMETHODIMP CMAccessible:: get_indexInParent( long __RPC_FAR *accParentIndex) ENTER_PROTECTED_BLOCK ISDESTROY() // #CHECK# - if(accParentIndex == NULL) + if(accParentIndex == nullptr) return E_INVALIDARG; if (!m_xContext.is()) @@ -3127,82 +3127,29 @@ STDMETHODIMP CMAccessible:: get_locale( IA2Locale __RPC_FAR *locale ) { ENTER_PROTECTED_BLOCK ISDESTROY() - if(locale == NULL) + if(locale == nullptr) return E_INVALIDARG; if (!m_xContext.is()) return E_FAIL; css::lang::Locale unoLoc = m_xContext.get()->getLocale(); - locale->language = SysAllocString((OLECHAR*)unoLoc.Language.getStr()); - locale->country = SysAllocString((OLECHAR*)unoLoc.Country.getStr()); - locale->variant = SysAllocString((OLECHAR*)unoLoc.Variant.getStr()); + locale->language = SysAllocString(unoLoc.Language.getStr()); + locale->country = SysAllocString(unoLoc.Country.getStr()); + locale->variant = SysAllocString(unoLoc.Variant.getStr()); return S_OK; LEAVE_PROTECTED_BLOCK } -DWORD GetMSAAStateFromUNO(short xState) -{ - DWORD IState = STATE_SYSTEM_UNAVAILABLE; - switch( xState ) - { - case /*AccessibleStateType::*/AccessibleStateType::BUSY: - IState = STATE_SYSTEM_BUSY; - break; - case /*AccessibleStateType::*/AccessibleStateType::CHECKED: - IState = STATE_SYSTEM_CHECKED; - break; - case /*AccessibleStateType::*/AccessibleStateType::DEFUNC: - IState = STATE_SYSTEM_UNAVAILABLE; - break; - case /*AccessibleStateType::*/AccessibleStateType::EXPANDED: - IState = STATE_SYSTEM_EXPANDED; - break; - case /*AccessibleStateType::*/AccessibleStateType::FOCUSABLE: - IState = STATE_SYSTEM_FOCUSABLE; - break; - case /*AccessibleStateType::*/AccessibleStateType::FOCUSED: - IState = STATE_SYSTEM_FOCUSED; - break; - case /*AccessibleStateType::*/AccessibleStateType::INDETERMINATE: - IState = STATE_SYSTEM_MIXED; - break; - case /*AccessibleStateType::*/AccessibleStateType::MULTI_SELECTABLE: - IState = STATE_SYSTEM_MULTISELECTABLE; - break; - case /*AccessibleStateType::*/AccessibleStateType::PRESSED: - IState = STATE_SYSTEM_PRESSED; - break; - case /*AccessibleStateType::*/AccessibleStateType::RESIZABLE: - IState = STATE_SYSTEM_SIZEABLE; - break; - case /*AccessibleStateType::*/AccessibleStateType::SELECTABLE: - IState = STATE_SYSTEM_SELECTABLE; - break; - case /*AccessibleStateType::*/AccessibleStateType::SELECTED: - IState = STATE_SYSTEM_SELECTED; - break; - case /*AccessibleStateType::*/AccessibleStateType::ARMED: - IState = STATE_SYSTEM_FOCUSED; - break; - case /*AccessibleStateType::*/AccessibleStateType::EXPANDABLE: - IState = STATE_SYSTEM_COLLAPSED; - break; - default: - break; - } - return IState; -} - STDMETHODIMP CMAccessible:: get_appName( BSTR __RPC_FAR *name) { SolarMutexGuard g; ENTER_PROTECTED_BLOCK ISDESTROY() - if(name == NULL) + if(name == nullptr) return E_INVALIDARG; *name = SysAllocString(OLESTR("Hannover")); @@ -3215,7 +3162,7 @@ STDMETHODIMP CMAccessible:: get_appVersion(BSTR __RPC_FAR *version) ENTER_PROTECTED_BLOCK ISDESTROY() - if(version == NULL) + if(version == nullptr) return E_INVALIDARG; *version=SysAllocString(OLESTR("3.0")); return S_OK; @@ -3227,7 +3174,7 @@ STDMETHODIMP CMAccessible:: get_toolkitName(BSTR __RPC_FAR *name) ENTER_PROTECTED_BLOCK ISDESTROY() - if(name == NULL) + if(name == nullptr) return E_INVALIDARG; *name = SysAllocString(OLESTR(" ")); return S_OK; @@ -3239,7 +3186,7 @@ STDMETHODIMP CMAccessible:: get_toolkitVersion(BSTR __RPC_FAR *version) ENTER_PROTECTED_BLOCK ISDESTROY() - if(version == NULL) + if(version == nullptr) return E_INVALIDARG; *version = SysAllocString(OLESTR(" ")); return S_OK; @@ -3276,7 +3223,7 @@ STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr) if(*pAttr) SAFE_SYSFREESTRING(*pAttr); - *pAttr = SysAllocString((OLECHAR *)val.getStr()); + *pAttr = SysAllocString(val.getStr()); return S_OK; } diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h index e2152a34cb72..4fe80a832a75 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.h +++ b/winaccessibility/source/UAccCOM/MAccessible.h @@ -77,85 +77,92 @@ public: COM_INTERFACE_ENTRY(IDispatch) COM_INTERFACE_ENTRY(IAccessibleApplication) COM_INTERFACE_ENTRY(IServiceProvider) - COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,_SmartQI) + COM_INTERFACE_ENTRY_FUNC_BLIND(NULL,SmartQI_) +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif // IMAccessible - STDMETHOD(put_accValue)(VARIANT varChild,BSTR szValue); - STDMETHOD(put_accName)(VARIANT varChild,BSTR szName); - STDMETHOD(accDoDefaultAction)(VARIANT varChild); - STDMETHOD(accHitTest)(long xLeft,long yTop,VARIANT *pvarChild); - STDMETHOD(accNavigate)(long navDir,VARIANT varStart,VARIANT *pvarEndUpAt); - STDMETHOD(accLocation)(long *pxLeft,long *pyTop,long *pcxWidth,long *pcyHeight,VARIANT varChild); - STDMETHOD(accSelect)(long flagsSelect,VARIANT varChild); - STDMETHOD(get_accDefaultAction)( VARIANT varChild,BSTR *pszDefaultAction); - STDMETHOD(get_accSelection)(VARIANT *pvarChildren); - STDMETHOD(get_accFocus)(VARIANT *pvarChild); - STDMETHOD(get_accKeyboardShortcut)( VARIANT varChild,BSTR *pszKeyboardShortcut); - STDMETHOD(get_accHelpTopic)(BSTR *pszHelpFile,VARIANT varChild,long *pidTopic); - STDMETHOD(get_accHelp)(VARIANT varChild,BSTR *pszHelp); - STDMETHOD(get_accState)(VARIANT varChild,VARIANT *pvarState); - STDMETHOD(get_accRole)(VARIANT varChild,VARIANT *pvarRole); - STDMETHOD(get_accDescription)(VARIANT varChild,BSTR *pszDescription); - STDMETHOD(get_accValue)( VARIANT varChild,BSTR *pszValue); - STDMETHOD(get_accName)(VARIANT varChild,BSTR *pszName); - STDMETHOD(get_accChild)(VARIANT varChild,IDispatch **ppdispChild); - STDMETHOD(get_accChildCount)(long *pcountChildren); - STDMETHOD(get_accParent)( IDispatch **ppdispParent); + STDMETHOD(put_accValue)(VARIANT varChild,BSTR szValue) override; + STDMETHOD(put_accName)(VARIANT varChild,BSTR szName) override; + STDMETHOD(accDoDefaultAction)(VARIANT varChild) override; + STDMETHOD(accHitTest)(long xLeft,long yTop,VARIANT *pvarChild) override; + STDMETHOD(accNavigate)(long navDir,VARIANT varStart,VARIANT *pvarEndUpAt) override; + STDMETHOD(accLocation)(long *pxLeft,long *pyTop,long *pcxWidth,long *pcyHeight,VARIANT varChild) override; + STDMETHOD(accSelect)(long flagsSelect,VARIANT varChild) override; + STDMETHOD(get_accDefaultAction)( VARIANT varChild,BSTR *pszDefaultAction) override; + STDMETHOD(get_accSelection)(VARIANT *pvarChildren) override; + STDMETHOD(get_accFocus)(VARIANT *pvarChild) override; + STDMETHOD(get_accKeyboardShortcut)( VARIANT varChild,BSTR *pszKeyboardShortcut) override; + STDMETHOD(get_accHelpTopic)(BSTR *pszHelpFile,VARIANT varChild,long *pidTopic) override; + STDMETHOD(get_accHelp)(VARIANT varChild,BSTR *pszHelp) override; + STDMETHOD(get_accState)(VARIANT varChild,VARIANT *pvarState) override; + STDMETHOD(get_accRole)(VARIANT varChild,VARIANT *pvarRole) override; + STDMETHOD(get_accDescription)(VARIANT varChild,BSTR *pszDescription) override; + STDMETHOD(get_accValue)( VARIANT varChild,BSTR *pszValue) override; + STDMETHOD(get_accName)(VARIANT varChild,BSTR *pszName) override; + STDMETHOD(get_accChild)(VARIANT varChild,IDispatch **ppdispChild) override; + STDMETHOD(get_accChildCount)(long *pcountChildren) override; + STDMETHOD(get_accParent)( IDispatch **ppdispParent) override; // methods which are defined only in the IAccessible2 // These methods only declare here, and their implementation bodies are empty now. - STDMETHOD(get_nRelations)( long __RPC_FAR *nRelations) ; - STDMETHOD(get_relation)( long relationIndex, IAccessibleRelation __RPC_FAR *__RPC_FAR *relation) ; - STDMETHOD(get_relations)( long maxRelations, IAccessibleRelation __RPC_FAR *__RPC_FAR *relation, long __RPC_FAR *nRelations) ; - STDMETHOD(role)(long __RPC_FAR *role); + STDMETHOD(get_nRelations)( long __RPC_FAR *nRelations) override; + STDMETHOD(get_relation)( long relationIndex, IAccessibleRelation __RPC_FAR *__RPC_FAR *relation) override; + STDMETHOD(get_relations)( long maxRelations, IAccessibleRelation __RPC_FAR *__RPC_FAR *relation, long __RPC_FAR *nRelations) override; + STDMETHOD(role)(long __RPC_FAR *role) override; STDMETHOD(get_nActions)(long __RPC_FAR *nActions); - STDMETHOD(scrollTo)(enum IA2ScrollType scrollType); - STDMETHOD(scrollToPoint)(enum IA2CoordinateType coordinateType, long x, long y); - STDMETHOD(get_groupPosition)(long __RPC_FAR *groupLevel,long __RPC_FAR *similarItemsInGroup,long __RPC_FAR *positionInGroup); - STDMETHOD(get_states)( AccessibleStates __RPC_FAR *states ); - STDMETHOD(get_extendedRole)( BSTR __RPC_FAR *extendedRole ); - STDMETHOD(get_localizedExtendedRole)( BSTR __RPC_FAR *localizedExtendedRole ); - STDMETHOD(get_nExtendedStates)( long __RPC_FAR *nExtendedStates); - STDMETHOD(get_extendedStates)( long maxExtendedStates, BSTR __RPC_FAR *__RPC_FAR *extendedStates, long __RPC_FAR *nExtendedStates); - STDMETHOD(get_localizedExtendedStates)(long maxLocalizedExtendedStates,BSTR __RPC_FAR *__RPC_FAR *localizedExtendedStates,long __RPC_FAR *nLocalizedExtendedStates); - STDMETHOD(get_uniqueID)(long __RPC_FAR *uniqueID); - STDMETHOD(get_windowHandle)(HWND __RPC_FAR *windowHandle); - STDMETHOD(get_indexInParent)( long __RPC_FAR *accParentIndex ); - STDMETHOD(get_locale)( IA2Locale __RPC_FAR *locale ); - STDMETHOD(get_attributes)(/*[out]*/ BSTR *pAttr); + STDMETHOD(scrollTo)(enum IA2ScrollType scrollType) override; + STDMETHOD(scrollToPoint)(enum IA2CoordinateType coordinateType, long x, long y) override; + STDMETHOD(get_groupPosition)(long __RPC_FAR *groupLevel,long __RPC_FAR *similarItemsInGroup,long __RPC_FAR *positionInGroup) override; + STDMETHOD(get_states)( AccessibleStates __RPC_FAR *states ) override; + STDMETHOD(get_extendedRole)( BSTR __RPC_FAR *extendedRole ) override; + STDMETHOD(get_localizedExtendedRole)( BSTR __RPC_FAR *localizedExtendedRole ) override; + STDMETHOD(get_nExtendedStates)( long __RPC_FAR *nExtendedStates) override; + STDMETHOD(get_extendedStates)( long maxExtendedStates, BSTR __RPC_FAR *__RPC_FAR *extendedStates, long __RPC_FAR *nExtendedStates) override; + STDMETHOD(get_localizedExtendedStates)(long maxLocalizedExtendedStates,BSTR __RPC_FAR *__RPC_FAR *localizedExtendedStates,long __RPC_FAR *nLocalizedExtendedStates) override; + STDMETHOD(get_uniqueID)(long __RPC_FAR *uniqueID) override; + STDMETHOD(get_windowHandle)(HWND __RPC_FAR *windowHandle) override; + STDMETHOD(get_indexInParent)( long __RPC_FAR *accParentIndex ) override; + STDMETHOD(get_locale)( IA2Locale __RPC_FAR *locale ) override; + STDMETHOD(get_attributes)(/*[out]*/ BSTR *pAttr) override; //IServiceProvider. - STDMETHOD(QueryService)(REFGUID guidService, REFIID riid, void** ppvObject); + STDMETHOD(QueryService)(REFGUID guidService, REFIID riid, void** ppvObject) override; //IAccessibleApplication - STDMETHOD(get_appName)(BSTR __RPC_FAR *name); - STDMETHOD(get_appVersion)(BSTR __RPC_FAR *version); - STDMETHOD(get_toolkitName)(BSTR __RPC_FAR *name); - STDMETHOD(get_toolkitVersion)(BSTR __RPC_FAR *version); + STDMETHOD(get_appName)(BSTR __RPC_FAR *name) override; + STDMETHOD(get_appVersion)(BSTR __RPC_FAR *version) override; + STDMETHOD(get_toolkitName)(BSTR __RPC_FAR *name) override; + STDMETHOD(get_toolkitVersion)(BSTR __RPC_FAR *version) override; // methods which are defined only in IMAccessible // These methods are provided for UNO management system. // The UNO management system use these methods to put Accessibility // information to COM. - STDMETHOD(Put_XAccName)(const OLECHAR __RPC_FAR *pszName); - STDMETHOD(Put_XAccRole)(unsigned short pRole); - STDMETHOD(DecreaseState)(DWORD pXSate); - STDMETHOD(IncreaseState)(DWORD pXSate); - STDMETHOD(SetState)(DWORD pXSate); - STDMETHOD(Put_XAccDescription)(const OLECHAR __RPC_FAR *pszDescription); - STDMETHOD(Put_XAccValue)(const OLECHAR __RPC_FAR *pszAccValue); - STDMETHOD(Put_XAccLocation)(const Location sLocation); - STDMETHOD(Put_XAccFocus)(long dChildID); - STDMETHOD(Put_XAccParent)(IMAccessible __RPC_FAR *pIParent); - STDMETHOD(Put_XAccWindowHandle)(HWND hwnd); - STDMETHOD(Put_XAccChildID)(long dChildID); - STDMETHOD(Put_XAccAgent)(hyper pAgent); - STDMETHOD(NotifyDestroy)(BOOL isDestroy); - STDMETHOD(Put_ActionDescription)( const OLECHAR* szAction); - STDMETHOD(SetDefaultAction)(hyper pAction); - STDMETHOD(GetUNOInterface)(hyper*); - STDMETHOD(SetXAccessible)(hyper); + STDMETHOD(Put_XAccName)(const OLECHAR __RPC_FAR *pszName) override; + STDMETHOD(Put_XAccRole)(unsigned short pRole) override; + STDMETHOD(DecreaseState)(DWORD pXSate) override; + STDMETHOD(IncreaseState)(DWORD pXSate) override; + STDMETHOD(SetState)(DWORD pXSate) override; + STDMETHOD(Put_XAccDescription)(const OLECHAR __RPC_FAR *pszDescription) override; + STDMETHOD(Put_XAccValue)(const OLECHAR __RPC_FAR *pszAccValue) override; + STDMETHOD(Put_XAccLocation)(const Location sLocation) override; + STDMETHOD(Put_XAccFocus)(long dChildID) override; + STDMETHOD(Put_XAccParent)(IMAccessible __RPC_FAR *pIParent) override; + STDMETHOD(Put_XAccWindowHandle)(HWND hwnd) override; + STDMETHOD(Put_XAccChildID)(long dChildID) override; + STDMETHOD(Put_XAccAgent)(hyper pAgent) override; + STDMETHOD(NotifyDestroy)(BOOL isDestroy) override; + STDMETHOD(Put_ActionDescription)( const OLECHAR* szAction) override; + STDMETHOD(SetDefaultAction)(hyper pAction) override; + STDMETHOD(GetUNOInterface)(hyper*) override; + STDMETHOD(SetXAccessible)(hyper) override; private: OLECHAR* m_pszName; @@ -207,16 +214,16 @@ private: int size); HRESULT DeSelectMutipleChildren(css::accessibility::XAccessible** pItem, int size); - css::accessibility::XAccessibleContext* GetContextByXAcc( + static css::accessibility::XAccessibleContext* GetContextByXAcc( css::accessibility::XAccessible* pXAcc); css::uno::Reference GetSelection(); // end accSelect implementation methods - BOOL GetXInterfaceFromXAccessible(css::accessibility::XAccessible*, + static BOOL GetXInterfaceFromXAccessible(css::accessibility::XAccessible*, css::uno::XInterface**, int); HRESULT WINAPI SmartQI(void* pv, REFIID iid, void** ppvObject); public: - STDMETHOD(Get_XAccChildID)(/*[out,retval]*/ long* childID); + STDMETHOD(Get_XAccChildID)(/*[out,retval]*/ long* childID) override; // AccObjectManagerAgent is a management object in UNO, here keep its pointer for // the implementation of accNavigate when descendant manage happens for List,Tree, or Table // AccObjectManagerAgent and the following UNO objects XAccessble,XAccessibleSelection, @@ -229,10 +236,10 @@ public: BOOL m_bRequiresSave; XGUIDToComObjHash m_containedObjects; - static HRESULT WINAPI _SmartQI(void* pv, + static HRESULT WINAPI SmartQI_(void* pv, REFIID iid, void** ppvObject, DWORD_PTR) { - return ((CMAccessible*)pv)->SmartQI(pv,iid,ppvObject); + return static_cast(pv)->SmartQI(pv,iid,ppvObject); } static void get_OLECHARFromAny(css::uno::Any& pAny, OLECHAR* pChar); diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index 6a781872f09f..875be227d753 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -115,9 +115,9 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) IMAccessible * UAccCOMCreateInstance() { - IMAccessible * pIMA = 0; + IMAccessible * pIMA = nullptr; HRESULT hr = createInstance(IID_IMAccessible, &pIMA); - return (S_OK == hr) ? pIMA : 0; + return (S_OK == hr) ? pIMA : nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h index e50dd8a2753b..78399c32b7ec 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.h +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h @@ -46,8 +46,8 @@ public: { } // IUNOXWrapper - STDMETHOD(put_XInterface)(hyper pXInterface); - STDMETHOD(put_XSubInterface)(hyper); + STDMETHOD(put_XInterface)(hyper pXInterface) override; + STDMETHOD(put_XSubInterface)(hyper) override; protected: ~CUNOXWrapper() {} diff --git a/winaccessibility/source/UAccCOM/acccommon.h b/winaccessibility/source/UAccCOM/acccommon.h index e900033066df..7e338e05a3bf 100644 --- a/winaccessibility/source/UAccCOM/acccommon.h +++ b/winaccessibility/source/UAccCOM/acccommon.h @@ -25,21 +25,21 @@ struct ltComp { bool operator()(REFGUID rguid1, REFGUID rguid2) const { - if(((PLONG) &rguid1)[0] < ((PLONG) &rguid2)[0]) + if(reinterpret_cast(&rguid1)[0] < reinterpret_cast(&rguid2)[0]) return TRUE; - else if(((PLONG) &rguid1)[0] > ((PLONG) &rguid2)[0]) + else if(reinterpret_cast(&rguid1)[0] > reinterpret_cast(&rguid2)[0]) return FALSE; - if(((PLONG) &rguid1)[1] < ((PLONG) &rguid2)[1]) + if(reinterpret_cast(&rguid1)[1] < reinterpret_cast(&rguid2)[1]) return TRUE; - else if(((PLONG) &rguid1)[1] > ((PLONG) &rguid2)[1]) + else if(reinterpret_cast(&rguid1)[1] > reinterpret_cast(&rguid2)[1]) return FALSE; - if(((PLONG) &rguid1)[2] < ((PLONG) &rguid2)[2]) + if(reinterpret_cast(&rguid1)[2] < reinterpret_cast(&rguid2)[2]) return TRUE; - else if(((PLONG) &rguid1)[2] > ((PLONG) &rguid2)[2]) + else if(reinterpret_cast(&rguid1)[2] > reinterpret_cast(&rguid2)[2]) return FALSE; - if(((PLONG) &rguid1)[3] < ((PLONG) &rguid2)[3]) + if(reinterpret_cast(&rguid1)[3] < reinterpret_cast(&rguid2)[3]) return TRUE; - else if(((PLONG) &rguid1)[3] > ((PLONG) &rguid2)[3]) + else if(reinterpret_cast(&rguid1)[3] > reinterpret_cast(&rguid2)[3]) return FALSE; return FALSE; } @@ -62,7 +62,7 @@ enum DM_NIR { template HRESULT createInstance(REFIID iid, Ifc ** ppIfc) { - return CComCreator< CComObject >::CreateInstance(0, iid, (void**)ppIfc); + return CComCreator< CComObject >::CreateInstance(0, iid, reinterpret_cast(ppIfc)); } #endif diff --git a/winaccessibility/source/UAccCOM/stdafx.h b/winaccessibility/source/UAccCOM/stdafx.h index 6103052d258c..b9a7d3ee9d94 100644 --- a/winaccessibility/source/UAccCOM/stdafx.h +++ b/winaccessibility/source/UAccCOM/stdafx.h @@ -21,8 +21,8 @@ // or project specific include files that are used frequently, // but are changed infrequently -#if !defined(AFX_STDAFX_H__5E2F9072_190F_47C7_8003_4D44FD308CB9__INCLUDED_) -#define AFX_STDAFX_H__5E2F9072_190F_47C7_8003_4D44FD308CB9__INCLUDED_ +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_STDAFX_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_STDAFX_H #if _MSC_VER > 1000 #pragma once diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx index 1949e94cf184..c52f3e3a1d53 100644 --- a/winaccessibility/source/service/AccContainerEventListener.cxx +++ b/winaccessibility/source/service/AccContainerEventListener.cxx @@ -428,7 +428,7 @@ void AccContainerEventListener::HandleValueChangedEvent(Any, Any) pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get()); } -bool AccContainerEventListener::IsEditable(Reference xContext) +bool AccContainerEventListener::IsEditable(Reference const & xContext) { bool ret = false; Reference< XAccessibleStateSet > pRState = xContext->getAccessibleStateSet(); @@ -495,7 +495,7 @@ void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible return; } css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); - if(pAccessibleContext == NULL) + if(pAccessibleContext == nullptr) { return; } @@ -512,7 +512,7 @@ void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible = pAccessibleContext->getAccessibleChild(i); css::accessibility::XAccessible* mpAccessible = mxAccessible.get(); - if(mpAccessible != NULL) + if(mpAccessible != nullptr) { pAgent->UpdateState(mpAccessible); UpdateAllChildrenState(mpAccessible); diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx index 6a3c48f83f6b..a5b608cb7908 100644 --- a/winaccessibility/source/service/AccEventListener.cxx +++ b/winaccessibility/source/service/AccEventListener.cxx @@ -112,7 +112,7 @@ void AccEventListener::HandleDescriptionChangedEvent(Any desc) */ void AccEventListener::HandleBoundrectChangedEvent() { - pAgent->UpdateLocation(m_xAccessible.get()); + AccObjectManagerAgent::UpdateLocation(m_xAccessible.get()); pAgent->NotifyAccEvent(UM_EVENT_BOUNDRECT_CHANGED, m_xAccessible.get()); } diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 1b5a82ef5f7c..4fcc5802651a 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -158,10 +158,10 @@ const short ROLE_TABLE[][2] = AccObject::AccObject(XAccessible* pAcc, AccObjectManagerAgent* pAgent, AccEventListener* pListener) : m_resID (NULL), - m_pParantID (NULL), - m_bShouldDestroy(sal_False), - m_pIMAcc (NULL), - m_pParentObj(NULL), + m_pParantID (nullptr), + m_bShouldDestroy(false), + m_pIMAcc (nullptr), + m_pParentObj(nullptr), m_pListener (pListener), m_xAccRef( pAcc ) { @@ -184,10 +184,10 @@ AccObject::AccObject(XAccessible* pAcc, AccObjectManagerAgent* pAgent, */ AccObject::~AccObject() { - m_pIMAcc = NULL; - m_xAccRef = NULL; - m_xAccActionRef = NULL; - m_xAccContextRef = NULL; + m_pIMAcc = nullptr; + m_xAccRef = nullptr; + m_xAccActionRef = nullptr; + m_xAccContextRef = nullptr; } @@ -231,7 +231,7 @@ void AccObject::DeleteChild( AccObject* pChild ) { m_childrenList.erase(iter); if(m_pIMAcc) - pChild->SetParentObj(NULL); + pChild->SetParentObj(nullptr); } } @@ -271,7 +271,7 @@ void AccObject::UpdateName( ) return; } - if( ( TEXT_FRAME == m_accRole ) && ( m_pParentObj !=NULL )&& ( SCROLL_PANE == m_pParentObj -> m_accRole ) ) + if( ( TEXT_FRAME == m_accRole ) && ( m_pParentObj !=nullptr )&& ( SCROLL_PANE == m_pParentObj -> m_accRole ) ) m_pIMAcc->Put_XAccName( m_pParentObj->m_xAccContextRef->getAccessibleName().getStr() ); //IAccessibility2 Implementation 2009----- if ( PARAGRAPH == m_accRole) @@ -329,7 +329,7 @@ void AccObject::UpdateAction() */ void AccObject::UpdateValue() { - if( NULL == m_pIMAcc || !m_xAccContextRef.is() ) + if( nullptr == m_pIMAcc || !m_xAccContextRef.is() ) { assert(false); return ; @@ -382,7 +382,7 @@ void AccObject::SetValue( Any pAny ) unsigned short pUNumberString[100]; memset( pUNumberString, 0 , sizeof( pUNumberString) ); - if( NULL == m_pIMAcc || !m_xAccContextRef.is() ) + if( nullptr == m_pIMAcc || !m_xAccContextRef.is() ) { assert(false); return ; @@ -414,7 +414,7 @@ void AccObject::SetValue( Any pAny ) break ; // Added by Li Xing, only the checkbox in tree should have the value. case CHECK_BOX: - if( ( m_pParentObj !=NULL ) && (TREE == m_pParentObj->m_accRole || TREE_ITEM == m_pParentObj->m_accRole )) + if( ( m_pParentObj !=nullptr ) && (TREE == m_pParentObj->m_accRole || TREE_ITEM == m_pParentObj->m_accRole )) m_pIMAcc->Put_XAccValue( GetMAccessibleValueFromAny(pAny).getStr() ); break; default: @@ -429,7 +429,7 @@ void AccObject::SetValue( Any pAny ) { ::rtl::OUString strValue; - if(NULL == m_pIMAcc) + if(nullptr == m_pIMAcc) return strValue; if(pAny.getValueType() == cppu::UnoType::get() ) @@ -498,7 +498,7 @@ void AccObject::SetValue( Any pAny ) */ void AccObject::SetName( Any pAny) { - if( NULL == m_pIMAcc ) + if( nullptr == m_pIMAcc ) return ; m_pIMAcc->Put_XAccName( GetMAccessibleValueFromAny(pAny).getStr() ); @@ -512,7 +512,7 @@ void AccObject::SetName( Any pAny) */ void AccObject::SetDescription( Any pAny ) { - if( NULL == m_pIMAcc ) + if( nullptr == m_pIMAcc ) return ; m_pIMAcc->Put_XAccDescription( GetMAccessibleValueFromAny(pAny).getStr() ); } @@ -524,7 +524,7 @@ void AccObject::SetDescription( Any pAny ) */ void AccObject::SetRole( short Role ) { - if( NULL == m_pIMAcc ) + if( nullptr == m_pIMAcc ) return ; m_pIMAcc->Put_XAccRole( Role ); } @@ -617,8 +617,8 @@ DWORD AccObject::GetMSAAStateFromUNO(short xState) break; case EXPANDABLE: { - sal_Bool isExpanded = sal_True; - sal_Bool isExpandable = sal_True; + sal_Bool isExpanded = true; + sal_Bool isExpandable = true; if( Role == PUSH_BUTTON || Role == TOGGLE_BUTTON || BUTTON_DROPDOWN == Role ) { IState = STATE_SYSTEM_HASPOPUP; @@ -666,7 +666,7 @@ DWORD AccObject::GetMSAAStateFromUNO(short xState) */ void AccObject::DecreaseState( short xState ) { - if( NULL == m_pIMAcc ) + if( nullptr == m_pIMAcc ) { return; } @@ -682,7 +682,7 @@ void AccObject::DecreaseState( short xState ) { if (Role == TOGGLE_BUTTON || Role == PUSH_BUTTON || BUTTON_DROPDOWN == Role) { - if( ( m_pParentObj !=NULL ) && (TOOL_BAR == m_pParentObj->m_accRole ) ) + if( ( m_pParentObj !=nullptr ) && (TOOL_BAR == m_pParentObj->m_accRole ) ) return; } } @@ -709,7 +709,7 @@ void AccObject::DecreaseState( short xState ) */ void AccObject::IncreaseState( short xState ) { - if( NULL == m_pIMAcc ) + if( nullptr == m_pIMAcc ) { assert(false); return; @@ -741,7 +741,7 @@ AccObject* AccObject::NextChild() IAccChildList::iterator pInd = m_childrenList.begin(); if( pInd != m_childrenList.end() ) return *pInd; - return NULL; + return nullptr; } /** * update action description desc @@ -837,27 +837,27 @@ void AccObject::UpdateState() Sequence pStates = pRState->getStates(); int count = pStates.getLength(); - sal_Bool isEnable = sal_False; - sal_Bool isShowing = sal_False; - sal_Bool isEditable = sal_False; - sal_Bool isVisible = sal_False; - sal_Bool isFocusable = sal_False; + bool isEnable = false; + bool isShowing = false; + bool isEditable = false; + bool isVisible = false; + bool isFocusable = false; for( int iIndex = 0;iIndex < count;iIndex++ ) { if( pStates[iIndex] == ENABLED ) - isEnable = sal_True; + isEnable = true; else if( pStates[iIndex] == SHOWING) - isShowing = sal_True; + isShowing = true; else if( pStates[iIndex] == VISIBLE) - isVisible = sal_True; + isVisible = true; else if( pStates[iIndex] == EDITABLE ) - isEditable = sal_True; + isEditable = true; else if (pStates[iIndex] == FOCUSABLE) - isFocusable = sal_True; + isFocusable = true; IncreaseState( pStates[iIndex]); } - sal_Bool bIsMenuItem = m_accRole == MENU_ITEM || m_accRole == RADIO_MENU_ITEM || m_accRole == CHECK_MENU_ITEM; + bool bIsMenuItem = m_accRole == MENU_ITEM || m_accRole == RADIO_MENU_ITEM || m_accRole == CHECK_MENU_ITEM; if(bIsMenuItem) { @@ -922,7 +922,7 @@ void AccObject::UpdateState() { if( SEPARATOR == Role ) { - if( ( m_pParentObj != NULL ) && ( MENU == m_pParentObj->m_accRole || POPUP_MENU == m_pParentObj->m_accRole )) + if( ( m_pParentObj != nullptr ) && ( MENU == m_pParentObj->m_accRole || POPUP_MENU == m_pParentObj->m_accRole )) IncreaseState( FOCUSABLE ); } @@ -957,7 +957,7 @@ void AccObject::UpdateState() { if ( Role == TOGGLE_BUTTON || Role == PUSH_BUTTON || BUTTON_DROPDOWN == Role) { - if(( m_pParentObj != NULL )&& (TOOL_BAR == m_pParentObj->m_accRole ) ) + if(( m_pParentObj != nullptr )&& (TOOL_BAR == m_pParentObj->m_accRole ) ) IncreaseState( FOCUSABLE ); else DecreaseState( FOCUSABLE ); @@ -1023,12 +1023,12 @@ void AccObject::UpdateLocation() * @param * @return If the method is correctly processed. */ -sal_Bool AccObject:: UpdateAccessibleInfoFromUnoToMSAA ( ) +bool AccObject:: UpdateAccessibleInfoFromUnoToMSAA ( ) { - if( NULL == m_pIMAcc || !m_xAccContextRef.is() ) + if( nullptr == m_pIMAcc || !m_xAccContextRef.is() ) { assert(false); - return sal_False; + return false; } UpdateName(); @@ -1043,7 +1043,7 @@ sal_Bool AccObject:: UpdateAccessibleInfoFromUnoToMSAA ( ) UpdateState(); - return sal_True; + return true; } /* @@ -1094,8 +1094,8 @@ void AccObject::unsetFocus() void AccObject::GetExpandedState( sal_Bool* isExpandable, sal_Bool* isExpanded) { - *isExpanded = sal_False; - *isExpandable = sal_False; + *isExpanded = false; + *isExpandable = false; if( !m_xAccContextRef.is() ) { @@ -1114,16 +1114,16 @@ void AccObject::GetExpandedState( sal_Bool* isExpandable, sal_Bool* isExpanded) { if( EXPANDED == pStates[iIndex] ) { - *isExpanded = sal_True; + *isExpanded = true; } else if( EXPANDABLE == pStates[iIndex] ) { - *isExpandable = sal_True; + *isExpandable = true; } } } -void AccObject::NotifyDestroy(sal_Bool ifDelete) +void AccObject::NotifyDestroy(bool ifDelete) { m_bShouldDestroy=ifDelete; if(m_pIMAcc) @@ -1142,7 +1142,7 @@ void AccObject::SetParentObj(AccObject* pParentAccObj) } else { - m_pIMAcc->Put_XAccParent(NULL); + m_pIMAcc->Put_XAccParent(nullptr); } } } @@ -1193,7 +1193,7 @@ AccObject* AccObject::GetParentObj() { return m_pParentObj; } -sal_Bool AccObject::ifShouldDestroy() +bool AccObject::ifShouldDestroy() { return m_bShouldDestroy; } diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx index be64b311cf02..b4ca9fdf9b2f 100644 --- a/winaccessibility/source/service/AccObjectManagerAgent.cxx +++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx @@ -177,7 +177,7 @@ bool AccObjectManagerAgent::InsertChildrenAccObj(XAccessible* pXAcc, sal_Int64 pWnd) { if( pWinManager ) - return pWinManager->InsertChildrenAccObj( pXAcc, HWND((void*)pWnd) ); + return pWinManager->InsertChildrenAccObj( pXAcc, HWND(reinterpret_cast(pWnd)) ); return false; } @@ -262,7 +262,7 @@ bool AccObjectManagerAgent::NotifyAccEvent(short pEvent, XAccessible* pXAcc) bool AccObjectManagerAgent::IsContainer( XAccessible* pXAcc ) { if(pWinManager) - return pWinManager->IsContainer(pXAcc); + return AccObjectWinManager::IsContainer(pXAcc); return false; } @@ -277,7 +277,7 @@ IMAccessible* AccObjectManagerAgent::GetIMAccByXAcc(XAccessible* pXAcc) if(pWinManager) return pWinManager->GetIMAccByXAcc(pXAcc); - return NULL; + return nullptr; } /** @@ -312,7 +312,7 @@ bool AccObjectManagerAgent::GetIAccessibleFromXAccessible( { if(pWinManager) { - *ppXI = (IAccessible*)pWinManager->GetIMAccByXAcc(pXAcc); + *ppXI = reinterpret_cast(pWinManager->GetIMAccByXAcc(pXAcc)); if(*ppXI) return true; } @@ -324,7 +324,7 @@ XAccessible* AccObjectManagerAgent::GetParentXAccessible( XAccessible* pXAcc ) if(pWinManager) return pWinManager->GetParentXAccessible( pXAcc ); - return NULL; + return nullptr; } short AccObjectManagerAgent::GetParentRole( XAccessible* pXAcc ) @@ -359,7 +359,7 @@ bool AccObjectManagerAgent::IsSpecialToolboItem(XAccessible* pXAcc) short AccObjectManagerAgent::GetRole(XAccessible* pXAcc) { if(pWinManager) - return pWinManager->GetRole( pXAcc ); + return AccObjectWinManager::GetRole( pXAcc ); return -1; } @@ -370,7 +370,7 @@ XAccessible* AccObjectManagerAgent::GetAccDocByAccTopWin( XAccessible* pXAcc ) { return pWinManager->GetAccDocByAccTopWin( pXAcc ); } - return NULL; + return nullptr; } bool AccObjectManagerAgent::IsTopWinAcc(XAccessible* pXAcc) { @@ -384,7 +384,7 @@ bool AccObjectManagerAgent::IsTopWinAcc(XAccessible* pXAcc) bool AccObjectManagerAgent::IsStateManageDescendant(XAccessible* pXAcc) { if(pWinManager) - return pWinManager->IsStateManageDescendant( pXAcc ); + return AccObjectWinManager::IsStateManageDescendant( pXAcc ); return false; } diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index 25d4e5daa33c..2e97c62f2835 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -63,7 +63,7 @@ using namespace com::sun::star::uno; * @return */ AccObjectWinManager::AccObjectWinManager( AccObjectManagerAgent* Agent ): - oldFocus( NULL ), + oldFocus( nullptr ), pAgent( Agent ) { } @@ -96,7 +96,7 @@ AccObjectWinManager::~AccObjectWinManager() LRESULT AccObjectWinManager::Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam) { - IMAccessible* pRetIMAcc = NULL; + IMAccessible* pRetIMAcc = nullptr; if(lParam == OBJID_CLIENT ) { @@ -126,12 +126,12 @@ AccObjectWinManager::Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam) */ AccObject* AccObjectWinManager::GetAccObjByXAcc( XAccessible* pXAcc) { - if( pXAcc == NULL) - return NULL; + if( pXAcc == nullptr) + return nullptr; - XIdToAccObjHash::iterator pIndTemp = XIdAccList.find( (void*)pXAcc ); + XIdToAccObjHash::iterator pIndTemp = XIdAccList.find( pXAcc ); if ( pIndTemp == XIdAccList.end() ) - return NULL; + return nullptr; return &(pIndTemp->second); } @@ -145,8 +145,8 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd) { XHWNDToXAccHash::iterator iterResult =HwndXAcc.find(hWnd); if(iterResult == HwndXAcc.end()) - return NULL; - XAccessible* pXAcc = (XAccessible*)(iterResult->second); + return nullptr; + XAccessible* pXAcc = static_cast(iterResult->second); return GetAccObjByXAcc(pXAcc); } @@ -156,23 +156,23 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd) * @param state Customize Interface * @return The terminate result that identifies if the call is successful. */ -sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state) +bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state) { Reference< XAccessibleContext > pRContext; - if( pXAcc == NULL) - return sal_False; + if( pXAcc == nullptr) + return false; pRContext = pXAcc->getAccessibleContext(); if( !pRContext.is() ) - return sal_False; + return false; AccObject* selfAccObj= GetAccObjByXAcc(pXAcc); - if(selfAccObj==NULL) - return sal_False; + if(selfAccObj==nullptr) + return false; long dChildID = selfAccObj->GetResID(); HWND hAcc = selfAccObj->GetParentHWND(); @@ -312,7 +312,7 @@ sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state) break; } - return sal_True; + return true; } /** @@ -323,14 +323,14 @@ sal_Bool AccObjectWinManager::NotifyAccEvent(XAccessible* pXAcc,short state) XAccessible* AccObjectWinManager::GetParentXAccessible( XAccessible* pXAcc ) { AccObject* pObj= GetAccObjByXAcc(pXAcc); - if( pObj ==NULL ) - return NULL; + if( pObj ==nullptr ) + return nullptr; if(pObj->GetParentObj()) { pObj = pObj->GetParentObj(); return pObj->GetXAccessible().get(); } - return NULL; + return nullptr; } /** @@ -341,7 +341,7 @@ XAccessible* AccObjectWinManager::GetParentXAccessible( XAccessible* pXAcc ) short AccObjectWinManager::GetParentRole( XAccessible* pXAcc ) { AccObject* pObj= GetAccObjByXAcc(pXAcc); - if( pObj ==NULL ) + if( pObj ==nullptr ) return -1; if(pObj->GetParentObj()) { @@ -384,23 +384,23 @@ int AccObjectWinManager::UpdateAccSelection(XAccessible* pXAcc) { Reference< XAccessibleContext > pRContext; - if( pXAcc == NULL) - return sal_False; + if( pXAcc == nullptr) + return 0; pRContext = pXAcc->getAccessibleContext(); if( !pRContext.is() ) - return sal_False; + return 0; Reference< XAccessibleSelection > pRSelection(pRContext,UNO_QUERY); if( !pRSelection.is() ) - return sal_False; + return 0; AccObject* pAccObj = GetAccObjByXAcc(pXAcc); - if(pAccObj==NULL) - return sal_False; + if(pAccObj==nullptr) + return 0; - Reference pRChild = NULL; - AccObject* pAccChildObj = NULL; + Reference pRChild = nullptr; + AccObject* pAccChildObj = nullptr; int selectNum= pRSelection->getSelectedAccessibleChildCount(); IAccSelectionList oldSelection = pAccObj->GetSelection(); @@ -439,7 +439,7 @@ int AccObjectWinManager::UpdateAccSelection(XAccessible* pXAcc) pAccObj->AddSelect(index, pAccChildObj); - if(pAccChildObj != NULL) + if(pAccChildObj != nullptr) NotifyWinEvent(EVENT_OBJECT_SELECTIONADD,pAccObj->GetParentHWND(), OBJID_CLIENT,pAccChildObj->GetResID()); } @@ -447,8 +447,8 @@ int AccObjectWinManager::UpdateAccSelection(XAccessible* pXAcc) while(iter!=oldSelection.end()) { pAccObj->GetSelection().erase(iter->first); - pAccChildObj = (AccObject*)(iter->second); - if(pAccChildObj != NULL) + pAccChildObj = iter->second; + if(pAccChildObj != nullptr) NotifyWinEvent(EVENT_OBJECT_SELECTIONREMOVE,pAccObj->GetParentHWND(), OBJID_CLIENT,pAccChildObj->GetResID()); ++iter; } @@ -494,8 +494,8 @@ void AccObjectWinManager::DeleteFromHwndXAcc(XAccessible* pXAcc ) */ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc) { - AccObject* currentObj=NULL; - AccObject* childObj=NULL; + AccObject* currentObj=nullptr; + AccObject* childObj=nullptr; currentObj = GetAccObjByXAcc( pXAcc); if(currentObj) @@ -521,7 +521,7 @@ void AccObjectWinManager::DeleteChildrenAccObj(XAccessible* pXAcc) */ void AccObjectWinManager::DeleteAccObj( XAccessible* pXAcc ) { - if( pXAcc == NULL ) + if( pXAcc == nullptr ) return; XIdToAccObjHash::iterator temp = XIdAccList.find(pXAcc); if( temp != XIdAccList.end() ) @@ -561,10 +561,10 @@ void AccObjectWinManager::DeleteAccObj( XAccessible* pXAcc ) void AccObjectWinManager::DeleteAccListener( AccObject* pAccObj ) { AccEventListener* listener = pAccObj->getListener(); - if( listener==NULL ) + if( listener==nullptr ) return; listener->RemoveMeFromBroadcaster(); - pAccObj->SetListener(NULL); + pAccObj->SetListener(nullptr); } /** @@ -583,19 +583,19 @@ inline long AccObjectWinManager::ImpleGenerateResID() * @param pWnd Top Window handle * @return The calling result. */ -sal_Bool AccObjectWinManager::InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc, +bool AccObjectWinManager::InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc, HWND pWnd) { if(!IsContainer(pXAcc)) - return sal_False; + return false; Reference< XAccessibleContext > pRContext; - if( pXAcc == NULL) - return sal_False; + if( pXAcc == nullptr) + return false; pRContext = pXAcc->getAccessibleContext(); if( !pRContext.is() ) - return sal_False; + return false; short role = pRContext->getAccessibleRole(); @@ -606,7 +606,7 @@ sal_Bool AccObjectWinManager::InsertChildrenAccObj( css::accessibility::XAccessi { if(IsStateManageDescendant(pXAcc)) { - return sal_True; + return true; } } @@ -616,14 +616,14 @@ sal_Bool AccObjectWinManager::InsertChildrenAccObj( css::accessibility::XAccessi Reference mxAccessible = pRContext->getAccessibleChild(i); XAccessible* mpAccessible = mxAccessible.get(); - if(mpAccessible != NULL) + if(mpAccessible != nullptr) { InsertAccObj( mpAccessible,pXAcc,pWnd ); InsertChildrenAccObj(mpAccessible,pWnd); } } - return sal_True; + return true; } /** @@ -655,9 +655,9 @@ void AccObjectWinManager::InsertAccChildNode( AccObject* pCurObj, AccObject* pPa * @param pWnd Top window handle. * @return */ -sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pParentXAcc,HWND pWnd ) +bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pParentXAcc,HWND pWnd ) { - XIdToAccObjHash::iterator itXacc = XIdAccList.find( (void*)pXAcc ); + XIdToAccObjHash::iterator itXacc = XIdAccList.find( pXAcc ); if (itXacc != XIdAccList.end() ) { short nCurRole =GetRole(pXAcc); @@ -669,27 +669,27 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar pObjParent->GetXAccessible().is() && pObjParent->GetXAccessible().get() != pParentXAcc) { - XIdToAccObjHash::iterator itXaccParent = XIdAccList.find( (void*)pParentXAcc ); + XIdToAccObjHash::iterator itXaccParent = XIdAccList.find( pParentXAcc ); if(itXaccParent != XIdAccList.end()) { objXacc.SetParentObj(&(itXaccParent->second)); } } } - return sal_False; + return false; } Reference< XAccessibleContext > pRContext; - if( pXAcc == NULL) - return sal_False; + if( pXAcc == nullptr) + return false; pRContext = pXAcc->getAccessibleContext(); if( !pRContext.is() ) - return sal_False; + return false; - if( pWnd == NULL ) + if( pWnd == nullptr ) { if(pParentXAcc) { @@ -697,13 +697,13 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar if(pObj) pWnd = pObj->GetParentHWND(); } - if( pWnd == NULL ) - return sal_False; + if( pWnd == nullptr ) + return false; } AccObject pObj( pXAcc,pAgent ); - if( pObj.GetIMAccessible() == NULL ) - return sal_False; + if( pObj.GetIMAccessible() == nullptr ) + return false; pObj.SetResID( this->ImpleGenerateResID()); pObj.SetParentHWND( pWnd ); @@ -725,7 +725,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar ::rtl::Reference const pListener = CreateAccEventListener(pXAcc); if (!pListener.is()) - return sal_False; + return false; Reference xComponent(pRContext,UNO_QUERY); Reference broadcaster(xComponent,UNO_QUERY); if (broadcaster.is()) @@ -734,10 +734,10 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar broadcaster->addAccessibleEventListener(xListener); } else - return sal_False; + return false; - XIdAccList.insert( XIdToAccObjHash::value_type( (void*)pXAcc, pObj )); - XIdToAccObjHash::iterator pIndTemp = XIdAccList.find( (void*)pXAcc ); + XIdAccList.insert( XIdToAccObjHash::value_type( pXAcc, pObj )); + XIdToAccObjHash::iterator pIndTemp = XIdAccList.find( pXAcc ); XResIdAccList.insert(XResIdToAccObjHash::value_type(pObj.GetResID(),&(pIndTemp->second))); AccObject* pCurObj = GetAccObjByXAcc(pXAcc); @@ -750,7 +750,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar InsertAccChildNode(pCurObj,pParentObj,pWnd); if( pCurObj ) pCurObj->UpdateAccessibleInfoFromUnoToMSAA(); - return sal_True; + return true; } @@ -762,7 +762,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar */ void AccObjectWinManager::SaveTopWindowHandle(HWND hWnd, css::accessibility::XAccessible* pXAcc) { - HwndXAcc.insert( XHWNDToXAccHash::value_type( hWnd,(void*)pXAcc ) ); + HwndXAcc.insert( XHWNDToXAccHash::value_type( hWnd,pXAcc ) ); } @@ -1023,7 +1023,7 @@ void AccObjectWinManager::SetRole( XAccessible* pXAcc, long Role ) * @param pAccessible XAccessible interface. * @return If XAccessible object is container. */ -sal_Bool AccObjectWinManager::IsContainer(XAccessible* pAccessible) +bool AccObjectWinManager::IsContainer(XAccessible* pAccessible) { try { @@ -1067,27 +1067,27 @@ sal_Bool AccObjectWinManager::IsContainer(XAccessible* pAccessible) case /*AccessibleRole::*/TOOL_BAR: case /*AccessibleRole::*/VIEW_PORT: case /*AccessibleRole::*/SHAPE: - return sal_True; + return true; break; case /*AccessibleRole::*/COLUMN_HEADER: case /*AccessibleRole::*/TABLE: if(!IsStateManageDescendant(pAccessible)) - return sal_True; + return true; break; case /*AccessibleRole::*/MENU: - return sal_True; + return true; break; default: - return sal_False; + return false; } } } } catch(...) { - return sal_False; + return false; } - return sal_False; + return false; } /** @@ -1104,18 +1104,18 @@ bool AccObjectWinManager::IsStateManageDescendant(XAccessible* pAccessible) { Reference< XAccessibleStateSet > pRState = xContext->getAccessibleStateSet(); if( !pRState.is() ) - return sal_False; + return false; Sequence pStates = pRState->getStates(); int count = pStates.getLength(); for( int iIndex = 0;iIndex < count;iIndex++ ) { if(pStates[iIndex] == /*AccessibleStateType::*/MANAGES_DESCENDANTS) - return sal_True; + return true; } } } - return sal_False; + return false; } /** @@ -1132,7 +1132,7 @@ IMAccessible* AccObjectWinManager::GetIMAccByXAcc(XAccessible* pXAcc) } else { - return NULL; + return nullptr; } } @@ -1145,13 +1145,13 @@ IMAccessible * AccObjectWinManager::GetIAccessibleFromResID(long resID) { XResIdToAccObjHash::iterator pIndTemp = XResIdAccList.find( resID ); if ( pIndTemp == XResIdAccList.end() ) - return NULL; + return nullptr; AccObject* pObj = pIndTemp->second; if(pObj->GetIMAccessible()) return pObj->GetIMAccessible(); - return NULL; + return nullptr; } /** * Notify some object will be destroyed. @@ -1163,7 +1163,7 @@ void AccObjectWinManager::NotifyDestroy(XAccessible* pXAcc) AccObject* accObj = GetAccObjByXAcc(pXAcc); if(accObj) { - accObj->NotifyDestroy(sal_True); + accObj->NotifyDestroy(true); } } @@ -1212,7 +1212,7 @@ bool AccObjectWinManager::IsSpecialToolboItem(css::accessibility::XAccessible* p short AccObjectWinManager::GetRole(css::accessibility::XAccessible* pXAcc) { - assert(pXAcc != NULL); + assert(pXAcc != nullptr); Reference xContext(pXAcc->getAccessibleContext(),UNO_QUERY); if(xContext.is()) { @@ -1230,7 +1230,7 @@ XAccessible* AccObjectWinManager::GetAccDocByHWND(HWND pWnd) return aIter->second; } - return NULL; + return nullptr; } XAccessible* AccObjectWinManager::GetAccDocByAccTopWin( XAccessible* pXAcc ) @@ -1246,7 +1246,7 @@ bool AccObjectWinManager::IsTopWinAcc( css::accessibility::XAccessible* pXAcc ) AccObject* pAccObj = GetAccObjByXAcc( pXAcc ); if ( pAccObj ) { - bRet = ( pAccObj->GetParentObj() == NULL ); + bRet = ( pAccObj->GetParentObj() == nullptr ); } return bRet; } diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx b/winaccessibility/source/service/AccParagraphEventListener.cxx index e9d5668b2a3a..58c248b395fc 100644 --- a/winaccessibility/source/service/AccParagraphEventListener.cxx +++ b/winaccessibility/source/service/AccParagraphEventListener.cxx @@ -95,7 +95,7 @@ throw (css::uno::RuntimeException) */ void AccParagraphEventListener::HandleCaretChangedEvent(Any, Any) { - pAgent->UpdateLocation(m_xAccessible.get()); + AccObjectManagerAgent::UpdateLocation(m_xAccessible.get()); pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, m_xAccessible.get()); } diff --git a/winaccessibility/source/service/AccResource.cxx b/winaccessibility/source/service/AccResource.cxx index c9965e5c3a5b..a7575de38d7c 100644 --- a/winaccessibility/source/service/AccResource.cxx +++ b/winaccessibility/source/service/AccResource.cxx @@ -27,7 +27,7 @@ //= ResourceManager -SimpleResMgr* ResourceManager::m_pImpl = NULL; +SimpleResMgr* ResourceManager::m_pImpl = nullptr; ResourceManager::EnsureDelete::~EnsureDelete() diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index 352e0fb1f77f..ee78e2f7f8ec 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -51,17 +51,17 @@ using namespace cppu; void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* pAccessible ) { //get SystemData from window - VCLXWindow* pvclwindow = (VCLXWindow*)pAccessible; + VCLXWindow* pvclwindow = static_cast(pAccessible); vcl::Window* window = pvclwindow->GetWindow(); // The SalFrame of window may be destructed at this time - const SystemEnvData* systemdata = NULL; + const SystemEnvData* systemdata = nullptr; try { systemdata = window->GetSystemData(); } catch(...) { - systemdata = NULL; + systemdata = nullptr; } Reference xContext(pAccessible->getAccessibleContext(),UNO_QUERY); if(!xContext.is()) @@ -69,12 +69,12 @@ void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); //Only AccessibleContext exist, add all listeners - if(pAccessibleContext != NULL && systemdata != NULL) + if(pAccessibleContext != nullptr && systemdata != nullptr) { accManagerAgent.SaveTopWindowHandle( reinterpret_cast(systemdata->hWnd), pAccessible); - AddAllListeners(pAccessible,NULL,(HWND)systemdata->hWnd); + AddAllListeners(pAccessible,nullptr,systemdata->hWnd); if( window->GetStyle() & WB_MOVEABLE ) accManagerAgent.IncreaseState( pAccessible, (unsigned short) -1 /* U_MOVEBLE */ ); @@ -140,7 +140,7 @@ void AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAcc return; } css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); - if(pAccessibleContext == NULL) + if(pAccessibleContext == nullptr) { return; } @@ -174,12 +174,12 @@ void AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAcc = pAccessibleContext->getAccessibleChild(i); css::accessibility::XAccessible* mpAccessible = mxAccessible.get(); - if(mpAccessible != NULL) + if(mpAccessible != nullptr) { Reference mxAccessibleContext = mpAccessible->getAccessibleContext(); css::accessibility::XAccessibleContext* mpContext = mxAccessibleContext.get(); - if(mpContext != NULL) + if(mpContext != nullptr) AddAllListeners( mpAccessible, pAccessible, pWND); } } @@ -204,7 +204,7 @@ void AccTopWindowListener::windowClosed( const css::lang::EventObject& e ) throw Reference< css::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY ); css::accessibility::XAccessible* pAccessible = xAccessible.get(); - if ( pAccessible == NULL) + if ( pAccessible == nullptr) return; Reference xContext(pAccessible->getAccessibleContext(),UNO_QUERY); @@ -215,7 +215,7 @@ void AccTopWindowListener::windowClosed( const css::lang::EventObject& e ) throw css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); short role = -1; - if(pAccessibleContext != NULL) + if(pAccessibleContext != nullptr) { role = pAccessibleContext->getAccessibleRole(); diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index 6ca7842d5e9f..20cb117fa8b2 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -64,32 +64,32 @@ private: public: MSAAServiceImpl (); - virtual ~MSAAServiceImpl(); + virtual ~MSAAServiceImpl() override; // XComponent - as used by VCL to lifecycle manage this bridge. virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) override { /* dummy */ } virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) override { /* dummy */ } // XMSAAService virtual sal_Int64 SAL_CALL getAccObjectPtr( sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL handleWindowOpened(sal_Int64) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) override; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) override; }; /** @@ -306,9 +306,9 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = create_MSAAServiceImpl, getImplementationName_MSAAServiceImpl, getSupportedServiceNames_MSAAServiceImpl, ::cppu::createSingleComponentFactory, - 0, 0 + nullptr, 0 }, - { 0, 0, 0, 0, 0, 0 } + { nullptr, nullptr, nullptr, nullptr, nullptr, 0 } }; } -- cgit