diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:30:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:30:41 +0000 |
| commit | a1bb99ad4f154ca723145b3da1717df3603a636b (patch) | |
| tree | 5b810abc30d7e6d21e4355bd2f2818a1959ee346 /svx/source/unodraw | |
| parent | 550d3413f8755caddaf12f1a752c6c918038ff22 (diff) | |
INTEGRATION: CWS aw033 (1.35.4); FILE MERGED
2008/06/25 12:56:36 aw 1.35.4.3: RESYNC: (1.36-1.37); FILE MERGED
2008/05/14 14:07:10 aw 1.35.4.2: RESYNC: (1.35-1.36); FILE MERGED
2008/03/17 16:37:09 cl 1.35.4.1: fixed merge conflict
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 698d88d86715..1d4be0a30654 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoshap4.cxx,v $ - * $Revision: 1.37 $ + * $Revision: 1.38 $ * * This file is part of OpenOffice.org. * @@ -361,26 +361,17 @@ bool SvxOle2Shape::getPropertyValueImpl( const SfxItemPropertyMap* pProperty, :: if( pObj ) { uno::Reference < embed::XEmbeddedObject > xObj( pObj->GetObjRef() ); - if ( xObj.is() && ( pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT || svt::EmbeddedObjectRef::TryRunningState( xObj ) ) ) + if ( xObj.is() + && ( pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT || svt::EmbeddedObjectRef::TryRunningState( xObj ) ) ) { - const SdrPageView* pPageView = mpModel->GetPaintingPageView(); - sal_Bool bSuccess = sal_False; - - if ( pPageView ) - { - SdrView* pView = (SdrView*)&(pPageView->GetView()); - if ( pView->ISA( SdrPaintView ) ) - { - SdrPaintView* pPaintView = (SdrPaintView*)pView; - pPaintView->DoConnect( pObj ); - bSuccess = sal_True; - } - } - - if ( !bSuccess ) - bSuccess = pObj->AddOwnLightClient(); - + // Discussed with CL fue to the before GetPaintingPageView + // usage. Removed it, former fallback is used now +#ifdef DBG_UTIL + const sal_Bool bSuccess(pObj->AddOwnLightClient()); OSL_ENSURE( bSuccess, "An object without client is provided!" ); +#else + pObj->AddOwnLightClient(); +#endif if ( pProperty->nWID == OWN_ATTR_OLEMODEL ) rValue <<= pObj->GetObjRef()->getComponent(); @@ -388,7 +379,6 @@ bool SvxOle2Shape::getPropertyValueImpl( const SfxItemPropertyMap* pProperty, :: rValue <<= xObj; } } - break; } |