diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-14 08:18:05 +0000 |
|---|---|---|
| committer | Steve Yin <steve_y@apache.org> | 2013-11-14 08:18:05 +0000 |
| commit | a5c4ddcf8ed5344d9bceeffd7431cd6895a407ca (patch) | |
| tree | 7e830be2c7fae1c81a868f196aa940696efeeb37 /starmath | |
| parent | a2afc19e04f8bb3089cbfef34960ad8f0a3b99bf (diff) | |
Integrate branch of IAccessible2
Notes
Notes:
merged as: c2405f80af8b61fa9b9088420afdb79584adf7c0
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/accessibility.cxx | 6 | ||||
| -rw-r--r-- | starmath/source/accessibility.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 0be98916f5f5..d037387c44dd 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -1421,12 +1421,12 @@ sal_Bool SmTextForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, s return bRes; } -sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const +sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell ) const { EditEngine *pEditEngine = rEditAcc.GetEditEngine(); return pEditEngine ? - SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex ) - : sal_False; + SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex, bInCell ) + : sal_False; } sal_uInt16 SmTextForwarder::GetLineCount( sal_uInt16 nPara ) const diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 50cdc5012e43..bc74166b3dcd 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -245,9 +245,9 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; - virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; - virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; + virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const; virtual sal_uInt16 GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual sal_Bool Delete( const ESelection& ); |