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

[Julien Nabet (via logerrit)]

 sc/source/filter/xml/XMLColumnRowGroupExport.cxx |    5 ++---
 sc/source/filter/xml/XMLColumnRowGroupExport.hxx |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 76374aa9d2b6c9ad72f8803a2245d05f1d493b86
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue May 7 07:56:29 2019 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue May 7 10:17:42 2019 +0200

    Replace list by vector for ScMyColumnRowGroupVec sc/xml
    
    Change-Id: I95292f370d38a95b229f47c10652dfab077299b3
    Reviewed-on: https://gerrit.libreoffice.org/71888
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
index 74e9e6a576f1..9cd8e98bc100 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
@@ -95,9 +95,8 @@ void ScMyOpenCloseColumnRowGroup::OpenGroup(const ScMyColumnRowGroup& rGroup)
 void ScMyOpenCloseColumnRowGroup::OpenGroups(const sal_Int32 nField)
 {
     ScMyColumnRowGroupVec::iterator aItr(aTableStart.begin());
-    ScMyColumnRowGroupVec::iterator aEndItr(aTableStart.end());
     bool bReady(false);
-    while(!bReady && aItr != aEndItr)
+    while(!bReady && aItr != aTableStart.end())
     {
         if (aItr->nField == nField)
         {
@@ -144,7 +143,7 @@ sal_Int32 ScMyOpenCloseColumnRowGroup::GetLast()
 
 void ScMyOpenCloseColumnRowGroup::Sort()
 {
-    aTableStart.sort();
+    std::sort(aTableStart.begin(), aTableStart.end());
     std::sort(aTableEnd.begin(), aTableEnd.end());
 }
 
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
index 103843f6bb91..6c78ca917174 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLCOLUMNROWGROUPEXPORT_HXX
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCOLUMNROWGROUPEXPORT_HXX
 
-#include <list>
 #include <vector>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -35,7 +34,7 @@ struct ScMyColumnRowGroup
     bool operator< (const ScMyColumnRowGroup& rGroup) const;
 };
 
-typedef std::list<ScMyColumnRowGroup> ScMyColumnRowGroupVec;
+typedef std::vector<ScMyColumnRowGroup> ScMyColumnRowGroupVec;
 typedef std::vector<sal_Int32> ScMyFieldGroupVec;
 
 class ScXMLExport;