diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:15:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:15:13 +0000 |
| commit | c0b320af9498d6af1b3806d1cdc714e638556ebd (patch) | |
| tree | aafb6a82490771beca35bff9cf38585428144229 /sc/source/ui/docshell/docsh4.cxx | |
| parent | 82a217e6bc4a3769ef30df5cfa93b34d691a7e48 (diff) | |
INTEGRATION: CWS mav09 (1.34.14); FILE MERGED
2004/09/16 22:56:27 mav 1.34.14.5: RESYNC: (1.36-1.39); FILE MERGED
2004/07/15 10:41:09 mba 1.34.14.4: #i27773#: cleaning up todos
2004/07/09 02:27:54 mav 1.34.14.3: RESYNC: (1.35-1.36); FILE MERGED
2004/05/17 18:11:35 mav 1.34.14.2: RESYNC: (1.34-1.35); FILE MERGED
2004/05/04 14:01:42 mba 1.34.14.1: #i27773#: remove so3
Diffstat (limited to 'sc/source/ui/docshell/docsh4.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 8dc6f97e7acf..3985f435faf6 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh4.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: kz $ $Date: 2004-08-31 12:30:06 $ + * last change: $Author: kz $ $Date: 2004-10-04 20:15:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,8 +63,13 @@ #include "ui_pch.hxx" #endif +#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ +#include <com/sun/star/embed/XEmbeddedObject.hpp> +#endif + #pragma hdrstop +using namespace ::com::sun::star; // INCLUDE --------------------------------------------------------------- #if STLPORT_VERSION>=321 @@ -857,7 +862,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, pMed->GetName() ); ScDocShell* pOtherDocSh = new ScDocShell; - SvEmbeddedObjectRef aDocShTablesRef = pOtherDocSh; + SfxObjectShellRef aDocShTablesRef = pOtherDocSh; pOtherDocSh->DoLoad( pMed ); ULONG nErr = pOtherDocSh->GetErrorCode(); if (nErr) @@ -2058,7 +2063,7 @@ void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & rSetup, USH } else { - Rectangle aBoundRect = SfxInPlaceObject::GetVisArea(); + Rectangle aBoundRect = SfxObjectShell::GetVisArea(); ScViewData aTmpData( this, NULL ); aTmpData.SetTabNo(nVisTab); aDocument.SnapVisArea( aBoundRect ); @@ -2111,11 +2116,12 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const nStartRow = nEndRow; Rectangle aNewArea = ((ScDocument&)aDocument) .GetMMRect( nStartCol,nStartRow, nEndCol,nEndRow, nVisTab ); - ((ScDocShell*)this)->SvEmbeddedObject::SetVisArea( aNewArea ); + //TODO/LATER: different methods for setting VisArea?! + ((ScDocShell*)this)->SfxObjectShell::SetVisArea( aNewArea ); return aNewArea; } else - return SfxInPlaceObject::GetVisArea( nAspect ); + return SfxObjectShell::GetVisArea( nAspect ); } void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, @@ -2240,7 +2246,7 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem, return 0; } -::so3::SvLinkSource* __EXPORT ScDocShell::DdeCreateLinkSource( const String& rItem ) +::sfx2::SvLinkSource* __EXPORT ScDocShell::DdeCreateLinkSource( const String& rItem ) { // only check for valid item string - range is parsed again in ScServerObject ctor @@ -2362,12 +2368,12 @@ IMPL_LINK( ScDocShell, ChartSelectionHdl, ChartSelectionInfo*, pInfo ) { ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; SfxInPlaceClient* pClient = pViewSh->GetIPClient(); - if ( pClient && pClient->IsInPlaceActive() ) + if ( pClient && pClient->IsObjectInPlaceActive() ) { - SvInPlaceObjectRef xIPObj = pClient->GetIPObj(); - if (xIPObj.Is()) + uno::Reference < embed::XEmbeddedObject > xObj = pClient->GetObject(); + if ( xObj.is() ) { - SchMemChart* pMemChart = SchDLL::GetChartData(xIPObj); + SchMemChart* pMemChart = SchDLL::GetChartData( xObj ); if (pMemChart) return pViewSh->DoChartSelection( *pInfo, *pMemChart ); } |