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 /editeng/source/uno/unofored.cxx | |
| 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 'editeng/source/uno/unofored.cxx')
| -rw-r--r-- | editeng/source/uno/unofored.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 656f144218ea..f073beec20ba 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -406,9 +406,9 @@ sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_uInt16 nIn return sal_False; } -sal_Bool SvxEditEngineForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const +sal_Bool SvxEditEngineForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell ) const { - return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rEditEngine, nPara, nIndex ); + return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rEditEngine, nPara, nIndex, bInCell ); } sal_uInt16 SvxEditEngineForwarder::GetLineCount( sal_Int32 nPara ) const |