diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-30 09:40:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-30 13:35:43 +0100 |
| commit | 78c83032b266fbb6fc20ddca86df80affaff7c24 (patch) | |
| tree | 4f4d8891d2a5df71b5a7f8126a539cc464eb41cc /vcl/source/filter | |
| parent | 00d2eeebc8b1842c4ab7a544552f259208ee0e25 (diff) | |
maSvgDataArray only populates a uno::Sequence, so use that instead
Change-Id: I335d5ee70e95e1a3b204d34f6df4cb62f3fb3cad
Diffstat (limited to 'vcl/source/filter')
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 7d79078450ca..49f3b65eeaae 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1533,18 +1533,18 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat if (!rIStream.GetError() && nMemoryLength >= 0) { - SvgDataArray aNewData(new sal_uInt8[nMemoryLength]); + SvgDataArray aNewData(nMemoryLength); aMemStream.Seek(STREAM_SEEK_TO_BEGIN); - aMemStream.Read(aNewData.get(), nMemoryLength); + aMemStream.Read(aNewData.begin(), nMemoryLength); // Make a uncompressed copy for GfxLink nGraphicContentSize = nMemoryLength; pGraphicContent = new sal_uInt8[nGraphicContentSize]; - std::copy(aNewData.get(), aNewData.get() + nMemoryLength, pGraphicContent); + std::copy(aNewData.begin(), aNewData.end(), pGraphicContent); if(!aMemStream.GetError() ) { - SvgDataPtr aSvgDataPtr(new SvgData(aNewData, nMemoryLength, rPath)); + SvgDataPtr aSvgDataPtr(new SvgData(aNewData, rPath)); rGraphic = Graphic(aSvgDataPtr); bOkay = true; } @@ -1552,20 +1552,20 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat } else { - SvgDataArray aNewData(new sal_uInt8[nStreamLength]); + SvgDataArray aNewData(nStreamLength); rIStream.Seek(nStreamPosition); - rIStream.Read(aNewData.get(), nStreamLength); + rIStream.Read(aNewData.begin(), nStreamLength); if(!rIStream.GetError()) { - SvgDataPtr aSvgDataPtr(new SvgData(aNewData, nStreamLength, rPath)); + SvgDataPtr aSvgDataPtr(new SvgData(aNewData, rPath)); rGraphic = Graphic(aSvgDataPtr); bOkay = true; } } } - if(bOkay) + if (bOkay) { eLinkType = GFX_LINK_TYPE_NATIVE_SVG; } |