diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:05:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:05:05 +0000 |
| commit | 5f1b4326ce338d35215fad79dd2b7c1ce4282f3a (patch) | |
| tree | 890c49442bf541fcaaf1fa6f1ae98ad66de5498f /sd/source | |
| parent | 8a2c0d1dcd49210729276aa7a157f9ba7dc3133b (diff) | |
INTEGRATION: CWS mav15 (1.35.62); FILE MERGED
2005/01/21 13:02:39 mav 1.35.62.1: #i39746# cache the visual area size for OLE objects and switch own objects to RUNNING state automatically
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 65c5610f2161..b500a77e408f 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: obo $ $Date: 2005-01-25 15:20:12 $ + * last change: $Author: rt $ $Date: 2005-01-31 09:05:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -840,8 +840,7 @@ void View::SetMarkedOriginalSize() uno::Reference < embed::XEmbeddedObject > xObj = ((SdrOle2Obj*)pObj)->GetObjRef(); if( xObj.is() ) { - // TODO/LEAN: working with VisualArea still needs running state - svt::EmbeddedObjectRef::TryRunningState( xObj ); + // TODO/LEAN: working with VisualArea can switch object to running state MapUnit aUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( ((SdrOle2Obj*)pObj)->GetAspect() ) ); awt::Size aSz = xObj->getVisualAreaSize( ((SdrOle2Obj*)pObj)->GetAspect() ); Size aOleSize( OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aUnit, MAP_100TH_MM) ); @@ -979,9 +978,7 @@ void View::DoConnect(SdrOle2Obj* pObj) pSdClient = new Client(pObj, pViewSh, pWindow); Rectangle aRect = pObj->GetLogicRect(); { - // TODO/LEAN: working with visual area still needs running state - svt::EmbeddedObjectRef::TryRunningState( xObj ); - + // TODO/LEAN: working with visual area can switch object to running state Size aDrawSize = aRect.GetSize(); awt::Size aSz = xObj->getVisualAreaSize( pSdClient->GetAspect() ); Size aObjAreaSize( aSz.Width, aSz.Height ); |