From c23ab5eaed57cc3fb5860e26c591c73c5b22687b Mon Sep 17 00:00:00 2001
From: Steve Yin <steve_y@apache.org>
Date: Tue, 26 Nov 2013 14:25:22 +0000
Subject: 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
---
 starmath/source/accessibility.cxx | 4 ++--
 starmath/source/accessibility.hxx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'starmath')

diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index b192ac0c1582..f80f1c62aef0 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1344,11 +1344,11 @@ sal_Bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_uInt16 nIndex, sa
     return bRes;
 }
 
-sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex ) const
+sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nPara, sal_uInt16 nIndex, sal_Bool bInCell ) const
 {
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     return pEditEngine ?
-                SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex )
+                SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex, bInCell )
                 : sal_False;
 }
 
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 04022753a9c4..d0e5ebbd759f 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -234,9 +234,9 @@ 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_uInt16          GetLineCount( sal_Int32 nPara ) const;
-    virtual sal_uInt16          GetLineLen( sal_Int32 nPara, sal_uInt16 nLine ) 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;
     virtual sal_uInt16          GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nLine ) const;
     virtual sal_Bool        Delete( const ESelection& );
-- 
cgit