diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 07:12:32 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 07:12:32 +0000 |
| commit | 3174205567be06d64f5795b7120f0af6088b4420 (patch) | |
| tree | 9e260287e89ff09f806476f74ec81543a940294e /svx/source/unodraw/unoshape.cxx | |
| parent | 618a49e36ac6e5df37999a03675bc461858266d1 (diff) | |
INTEGRATION: CWS tl18 (1.140.90); FILE MERGED
2006/04/11 08:21:11 tl 1.140.90.3: RESYNC: (1.140-1.144); FILE MERGED
2006/03/08 14:14:58 mav 1.140.90.2: #i59205# create the client correctly
2006/03/07 16:57:05 mav 1.140.90.1: #i59205# create the client when the object is provided outside
Diffstat (limited to 'svx/source/unodraw/unoshape.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 114abc04f993..21c826adbf52 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoshape.cxx,v $ * - * $Revision: 1.144 $ + * $Revision: 1.145 $ * - * last change: $Author: obo $ $Date: 2006-03-29 15:58:10 $ + * last change: $Author: rt $ $Date: 2006-05-05 08:12:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,6 +90,9 @@ #ifndef _SFX_OBJSH_HXX #include <sfx2/objsh.hxx> #endif +#ifndef _SFXVIEWSH_HXX +#include <sfx2/viewsh.hxx> +#endif #ifndef _SVDOPAGE_HXX #include "svdopage.hxx" #endif @@ -126,6 +129,7 @@ #include "svdograf.hxx" #include "unoapi.hxx" #include "svdomeas.hxx" +#include <svdpagv.hxx> #include <tools/shl.hxx> // #include "dialmgr.hxx" // not nice, we need our own resources some day @@ -2488,7 +2492,20 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) SdrOle2Obj& aObj = *(SdrOle2Obj*)pObject; uno::Reference < embed::XEmbeddedObject > xObj( ((SdrOle2Obj*)pObject)->GetObjRef() ); if( xObj.is() && svt::EmbeddedObjectRef::TryRunningState( xObj ) ) + { + const SdrPageView* pPageView = pModel->GetPaintingPageView(); + if ( pPageView ) + { + SdrView* pView = (SdrView*)&(pPageView->GetView()); + if ( pView->ISA( SdrPaintView ) ) + { + SdrPaintView* pPaintView = (SdrPaintView*)pView; + pPaintView->DoConnect( &aObj ); + } + } + return makeAny( aObj.GetObjRef()->getComponent() ); + } } break; |