diff options
| author | Niklas Nebel <nn@openoffice.org> | 2002-01-08 08:45:18 +0000 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2002-01-08 08:45:18 +0000 |
| commit | 745e6aeeaeb485fe959460cf650b588c7bfb6f2c (patch) | |
| tree | 1ebab0457a0cb8d945a208053cf8aaae104c5e8a /sc/source/ui/unoobj/shapeuno.cxx | |
| parent | 2fd1114877ef3bb56bed24079faabe3c5e6bfe3d (diff) | |
#96117# added extra blocks to force deletion of temporaries
Diffstat (limited to 'sc/source/ui/unoobj/shapeuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/shapeuno.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 2e483836e..6450a2e98 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeuno.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: nn $ $Date: 2001-12-19 11:36:01 $ + * last change: $Author: nn $ $Date: 2002-01-08 09:45:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,11 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) { comphelper::increment( m_refCount ); - mxShapeAgg = uno::Reference<uno::XAggregation>( xShape, uno::UNO_QUERY ); + { + mxShapeAgg = uno::Reference<uno::XAggregation>( xShape, uno::UNO_QUERY ); + // extra block to force deletion of the temporary before setDelegator + } + if (mxShapeAgg.is()) { xShape = NULL; // during setDelegator, mxShapeAgg must be the only ref |