diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:12:25 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:12:25 +0000 |
| commit | 48bb8c063d88cd818c5134837c5ced07c11b9fe0 (patch) | |
| tree | 8b8d1dedf5cef6169267a306e2212c231477532b /svx | |
| parent | b862535422b4ffe4fde6448afd53241a88aa8252 (diff) | |
INTEGRATION: CWS aw024 (1.20.258); FILE MERGED
2006/09/21 18:06:23 aw 1.20.258.7: RESYNC: (1.23-1.24); FILE MERGED
2006/07/04 11:59:46 aw 1.20.258.6: RESYNC: (1.22-1.23); FILE MERGED
2006/05/12 18:20:18 aw 1.20.258.5: RESYNC: (1.21-1.22); FILE MERGED
2006/02/24 15:17:45 fs 1.20.258.4: GetControlContainer taking a 'const OutputDevice&' (in the course of #i62529#)
2005/09/18 01:48:04 aw 1.20.258.3: RESYNC: (1.20-1.21); FILE MERGED
2005/05/26 11:27:54 aw 1.20.258.2: #i39531#
2005/05/19 12:31:06 aw 1.20.258.1: #i39529#
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 2c9927e5be22..8e86c52b1fcc 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AccessibleControlShape.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: obo $ $Date: 2006-09-17 03:59:45 $ + * last change: $Author: ihi $ $Date: 2006-11-14 13:12:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -216,17 +216,9 @@ namespace { { Reference< XContainer > xReturn; DBG_ASSERT( _pView, "lcl_getControlContainer: invalid view!" ); - if ( _pView ) + if ( _pView && _pView->GetSdrPageView()) { - USHORT nPageViews = _pView->GetPageViewCount(); - for ( USHORT nPage = 0; ( nPage < nPageViews ) && !xReturn.is(); ++nPage ) - { - SdrPageView* pPageView = _pView->GetPageViewPvNum( nPage ); - if ( pPageView ) - { - xReturn = xReturn.query( pPageView->GetControlContainer( _pWin ) ); - } - } + xReturn = xReturn.query( _pView->GetSdrPageView()->GetControlContainer( *_pWin ) ); } return xReturn; } |