diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:34:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:34:11 +0000 |
| commit | dfc2b2b0ed4e4a73fd9e8c1f793ef531550986a6 (patch) | |
| tree | 5bdba8aa5fe0c1ec5c99a82abedfb3aaef04b8b8 | |
| parent | 3e6ea386cbf9a8da39a32910fd153974f0c9fa03 (diff) | |
INTEGRATION: CWS mav15 (1.123.94); FILE MERGED
2005/01/21 13:22:15 mav 1.123.94.1: #i39746# cache the visual area size for OLE objects and switch own objects to RUNNING state automatically
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 4c4c88be3ce7..1df5a8c7802c 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshape.cxx,v $ * - * $Revision: 1.127 $ + * $Revision: 1.128 $ * - * last change: $Author: rt $ $Date: 2005-01-28 17:09:46 $ + * last change: $Author: rt $ $Date: 2005-01-31 09:34:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1979,7 +1979,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Reference < embed::XEmbeddedObject > xObj = ((SdrOle2Obj*)pObj)->GetObjRef(); if( xObj.is() ) { - svt::EmbeddedObjectRef::TryRunningState( xObj ); try { xObj->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, aTmp ); @@ -2341,8 +2340,6 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) uno::Reference < embed::XEmbeddedObject > xObj( ((SdrOle2Obj*)pObj)->GetObjRef() ); if ( xObj.is() ) { - svt::EmbeddedObjectRef::TryRunningState( xObj ); - try { awt::Size aTmp = xObj->getVisualAreaSize( embed::Aspects::MSOLE_CONTENT ); @@ -2364,7 +2361,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) if( pObj->ISA(SdrOle2Obj)) { uno::Reference < embed::XEmbeddedObject > xObj( ((SdrOle2Obj*)pObj)->GetObjRef() ); - if( xObj.is() && svt::EmbeddedObjectRef::TryRunningState( xObj ) ) + if( xObj.is() ) // && svt::EmbeddedObjectRef::TryRunningState( xObj ) ) aSize = xObj->getVisualAreaSize( embed::Aspects::MSOLE_CONTENT ); } aAny <<= aSize; |