diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:27:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:27:04 +0000 |
| commit | 6fc1567e2eef7d443dfa4862da05974c2465bc98 (patch) | |
| tree | 4dd0e59be9650b0956f3cc53887a25041c6ecbd5 /sc/source/ui/view/tabvwshh.cxx | |
| parent | 068ff0494a3b59152aa5aed24e65fb1d52354ada (diff) | |
INTEGRATION: CWS mav09 (1.6.418); FILE MERGED
2004/08/09 20:49:23 mav 1.6.418.4: RESYNC: (1.6-1.7); FILE MERGED
2004/05/20 20:34:35 mba 1.6.418.3: #i27773#: some API changes
2004/05/16 17:26:40 mba 1.6.418.2: #i27773#: new EmbeddedObjectContainer
2004/05/04 14:02:03 mba 1.6.418.1: #i27773#: remove so3
Diffstat (limited to 'sc/source/ui/view/tabvwshh.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwshh.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 243dec854..b5a13f6ae 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabvwshh.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2004-07-12 15:33:10 $ + * last change: $Author: kz $ $Date: 2004-10-04 20:27:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,9 +74,12 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <svtools/sbxcore.hxx> -#include <so3/ipobj.hxx> #include <svtools/whiter.hxx> +#ifndef _COM_SUN_STAR_EMBED_EMBEDSTATES_HPP_ +#include <com/sun/star/embed/EmbedStates.hpp> +#endif + #include "tabvwsh.hxx" #include "client.hxx" #include "document.hxx" @@ -84,6 +87,8 @@ #include "sc.hrc" #include "drwlayer.hxx" // GetVisibleName +using namespace com::sun::star; + //------------------------------------------------------------------ void ScTabViewShell::ExecuteSbx( SfxRequest& rReq ) @@ -138,9 +143,9 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) case SID_OLE_DEACTIVATE: { ScClient* pClient = (ScClient*) pVisibleSh->GetIPClient(); - if ( pClient && pClient->IsInPlaceActive() ) + if ( pClient && pClient->IsObjectInPlaceActive() ) { - pClient->GetProtocol().Reset2Open(); + pClient->GetObject()->changeState( embed::EmbedStates::RUNNING ); SFX_APP()->SetViewFrame(pVisibleSh->GetViewFrame()); } } @@ -194,10 +199,9 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) } } -SvInPlaceObjectRef lcl_GetSelectedObj( SdrView* pDrView ) //! Member von ScDrawView? +uno::Reference < embed::XEmbeddedObject > lcl_GetSelectedObj( SdrView* pDrView ) //! Member von ScDrawView? { - SvInPlaceObjectRef xRet; - + uno::Reference < embed::XEmbeddedObject > xRet; if (pDrView) { const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); @@ -228,12 +232,10 @@ void ScTabViewShell::GetObjectState( SfxItemSet& rSet ) case SID_ACTIVE_OBJ_NAME: { String aName; - SvInPlaceObjectRef xOLE = lcl_GetSelectedObj( GetSdrView() ); - if (xOLE.Is()) + uno::Reference < embed::XEmbeddedObject > xOLE = lcl_GetSelectedObj( GetSdrView() ); + if (xOLE.is()) { - SvInfoObject* pInfoObj = GetViewData()->GetSfxDocShell()->Find( xOLE ); - if ( pInfoObj ) - aName = pInfoObj->GetObjName(); + aName = GetViewData()->GetSfxDocShell()->GetEmbeddedObjectContainer().GetEmbeddedObjectName( xOLE ); } rSet.Put( SfxStringItem( nWhich, aName ) ); } |