diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 14:20:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 14:20:35 +0000 |
| commit | 48dd1b9ab1b16be2eeae2a57e3c02e5604d5ab2b (patch) | |
| tree | d85dfa69a665f0733e169d648b6469bdb5ac8757 /svx/source/svdraw/svdoole2.cxx | |
| parent | 9cf46258f6d939823a046fe30099329c11dd06f0 (diff) | |
INTEGRATION: CWS chart2mst3 (1.59.44); FILE MERGED
2007/05/14 18:05:53 bm 1.59.44.13: RESYNC: (1.76-1.77); FILE MERGED
2007/02/16 16:20:01 bm 1.59.44.12: test pClient before accessing
2007/02/07 18:54:56 iha 1.59.44.11: RESYNC: (1.74-1.76); FILE MERGED
2006/11/29 16:11:14 mba 1.59.44.10: #i64497#: avoid setting visAreaSize explicitly for all objects when they are copied for clipboard
2006/11/25 10:26:40 bm 1.59.44.9: RESYNC: (1.73-1.74); FILE MERGED
2006/11/24 20:41:38 bm 1.59.44.8: RESYNC: (1.71-1.73); FILE MERGED
2006/10/19 05:56:40 bm 1.59.44.7: RESYNC: (1.67-1.71); FILE MERGED
2006/10/16 16:49:21 bm 1.59.44.6: additional setParent is not needed as there is now code in the framework that sets the parent in time. But for the chart the second setParent call is called with a NULL-parent before load. This must not happen.
2006/05/05 17:29:43 bm 1.59.44.5: RESYNC: (1.64-1.67); FILE MERGED
2006/01/25 19:38:00 bm 1.59.44.4: RESYNC: (1.61-1.64); FILE MERGED
2005/10/08 23:57:50 bm 1.59.44.3: RESYNC: (1.60-1.61); FILE MERGED
2005/07/25 15:07:49 bm 1.59.44.2: RESYNC: (1.59-1.60); FILE MERGED
2005/06/20 14:42:08 bm 1.59.44.1: set parent at model of OLE objects that support XChild (needed for new chart)
Diffstat (limited to 'svx/source/svdraw/svdoole2.cxx')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 9c18f571a7d9..0b8c5e5e13c4 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdoole2.cxx,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: rt $ $Date: 2007-04-26 07:52:26 $ + * last change: $Author: vg $ $Date: 2007-05-22 15:20:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -842,7 +842,12 @@ void SdrOle2Obj::Connect_Impl() uno::Reference< container::XChild > xChild( xObjRef.GetObject(), uno::UNO_QUERY ); if( xChild.is() ) - xChild->setParent( pModel->getUnoModel() ); + { + uno::Reference< uno::XInterface > xParent( pModel->getUnoModel()); + if( xParent.is()) + xChild->setParent( pModel->getUnoModel() ); + } + } } catch( ::com::sun::star::uno::Exception& e ) @@ -1474,6 +1479,7 @@ void SdrOle2Obj::operator=(const SdrObject& rObj) Connect(); + /* only needed for MSOLE-Objects, now handled inside implementation of Object if ( xObjRef.is() && rOle2Obj.xObjRef.is() && rOle2Obj.GetAspect() != embed::Aspects::MSOLE_ICON ) { try @@ -1495,7 +1501,7 @@ void SdrOle2Obj::operator=(const SdrObject& rObj) (void)e; DBG_ERROR( "SdrOle2Obj::operator=(), unexcpected exception caught!" ); } - } + } */ } } } @@ -1586,7 +1592,9 @@ void SdrOle2Obj::ImpSetVisAreaSize() // make the new object area known to the client // compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied - pClient->SetObjArea(aRect); + OSL_ASSERT( pClient ); + if( pClient ) + pClient->SetObjArea(aRect); // we need a new replacement image as the object has resized itself xObjRef.UpdateReplacement(); |