diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-16 18:51:18 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-10 16:33:58 +0100 |
| commit | feceddf2ed6dc8c0aae5a43a09db8d096ca8e93d (patch) | |
| tree | e7f4cb209ba64e91a4fd9947d4c1bfdd79b31427 | |
| parent | d6f4b60b3fbedb22c46e7c4c3370a74b649e187f (diff) | |
sw: revert PaintArea change in SwAccessibleFrame
76c549eb01dcb7b5bf28a271ce00e386f3d388ba changes some calls to
SwAccessibleChildSList to use the PaintArea() of the given SwFrm
instead of the given rVisArea, which makes
SwAccessibleFrame::GetChildCount() and GetChildIndex() inconsistent
with other methods such as GetChild(), GetChildAtPixel() etc.
Not sure which way is better, but it should be consistent;
revert the partial change for now and see.
Change-Id: I7d7edf2ec3dd0860ac2331d36757096186185e4f
| -rw-r--r-- | sw/source/core/access/accframe.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index fb1771fa27cb..34e72106a00c 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -51,8 +51,7 @@ sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap, { sal_Int32 nCount = 0; - // const SwAccessibleChildSList aVisList( rVisArea, *pFrm, rAccMap ); - const SwAccessibleChildSList aVisList( pFrm->PaintArea(), *pFrm, rAccMap ); + const SwAccessibleChildSList aVisList( rVisArea, *pFrm, rAccMap ); SwAccessibleChildSList::const_iterator aIter( aVisList.begin() ); while( aIter != aVisList.end() ) @@ -155,7 +154,7 @@ sal_Bool SwAccessibleFrame::GetChildIndex( if( SwAccessibleChildMap::IsSortingRequired( rFrm ) ) { // We need a sorted list here - const SwAccessibleChildMap aVisMap( rFrm.PaintArea(), rFrm, rAccMap ); + const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap ); SwAccessibleChildMap::const_iterator aIter( aVisMap.begin() ); while( aIter != aVisMap.end() && !bFound ) { @@ -182,7 +181,7 @@ sal_Bool SwAccessibleFrame::GetChildIndex( // The unsorted list is sorted enough, because it returns lower // frames in the correct order. - const SwAccessibleChildSList aVisList( rFrm.PaintArea(), rFrm, rAccMap ); + const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap ); SwAccessibleChildSList::const_iterator aIter( aVisList.begin() ); while( aIter != aVisList.end() && !bFound ) { |