diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 17:43:31 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 17:43:31 +0000 |
| commit | 8db5c36c068ae256b5682f7dab973cb711e621bf (patch) | |
| tree | 1e435c4afe657aab30fea2eab86a7badaef302b0 /sd/source/ui/view/drviews3.cxx | |
| parent | INTEGRATION: CWS mav09 (1.26.54); FILE MERGED (diff) | |
| download | core-8db5c36c068ae256b5682f7dab973cb711e621bf.tar.gz core-8db5c36c068ae256b5682f7dab973cb711e621bf.zip | |
INTEGRATION: CWS mav09 (1.23.58); FILE MERGED
2004/09/16 18:46:40 mav 1.23.58.7: RESYNC: (1.27-1.28); FILE MERGED
2004/08/09 20:24:32 mav 1.23.58.6: RESYNC: (1.25-1.27); FILE MERGED
2004/06/10 16:47:44 mba 1.23.58.5: #i27773#: some fixed to make InPlace Editing work
2004/05/17 18:02:50 mav 1.23.58.4: RESYNC: (1.24-1.25); FILE MERGED
2004/04/29 18:18:25 mav 1.23.58.3: RESYNC: (1.23-1.24); FILE MERGED
2004/04/27 17:02:05 mba 1.23.58.2: #i27773#: new embedding API
2004/04/14 14:12:23 mba 1.23.58.1: #i27773#: remove so3; new storage API
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 244f1c9ea366..3b98f9d83469 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews3.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: hr $ $Date: 2004-09-08 13:44:24 $ + * last change: $Author: kz $ $Date: 2004-10-04 18:43:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,8 @@ #include "DrawViewShell.hxx" +#include <sfx2/viewfrm.hxx> + #ifndef _EEITEMID_HXX #include <svx/eeitemid.hxx> #endif @@ -186,6 +188,9 @@ #ifndef SD_OBJECT_BAR_MANAGER_HXX #include "ObjectBarManager.hxx" #endif +#include "sdabstdlg.hxx" //CHINA001 + +#include <sfx2/ipclient.hxx> #ifndef SD_VIEW_SHELL_BASE_HXX #include "ViewShellBase.hxx" #endif @@ -490,7 +495,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) OSL_ASSERT (GetViewShell()!=NULL); SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - if ( pIPClient && pIPClient->IsInPlaceActive() ) + if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) { const SfxRectangleItem& rRect = (SfxRectangleItem&)rReq.GetArgs()->Get(SID_OBJECTRESIZE); @@ -510,10 +515,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2) { - SvInPlaceObjectRef aIPObj = - ( (SdrOle2Obj*) pObj)->GetObjRef(); - - if ( aIPObj.Is() ) + if ( ( (SdrOle2Obj*) pObj)->GetObjRef().is() ) { pObj->SetLogicRect(aRect); } |