diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-01-20 12:33:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-20 13:46:22 +0000 |
| commit | b81107be0d9c23c9ddf9ff6dbc8a521f92d6c3f3 (patch) | |
| tree | 1af4f654b2b97985819c7570edba84fe9fa687c3 | |
| parent | 250477f8eb2b2240209bffbe1ddeb3e587e3a5cf (diff) | |
fdo#88623 replace std::deque with std::vector in xlsx saving
Change-Id: I0b9c44b405e2c617c60e11a1a15eaeb867cba57e
Reviewed-on: https://gerrit.libreoffice.org/14036
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/filter/excel/xetable.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xetable.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 84fdaec2b157..a8b719b5cce0 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -1226,7 +1226,7 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes if( !maXFIds.empty() && (maXFIds.front().mnXFIndex == EXC_XF_NOTFOUND) ) { SetXclCol( GetXclCol() + maXFIds.front().mnCount ); - maXFIds.pop_front(); + maXFIds.erase(maXFIds.begin(), maXFIds.begin() + 1); } if( !maXFIds.empty() && (maXFIds.back().mnXFIndex == EXC_XF_NOTFOUND) ) maXFIds.pop_back(); diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 7fca5e45ee3e..5aa8a79a04da 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -22,7 +22,7 @@ #include "xltable.hxx" -#include <deque> +#include <vector> #include <tools/mempool.hxx> #include "xladdress.hxx" #include "xerecord.hxx" @@ -529,7 +529,7 @@ private: virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) = 0; private: - typedef ::std::deque< XclExpMultiXFId > XclExpMultiXFIdDeq; + typedef ::std::vector< XclExpMultiXFId > XclExpMultiXFIdDeq; sal_uInt16 mnMulRecId; /// Record ID for multiple record variant. sal_Size mnContSize; /// Data size of contents for one cell |