diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 16:27:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 16:27:36 +0000 |
| commit | 9fddc60536f583d79ab357cdc00f2ef25edb2265 (patch) | |
| tree | 69a38b8e8499af81c25f593edde0c52dd1f89c12 /svx | |
| parent | bab19bc2076d4caf5568539714de0aa180ffa0a6 (diff) | |
INTEGRATION: CWS fwk01 (1.102.6.1.50); FILE MERGED
2003/03/24 17:03:02 mba 1.102.6.1.50.1: #108086#: support for real OLE objects
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index e2cd1fc5e756..592881c81ae9 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshape.cxx,v $ * - * $Revision: 1.103 $ + * $Revision: 1.104 $ * - * last change: $Author: hr $ $Date: 2003-03-27 15:05:11 $ + * last change: $Author: hr $ $Date: 2003-04-04 17:27:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,6 +112,7 @@ #include <rtl/uuid.h> #include <rtl/memory.h> +#include <so3/outplace.hxx> #ifndef SVX_LIGHT #ifndef _IPOBJ_HXX @@ -2388,13 +2389,16 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) } case OWN_ATTR_OLEMODEL: { - uno::Reference< frame::XModel > xModel; if( pObj->ISA(SdrOle2Obj)) { SdrOle2Obj& aObj = *(SdrOle2Obj*)pObj; - xModel = ((SdrOle2Obj*)pObj)->getXModel(); + SvOutPlaceObjectRef xOut( aObj.GetObjRef() ); + if ( xOut.Is() ) + aAny <<= xOut->GetUnoComponent(); + else + aAny <<= ((SdrOle2Obj*)pObj)->getXModel(); } - aAny <<= xModel; + break; } case OWN_ATTR_MIRRORED: |