diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-26 14:25:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-26 15:27:17 +0000 |
| commit | c23ab5eaed57cc3fb5860e26c591c73c5b22687b (patch) | |
| tree | 7a918b328e80763fa334f59c789cff399f207541 /include/editeng/unotext.hxx | |
| parent | 62fcdfa34aa302aa9051e90e75b94eb442fa1db7 (diff) | |
Integrate branch of IAccessible2
WaE: Reorder initializations to prevent compiler warnings.
(cherry picked from commit c05431aa92fa2c7c7258418a6ecd651b5c26d982)
WaE: unname unused variable to prevent compiler warnings.
(cherry picked from commit 2259256a390c4b6f83cfb5dbe4a65df5032aee47)
Conflicts:
editeng/source/accessibility/AccessibleEditableTextPara.cxx
ad61537527a74670af266feb9e4d26d2d654daf7
66044902b8d94fc15d4c30270e6cc419fb7d3565
Change-Id: I3ec9798f2c7d854824722c0cf44b62128b4f4cb4
Diffstat (limited to 'include/editeng/unotext.hxx')
| -rw-r--r-- | include/editeng/unotext.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 66b1c2642b10..7479399cbde0 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -214,7 +214,7 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; virtual sal_uInt16 GetLineCount( sal_Int32 nPara ) const; virtual sal_uInt16 GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const; |