diff options
author | Kai Ahrens <ka@openoffice.org> | 2001-11-02 15:00:37 +0000 |
---|---|---|
committer | Kai Ahrens <ka@openoffice.org> | 2001-11-02 15:00:37 +0000 |
commit | 65d18a89ac099a5c3c47ab191dc0b9f47ebd09b0 (patch) | |
tree | b77f50b6bc9846be166b896c65b6c5620cd02e47 /svx/source/svdraw/svdograf.cxx | |
parent | 018c2a0d4925e29f0fb0fec72798132060766b50 (diff) |
#93430#: destroy SvStorageRef object at SdrDocumentStreamInfo
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 657655e4b870..6cf595569554 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdograf.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: thb $ $Date: 2001-10-16 16:45:03 $ + * last change: $Author: ka $ $Date: 2001-11-02 16:00:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ #include <math.h> #include <vcl/salbtype.hxx> #include <sot/formats.hxx> -#include <tools/urlobj.hxx> +#include <so3/svstor.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/localfilehelper.hxx> #include <svtools/style.hxx> @@ -1960,6 +1960,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) aStreamInfo.mbDeleteAfterUse = FALSE; aStreamInfo.maUserData = pGraphic->GetUserData(); + aStreamInfo.mpStorageRef = NULL; SvStream* pStream = pModel->GetDocumentStream( aStreamInfo ); @@ -1986,8 +1987,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) pStream->ResetError(); - if( aStreamInfo.mbDeleteAfterUse ) + if( aStreamInfo.mbDeleteAfterUse || aStreamInfo.mpStorageRef ) + { delete pStream; + delete aStreamInfo.mpStorageRef; + } pRet = GRFMGR_AUTOSWAPSTREAM_LOADED; } |