diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-08-28 12:45:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-08-28 12:45:51 +0000 |
| commit | c0931660e10321293b4574f7d37034826ba81da0 (patch) | |
| tree | cfc15d4a6f342b646ae05cdceaf8e0acaf5f1a54 /svx | |
| parent | a5beb893cd43f77a2716f0a9a4be3fb4c347407d (diff) | |
INTEGRATION: CWS navorder (1.156.42); FILE MERGED
2007/07/05 23:54:19 af 1.156.42.2: RESYNC: (1.156-1.158); FILE MERGED
2007/06/21 13:38:19 cl 1.156.42.1: #i68097# added navigation order to shapes
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 2e2be11b0d99..125ff411f8f9 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoshape.cxx,v $ * - * $Revision: 1.163 $ + * $Revision: 1.164 $ * - * last change: $Author: hr $ $Date: 2007-08-03 10:21:22 $ + * last change: $Author: vg $ $Date: 2007-08-28 13:45:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -4611,6 +4611,14 @@ uno::Reference< drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw /** returns the SdrObject from the given StarOffice API wrapper */ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) throw() { - SvxShape* pShape = SvxShape::getImplementation( xShape ); - return pShape ? pShape->GetSdrObject() : NULL; + SvxShape* pShape = dynamic_cast< SvxShape* >( xShape.get() ); + return pShape ? pShape->GetSdrObject() : 0; +} + +//---------------------------------------------------------------------- + +SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt ) +{ + SvxShape* pSvxShape = dynamic_cast< SvxShape* >( xInt.get() ); + return pSvxShape ? pSvxShape->GetSdrObject() : 0; } |