diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 13:26:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 13:26:03 +0000 |
| commit | 8725034e60238c47f3418d93f016cdce2a1e0ca4 (patch) | |
| tree | 5a23992a9bd544deaedc743316da1e7bbc12758a /svx/source/accessibility | |
| parent | f008cf441aa628ffc812d22c3fd3fbdd07539ca7 (diff) | |
INTEGRATION: CWS dba22b (1.25.46); FILE MERGED
2006/12/12 08:11:48 fs 1.25.46.1: #i71260# GetUnoControl now taking an SdrView, additionally to the output device
Diffstat (limited to 'svx/source/accessibility')
| -rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 8e86c52b1fcc..81b7c802e4d0 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AccessibleControlShape.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 13:12:25 $ + * last change: $Author: vg $ $Date: 2007-01-15 14:26:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -261,13 +261,14 @@ void AccessibleControlShape::Init() // get the control which belongs to our model (relative to our view) const Window* pViewWindow = maShapeTreeInfo.GetWindow(); SdrUnoObj* pUnoObjectImpl = PTR_CAST( SdrUnoObj, getSdrObject() ); - OSL_ENSURE( pViewWindow && pUnoObjectImpl, "AccessibleControlShape::Init: no view, or no SdrUnoObj!" ); + SdrView* pView = maShapeTreeInfo.GetSdrView(); + OSL_ENSURE( pView && pViewWindow && pUnoObjectImpl, "AccessibleControlShape::Init: no view, or no view window, no SdrUnoObj!" ); - if ( pViewWindow && pUnoObjectImpl ) + if ( pView && pViewWindow && pUnoObjectImpl ) { // ................................................................. // get the context of the control - it will be our "inner" context - m_xUnoControl = pUnoObjectImpl->GetUnoControl( pViewWindow ); + m_xUnoControl = pUnoObjectImpl->GetUnoControl( *pView, *pViewWindow ); if ( !m_xUnoControl.is() ) { |