diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-04-03 17:56:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-05 06:25:24 +0000 |
| commit | e72c80c01629798a93948d4419f109ac324de4ef (patch) | |
| tree | 5339204f854ad0c616d37726ffe055daaa951a44 /writerfilter | |
| parent | 55d146b732bf30f6a83a962b4394df8f2563a4b7 (diff) | |
sequence->vector in writerfilter
Change-Id: Ibc86ecc2b5dbeefd4d0411491a73f388ce303b4b
Reviewed-on: https://gerrit.libreoffice.org/23763
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx index 734e55a90444..2df5a17b0ca9 100644 --- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx +++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx @@ -50,9 +50,9 @@ void OOXMLBinaryObjectReference::read() { nOldSize = nSize; nSize += nBytesRead; - mSequence.realloc(nSize); + mSequence.resize(nSize); - memcpy(&mSequence[nOldSize], aSeq.getArray(), nBytesRead); + memcpy(&mSequence.data()[nOldSize], aSeq.getArray(), nBytesRead); } mbRead = true; @@ -66,8 +66,8 @@ void OOXMLBinaryObjectReference::resolve(BinaryObj & rHandler) writerfilter::Reference<Properties>::Pointer_t pRef = writerfilter::Reference<Properties>::Pointer_t(); - rHandler.data(reinterpret_cast<sal_uInt8 *>(&mSequence[0]), - mSequence.getLength(), pRef); + rHandler.data(reinterpret_cast<sal_uInt8 *>(mSequence.data()), + mSequence.size(), pRef); } }} diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx index 3a1cc0318a8e..d77de2673871 100644 --- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx +++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx @@ -21,6 +21,7 @@ #include <dmapper/resourcemodel.hxx> #include <ooxml/OOXMLDocument.hxx> +#include <vector> namespace writerfilter { namespace ooxml @@ -29,7 +30,7 @@ class OOXMLBinaryObjectReference : public writerfilter::Reference<BinaryObj> { OOXMLStream::Pointer_t mpStream; - css::uno::Sequence<sal_Int8> mSequence; + std::vector<sal_Int8> mSequence; bool mbRead; void read(); |