diff options
Diffstat (limited to 'winaccessibility/source/UAccCOM/AccText.h')
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccText.h | 60 |
1 files changed, 30 insertions, 30 deletions
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<CAccText*>(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 |