diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-09-30 10:28:46 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-09-30 10:28:46 +0200 |
| commit | 87a8988aa9a523a08124c3b5574544361f45aed1 (patch) | |
| tree | a792b479314d592baa8690e8095e038ba032205f | |
| parent | fcc1fc85a497c0e67ce07465d8bb4c6e39a42054 (diff) | |
| parent | da964ea73a6d7d43689c728d4df7d63184be4d28 (diff) | |
CWS-TOOLING: integrate CWS impress198
| -rwxr-xr-x[-rw-r--r--] | sd/source/filter/eppt/eppt.cxx | 5 | ||||
| -rwxr-xr-x | sd/source/filter/eppt/eppt.hxx | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/filter/ppt/propread.hxx | 2 |
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; |