diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-29 13:03:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-02 10:25:33 +0000 |
| commit | 76c549eb01dcb7b5bf28a271ce00e386f3d388ba (patch) | |
| tree | bb09874a25b3b29c52556228abdf4aafb9ca6515 /sw/source/core/access/accframe.cxx | |
| parent | 84972949a3501003b0b6ad98f07f1b4ab83f3ca1 (diff) | |
Integrate branch of IAccessible2
Conflicts:
everything
Change-Id: I9619634ee1e60d449025c006803da29c1e9d14b3
Diffstat (limited to 'sw/source/core/access/accframe.cxx')
| -rw-r--r-- | sw/source/core/access/accframe.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 4726a0b899f2..fb1771fa27cb 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -51,7 +51,9 @@ sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap, { sal_Int32 nCount = 0; - const SwAccessibleChildSList aVisList( rVisArea, *pFrm, rAccMap ); + // const SwAccessibleChildSList aVisList( rVisArea, *pFrm, rAccMap ); + const SwAccessibleChildSList aVisList( pFrm->PaintArea(), *pFrm, rAccMap ); + SwAccessibleChildSList::const_iterator aIter( aVisList.begin() ); while( aIter != aVisList.end() ) { @@ -153,7 +155,7 @@ sal_Bool SwAccessibleFrame::GetChildIndex( if( SwAccessibleChildMap::IsSortingRequired( rFrm ) ) { // We need a sorted list here - const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap ); + const SwAccessibleChildMap aVisMap( rFrm.PaintArea(), rFrm, rAccMap ); SwAccessibleChildMap::const_iterator aIter( aVisMap.begin() ); while( aIter != aVisMap.end() && !bFound ) { @@ -179,7 +181,8 @@ sal_Bool SwAccessibleFrame::GetChildIndex( { // The unsorted list is sorted enough, because it returns lower // frames in the correct order. - const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap ); + + const SwAccessibleChildSList aVisList( rFrm.PaintArea(), rFrm, rAccMap ); SwAccessibleChildSList::const_iterator aIter( aVisList.begin() ); while( aIter != aVisList.end() && !bFound ) { @@ -413,7 +416,8 @@ SwAccessibleFrame::SwAccessibleFrame( const SwRect& rVisArea, sal_Bool bIsPagePreview ) : maVisArea( rVisArea ), mpFrm( pF ), - mbIsInPagePreview( bIsPagePreview ) + mbIsInPagePreview( bIsPagePreview ), + bIsAccDocUse( sal_False ) { } |