strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#96117# added extra blocks to force deletion of temporaries

Browse source
This commit is contained in:
Niklas Nebel 2002-01-08 08:45:18 +00:00
parent 694e81973b
commit 60fcc089a0
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sc/source/ui/unoobj/docuno.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: docuno.cxx,v $
*
* $Revision: 1.24 $
* $Revision: 1.25 $
*
* last change: $Author: nn $ $Date: 2001-12-19 11:39:36 $
* 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
@ -261,7 +261,10 @@ ScModelObj::ScModelObj( ScDocShell* pDocSh ) :
// SvNumberFormatsSupplierObj, sonst wird es geloescht.
uno::Reference<util::XNumberFormatsSupplier> xFormatter = new SvNumberFormatsSupplierObj(
pDocShell->GetDocument()->GetFormatTable() );
xNumberAgg = uno::Reference<uno::XAggregation>( xFormatter, uno::UNO_QUERY );
{
xNumberAgg = uno::Reference<uno::XAggregation>( xFormatter, uno::UNO_QUERY );
// extra block to force deletion of the temporary before setDelegator
}
// beim setDelegator darf die zusaetzliche Ref nicht mehr existieren
xFormatter = NULL;
@ -1033,7 +1036,10 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
// alles was ich nicht kenn, werf ich der SvxFmMSFactory an den Hals,
// da wird dann 'ne Exception geworfen, wenn's nicht passt...
xRet = SvxFmMSFactory::createInstance(aServiceSpecifier);
{
xRet = SvxFmMSFactory::createInstance(aServiceSpecifier);
// extra block to force deletion of the temporary before ScShapeObj ctor (setDelegator)
}
// #96117# if the drawing factory created a shape, a ScShapeObj has to be used
// to support own properties like ImageMap:

10
sc/source/ui/unoobj/shapeuno.cxx
View file

@ -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