From da964ea73a6d7d43689c728d4df7d63184be4d28 Mon Sep 17 00:00:00 2001
From: sj <sj@openoffice.org>
Date: Thu, 19 Aug 2010 14:49:31 +0200
Subject: impress198: #i113701,i113699# applied patch / fixed memory leak when
 saving / opening PPT documents

---
 sd/source/filter/eppt/eppt.cxx    | 5 +++++
 sd/source/filter/eppt/eppt.hxx    | 6 +++---
 sd/source/filter/ppt/propread.hxx | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 sd/source/filter/eppt/eppt.cxx
 mode change 100644 => 100755 sd/source/filter/ppt/propread.hxx

(limited to 'sd/source/filter')

diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
old mode 100644
new mode 100755
index 2a40c8707866..c4c2aa3dbee6
--- 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
old mode 100644
new mode 100755
index cbb81b8cad1c..603dbe33ce32
--- 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;
-- 
cgit v1.2.3