diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-12 09:43:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-12 13:03:51 +0000 |
| commit | 6f3fd680ea3769384a98fa620532a64d12fede4a (patch) | |
| tree | b918d681669e777e5e87d5e4c86937f1429ccdbb | |
| parent | 3337331359cdc530549932de3e84bf1d2334579d (diff) | |
that delete of pWrapPolygon looks dodgy to me
seeing as it is only conditionally replaced later
Change-Id: I6801de8472b88f37a34aea260336750cb3c47015
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index e3915d470690..d270b0ee016d 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5287,6 +5287,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, if (SeekToContent(DFF_Prop_pWrapPolygonVertices, rSt)) { delete pTextImpRec->pWrapPolygon; + pTextImpRec->pWrapPolygon = NULL; sal_uInt16 nNumElemVert, nNumElemMemVert, nElemSizeVert; rSt >> nNumElemVert >> nNumElemMemVert >> nElemSizeVert; if (nNumElemVert && ((nElemSizeVert == 8) || (nElemSizeVert == 4))) @@ -7290,16 +7291,11 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy) SvxMSDffImportRec::~SvxMSDffImportRec() { - if (pClientAnchorBuffer) - delete[] pClientAnchorBuffer; - if (pClientDataBuffer) - delete[] pClientDataBuffer; - if (pWrapPolygon) - delete pWrapPolygon; - if (pXRelTo) - delete pXRelTo; - if (pYRelTo) - delete pYRelTo; + delete[] pClientAnchorBuffer; + delete[] pClientDataBuffer; + delete pWrapPolygon; + delete pXRelTo; + delete pYRelTo; } void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape ) |