[Libreoffice-commits] core.git: sc/source

[László Németh]

 sc/source/filter/excel/xetable.cxx |    2 +-
 sc/source/filter/inc/xetable.hxx   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 352cdc8bf8ee7bbb821d1244df6dc35bcc32f52e
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Tue Jan 20 12:33:37 2015 +0100

    fdo#88623 replace std::deque with std::vector in xlsx saving
    
    Change-Id: I0b9c44b405e2c617c60e11a1a15eaeb867cba57e

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 059d4d9..807ea80 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 12b6ed2..9e16e77 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