[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - stlport/systemstl sw/source

[Herbert Dürr]

 stlport/systemstl/slist            |   11 +++++------
 sw/source/core/unocore/unocoll.cxx |    4 ++--
 sw/source/core/unocore/unodraw.cxx |    4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit b0ae6df2b5e963e3a8373200824706f2a100931e
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Aug 5 14:02:45 2013 +0000

    #i122959# prevent use of the insert method in the single linked list

diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist
index 295651f..10e55ef 100644
--- a/stlport/systemstl/slist
+++ b/stlport/systemstl/slist
@@ -62,12 +62,11 @@ public:
 	typedef typename STLP4_SLIST_EMUBASE<T,A> _super;
 	typedef typename _super::iterator slist_mit;
 	typedef typename _super::const_iterator slist_cit;
-#ifndef STLP4_SLIST_WITH_LIST
-	slist_mit insert( slist_cit aI, const T& rT) { return _super::insert_after( aI, rT); }
-#else
-private:
-	size_t size() const; // prevent use of slist::size() as forward_list doesn't have a size() method
-#endif
+
+private: // prevent the use of methods not available in forward_list
+	// signatures are intentionally mismatched to catch invocations
+	size_t size() const;
+	void insert( void) const;
 };
 
 }
commit 019eeace08501fb3dcf187cdb6db0a041349b9ec
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Aug 5 13:10:32 2013 +0000

    #i122959# single-linked lists that are often extended at the end are inefficient

diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 6dc3e0f..bc55a0a 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -64,7 +64,7 @@
 #include <unochart.hxx>
 #include <comphelper/makesequence.hxx>
 #include <comphelper/sequence.hxx>
-#include <slist>
+#include <list>
 #include <iterator>
 #include <unosection.hxx>
 #include <unoparagraph.hxx>
@@ -826,7 +826,7 @@ namespace
         : public SwSimpleEnumeration_Base
     {
         private:
-            typedef ::std::slist< Any > frmcontainer_t;
+            typedef ::std::list< Any > frmcontainer_t;
             frmcontainer_t m_aFrames;
         protected:
             virtual ~SwXFrameEnumeration() {};
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 5f5b155b..a1192ab 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -80,7 +80,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <vcl/svapp.hxx>
-#include <slist>
+#include <list>
 #include <iterator>
 #include <switerator.hxx>
 
@@ -409,7 +409,7 @@ namespace
         : public SwSimpleEnumeration_Base
     {
         private:
-            typedef ::std::slist< ::com::sun::star::uno::Any > shapescontainer_t;
+            typedef ::std::list< ::com::sun::star::uno::Any > shapescontainer_t;
             shapescontainer_t m_aShapes;
         protected:
             virtual ~SwXShapesEnumeration() {};