summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorsj <sj@openoffice.org>2010-08-19 14:49:31 +0200
committersj <sj@openoffice.org>2010-08-19 14:49:31 +0200
commitda964ea73a6d7d43689c728d4df7d63184be4d28 (patch)
tree4c1b14833c97c908b474f117cc3ac07fdd084665 /sd
parentf0072466a6c06f6ea0516b021eb53176128b13d3 (diff)
impress198: #i113701,i113699# applied patch / fixed memory leak when saving / opening PPT documents
Diffstat (limited to 'sd')
-rwxr-xr-x[-rw-r--r--]sd/source/filter/eppt/eppt.cxx5
-rwxr-xr-xsd/source/filter/eppt/eppt.hxx6
-rwxr-xr-x[-rw-r--r--]sd/source/filter/ppt/propread.hxx2
3 files changed, 9 insertions, 4 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 2a40c8707866..c4c2aa3dbee6 100644..100755
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -265,6 +265,11 @@ PPTWriter::~PPTWriter()
void* pPtr;
delete mpExEmbed;
delete mpPptEscherEx;
+ delete mpCurUserStrm;
+ delete mpPicStrm;
+ delete mpStrm;
+
+
std::vector< PPTExStyleSheet* >::iterator aStyleSheetIter( maStyleSheetList.begin() );
while( aStyleSheetIter < maStyleSheetList.end() )
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 3d8797beb328..b64affc9881b 100755
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -727,9 +727,9 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
sal_uInt32 mnTextSize;
SvStorageRef mrStg;
- SvStorageStream* mpCurUserStrm;
- SvStorageStream* mpStrm;
- SvStorageStream* mpPicStrm;
+ SvStream* mpCurUserStrm;
+ SvStream* mpStrm;
+ SvStream* mpPicStrm;
PptEscherEx* mpPptEscherEx;
List maExOleObj;
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index cbb81b8cad1c..603dbe33ce32 100644..100755
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -166,7 +166,7 @@ class Section : private List
class PropRead : private List
{
sal_Bool mbStatus;
- SvStorageStream* mpSvStream;
+ SvStorageStreamRef mpSvStream;
sal_uInt16 mnByteOrder;
sal_uInt16 mnFormat;